From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 6E3EC34AB17 for ; Tue, 17 Mar 2026 16:39:33 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773765573; cv=none; b=GrrakOBTVSfwczD8wnYzLQyxXqReZUwr0gYRCoVlnHa0O4p7+I1qUWhsiQsh3ENeY6/LcL8l4fWa/sa/ZzcTLXrUvUYW6Zgo9HN/m9S6CuxlHRq3K5tOrU3FCAnbm5IFQzP3DJgnV8qbOUrsBMfzw7ECMc8GTr1dbIzdo+4dfSY= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773765573; c=relaxed/simple; bh=Kl8nyvxkAdrdYrjW2058+0A4Cv4Vcd0yZJ/bgJnmseQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=Vop5/JS4Pa9ndQocbZaR8F6StdVnhuVPNff0zjtuu0bPNm/gZZBYluKqSbZifsWhlIuYQMY5s4N5KZvnlm+3wpVwbWxeoYyxHSftXy7uZMPkqHkup+CJlEgKGA3+QWG8KP7BuqVANcYgA4P882JGz1LvukV+AQzrjI2iXGUKtUw= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=kZf+qorF; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="kZf+qorF" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 75C93C2BCAF; Tue, 17 Mar 2026 16:39:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1773765573; bh=Kl8nyvxkAdrdYrjW2058+0A4Cv4Vcd0yZJ/bgJnmseQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=kZf+qorFbPPaZX59GdflRXWisng1sxo2fLr+LatyR1HUhdbB4DkQxID1/Q8LfAZ0+ cFh7h5ZBH+jSvPY9ozqlRQx0Pp+ki+Y7N7fRwz4GrdFsDG3gcGELh0mxGqivRFtBxJ JRe0L1yXluqSLmiBKfV94+PTquA+dmkoUIGpYac2hFBfL6yFyoUrLClW/+Ba7UFhu7 pcR2c7YYDxJqrd21YwRjc7lmIszpJeVEUHNBzZR7DEUz6pk4FU/0VK/EC0Bf5o4Twc 11l/Jyh78CGXZQrmP+oiqImDNbJ7eUj46g18CoDfsgYBpnoe+0tDLcL/KLpEZWgS6F qoBEKMXKmRc0g== From: Sasha Levin To: stable@vger.kernel.org Cc: =?UTF-8?q?Jouni=20H=C3=B6gander?= , Animesh Manna , Jani Nikula , =?UTF-8?q?Micha=C5=82=20Grzelak?= , Joonas Lahtinen , Sasha Levin Subject: [PATCH 6.12.y 8/8] drm/i915/alpm: ALPM disable fixes Date: Tue, 17 Mar 2026 12:39:24 -0400 Message-ID: <20260317163924.220634-8-sashal@kernel.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20260317163924.220634-1-sashal@kernel.org> References: <2026031731-secret-rocket-af05@gregkh> <20260317163924.220634-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit From: Jouni Högander [ Upstream commit eb4a7139e97374f42b7242cc754e77f1623fbcd5 ] PORT_ALPM_CTL is supposed to be written only before link training. Remove writing it from ALPM disable. Also clearing ALPM_CTL_ALPM_AUX_LESS_ENABLE and is not about disabling ALPM but switching to AUX-Wake ALPM. Stop touching this bit on ALPM disable. Closes: https://gitlab.freedesktop.org/drm/xe/kernel/-/issues/7153 Fixes: 1ccbf135862b ("drm/i915/psr: Enable ALPM on source side for eDP Panel replay") Cc: Animesh Manna Cc: Jani Nikula Cc: # v6.10+ Signed-off-by: Jouni Högander Reviewed-by: Michał Grzelak Link: https://patch.msgid.link/20260212062731.397801-1-jouni.hogander@intel.com (cherry picked from commit 008304c9ae75c772d3460040de56e12112cdf5e6) Signed-off-by: Joonas Lahtinen Signed-off-by: Sasha Levin --- drivers/gpu/drm/i915/display/intel_alpm.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/drivers/gpu/drm/i915/display/intel_alpm.c b/drivers/gpu/drm/i915/display/intel_alpm.c index d72e10160f1d4..b5f4d77562c90 100644 --- a/drivers/gpu/drm/i915/display/intel_alpm.c +++ b/drivers/gpu/drm/i915/display/intel_alpm.c @@ -495,12 +495,7 @@ void intel_alpm_disable(struct intel_dp *intel_dp) mutex_lock(&intel_dp->alpm_parameters.lock); intel_de_rmw(display, ALPM_CTL(display, cpu_transcoder), - ALPM_CTL_ALPM_ENABLE | ALPM_CTL_LOBF_ENABLE | - ALPM_CTL_ALPM_AUX_LESS_ENABLE, 0); - - intel_de_rmw(display, - PORT_ALPM_CTL(cpu_transcoder), - PORT_ALPM_CTL_ALPM_AUX_LESS_ENABLE, 0); + ALPM_CTL_ALPM_ENABLE | ALPM_CTL_LOBF_ENABLE, 0); mutex_unlock(&intel_dp->alpm_parameters.lock); } -- 2.51.0