[PATCH 2/4] drm/i915/alpm: Move disabling sink ALPM to intel_alpm.c

[Jouni Högander]

Currently disabling sink ALPM is done only when disabling PSR. Now
ALPM code is shared between LOBF and PSR. Enabling sink ALPM is
already done in intel_alpm.c. Not really expected it getting disabled
in intel_psr.c. Move disabling sink ALPM to intel_alpm.c.

Signed-off-by: Jouni Högander <jouni.hogander at intel.com>
---
 drivers/gpu/drm/i915/display/intel_alpm.c | 2 ++
 drivers/gpu/drm/i915/display/intel_psr.c  | 7 +------
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/drivers/gpu/drm/i915/display/intel_alpm.c b/drivers/gpu/drm/i915/display/intel_alpm.c
index d48d1e6cc356..2454f78fc416 100644
--- a/drivers/gpu/drm/i915/display/intel_alpm.c
+++ b/drivers/gpu/drm/i915/display/intel_alpm.c
@@ -564,6 +564,8 @@ void intel_alpm_disable(struct intel_dp *intel_dp)
 	intel_de_write(display, ALPM_CTL(display, cpu_transcoder), 0);
 	intel_de_write(display, PORT_ALPM_CTL(dp_to_dig_port(intel_dp)->base.port), 0);
 
+	drm_dp_dpcd_writeb(&intel_dp->aux, DP_RECEIVER_ALPM_CONFIG, 0);
+
 	drm_dbg_kms(display->drm, "Disabling ALPM\n");
 	mutex_unlock(&intel_dp->alpm_parameters.lock);
 }
diff --git a/drivers/gpu/drm/i915/display/intel_psr.c b/drivers/gpu/drm/i915/display/intel_psr.c
index ccd66bbc72f7..89c4aaf8bd36 100644
--- a/drivers/gpu/drm/i915/display/intel_psr.c
+++ b/drivers/gpu/drm/i915/display/intel_psr.c
@@ -2173,14 +2173,9 @@ static void intel_psr_disable_locked(struct intel_dp *intel_dp)
 		intel_snps_phy_update_psr_power_state(&dp_to_dig_port(intel_dp)->base, false);
 
 	/* Disable PSR on Sink */
-	if (!intel_dp->psr.panel_replay_enabled) {
+	if (!intel_dp->psr.panel_replay_enabled)
 		drm_dp_dpcd_writeb(&intel_dp->aux, DP_PSR_EN_CFG, 0);
 
-		if (intel_dp->psr.sel_update_enabled)
-			drm_dp_dpcd_writeb(&intel_dp->aux,
-					   DP_RECEIVER_ALPM_CONFIG, 0);
-	}
-
 	/* Wa_16025596647 */
 	if ((DISPLAY_VER(display) == 20 ||
 	     IS_DISPLAY_VERx100_STEP(display, 3000, STEP_A0, STEP_B0)) &&
-- 
2.43.0