drm/i915/psr: Do not unnecessarily remove underrun on idle PSR WA

We are currently removing underrun on idle PSR WA even if it's not
applied. Fix this by checking pkg_c_latency_used on PSR exit as well.

Fixes: 9b1795e9b0ae ("drm/i915/psr: Underrun on idle PSR wa only when pkgc latency > delayed vblank")
Signed-off-by: Jouni Högander <jouni.hogander@intel.com>
Reviewed-by: Uma Shankar <uma.shankar@intel.com>
Link: https://lore.kernel.org/r/20250822105846.1023631-1-jouni.hogander@intel.com

diff --git a/drivers/gpu/drm/i915/display/intel_psr.c b/drivers/gpu/drm/i915/display/intel_psr.c
index eec4f7dc2d6683ef65de2a31febec5fce4875a41..681e20d92376d18631a2a655a8636c740cfb2875 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_psr.c
+++ b/drivers/gpu/drm/i915/display/intel_psr.c
@@ -2095,8 +2095,9 @@ static void intel_psr_exit(struct intel_dp *intel_dp)
 
                drm_WARN_ON(display->drm, !(val & EDP_PSR2_ENABLE));
        } else {
-               if (DISPLAY_VER(display) == 20 ||
-                   IS_DISPLAY_VERx100_STEP(display, 3000, STEP_A0, STEP_B0))
+               if ((DISPLAY_VER(display) == 20 ||
+                    IS_DISPLAY_VERx100_STEP(display, 3000, STEP_A0, STEP_B0)) &&
+                       intel_dp->psr.pkg_c_latency_used)
                        intel_dmc_start_pkgc_exit_at_start_of_undelayed_vblank(display,
                                                                       intel_dp->psr.pipe,
                                                                       false);