Commit eb4a7139 authored by Jouni Högander's avatar Jouni Högander Committed by Joonas Lahtinen
Browse files

drm/i915/alpm: ALPM disable fixes 

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: 1ccbf135 ("drm/i915/psr: Enable ALPM on source side for eDP Panel replay")
Cc: Animesh Manna <animesh.manna@intel.com>
Cc: Jani Nikula <jani.nikula@linux.intel.com>
Cc: <stable@vger.kernel.org> # v6.10+
Signed-off-by: default avatarJouni Högander <jouni.hogander@intel.com>
Reviewed-by: default avatarMichał Grzelak <michal.grzelak@intel.com>
Link: https://patch.msgid.link/20260212062731.397801-1-jouni.hogander@intel.com


(cherry picked from commit 008304c9)
Signed-off-by: default avatarJoonas Lahtinen <joonas.lahtinen@linux.intel.com>
parent 6de23f81

drivers/gpu/drm/i915/display/intel_alpm.c

+1 −6
Original line number Diff line number Diff line
@@ -562,12 +562,7 @@ void intel_alpm_disable(struct intel_dp *intel_dp) 
	mutex_lock(&intel_dp->alpm.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);



	drm_dbg_kms(display->drm, "Disabling ALPM\n");

	mutex_unlock(&intel_dp->alpm.lock);