Skip to content

Commit eb4a713

Browse files
hoganderjlahtine-intel
authored andcommitted
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: 1ccbf13 ("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: Jouni Högander <jouni.hogander@intel.com> Reviewed-by: Michał Grzelak <michal.grzelak@intel.com> Link: https://patch.msgid.link/20260212062731.397801-1-jouni.hogander@intel.com (cherry picked from commit 008304c) Signed-off-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
1 parent 6de23f8 commit eb4a713

1 file changed

Lines changed: 1 addition & 6 deletions

File tree

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

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -562,12 +562,7 @@ void intel_alpm_disable(struct intel_dp *intel_dp)
562562
mutex_lock(&intel_dp->alpm.lock);
563563

564564
intel_de_rmw(display, ALPM_CTL(display, cpu_transcoder),
565-
ALPM_CTL_ALPM_ENABLE | ALPM_CTL_LOBF_ENABLE |
566-
ALPM_CTL_ALPM_AUX_LESS_ENABLE, 0);
567-
568-
intel_de_rmw(display,
569-
PORT_ALPM_CTL(cpu_transcoder),
570-
PORT_ALPM_CTL_ALPM_AUX_LESS_ENABLE, 0);
565+
ALPM_CTL_ALPM_ENABLE | ALPM_CTL_LOBF_ENABLE, 0);
571566

572567
drm_dbg_kms(display->drm, "Disabling ALPM\n");
573568
mutex_unlock(&intel_dp->alpm.lock);

0 commit comments

Comments
 (0)