[PATCH 4/4] debug

[José Roberto de Souza]

Signed-off-by: José Roberto de Souza <jose.souza at intel.com>

debug
---
 drivers/gpu/drm/i915/display/intel_crtc.c | 25 ++++++++++++++---------
 drivers/gpu/drm/i915/display/intel_psr.c  |  5 ++++-
 2 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/drivers/gpu/drm/i915/display/intel_crtc.c b/drivers/gpu/drm/i915/display/intel_crtc.c
index 808c6500ac1b1..f431ffc4d5928 100644
--- a/drivers/gpu/drm/i915/display/intel_crtc.c
+++ b/drivers/gpu/drm/i915/display/intel_crtc.c
@@ -493,14 +493,6 @@ void intel_pipe_update_start(struct intel_crtc_state *new_crtc_state)
 	if (intel_crtc_needs_vblank_work(new_crtc_state))
 		intel_crtc_vblank_work_init(new_crtc_state);
 
-	intel_psr_lock(new_crtc_state);
-	/*
-	 * Wait for psr to idle out after enabling the VBL interrupts
-	 * VBL interrupts will start the PSR exit and prevent a PSR
-	 * re-entry as well.
-	 */
-	intel_psr_wait_for_idle_locked(new_crtc_state);
-
 	if (new_crtc_state->vrr.enable) {
 		if (intel_vrr_is_push_sent(new_crtc_state))
 			vblank_start = intel_vrr_vmin_vblank_start(new_crtc_state);
@@ -515,11 +507,24 @@ void intel_pipe_update_start(struct intel_crtc_state *new_crtc_state)
 						      VBLANK_EVASION_TIME_US);
 	max = vblank_start - 1;
 
-	if (min <= 0 || max <= 0)
+	intel_psr_lock(new_crtc_state);
+
+	if (min <= 0 || max <= 0) {
+		drm_info(&dev_priv->drm, "min(%i) <= 0 || max(%i) <= 0 | zeh\n", min, max);
 		goto irq_disable;
+	}
 
-	if (drm_WARN_ON(&dev_priv->drm, drm_crtc_vblank_get(&crtc->base)))
+	if (drm_WARN_ON(&dev_priv->drm, drm_crtc_vblank_get(&crtc->base))) {
+		drm_info(&dev_priv->drm, "!drm_crtc_vblank_get | zeh\n");
 		goto irq_disable;
+	}
+
+	/*
+	 * Wait for psr to idle out after enabling the VBL interrupts
+	 * VBL interrupts will start the PSR exit and prevent a PSR
+	 * re-entry as well.
+	 */
+	intel_psr_wait_for_idle_locked(new_crtc_state);
 
 	local_irq_disable();
 
diff --git a/drivers/gpu/drm/i915/display/intel_psr.c b/drivers/gpu/drm/i915/display/intel_psr.c
index 5b1963b7743dc..a706f1ef8ee3d 100644
--- a/drivers/gpu/drm/i915/display/intel_psr.c
+++ b/drivers/gpu/drm/i915/display/intel_psr.c
@@ -1967,8 +1967,11 @@ void intel_psr_wait_for_idle_locked(const struct intel_crtc_state *new_crtc_stat
 		else
 			ret = _psr1_ready_for_pipe_update_locked(intel_dp);
 
-		if (ret)
+		if (ret) {
 			drm_err(&dev_priv->drm, "PSR wait timed out, atomic update may fail\n");
+			drm_info(&dev_priv->drm, "hw.adjusted mode " DRM_MODE_FMT " | zeh\n",
+				 DRM_MODE_ARG(&new_crtc_state->hw.adjusted_mode));
+		}
 	}
 }
 
-- 
2.35.1