[PATCH 2/2] squash

[José Roberto de Souza]

---
 drivers/gpu/drm/i915/display/intel_psr.c | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/i915/display/intel_psr.c b/drivers/gpu/drm/i915/display/intel_psr.c
index 111d6f222963..0937ca2877f7 100644
--- a/drivers/gpu/drm/i915/display/intel_psr.c
+++ b/drivers/gpu/drm/i915/display/intel_psr.c
@@ -1104,6 +1104,11 @@ static void psr_force_hw_tracking_exit(struct drm_i915_private *dev_priv)
 		DEFINE_WAIT(wait);
 		int min, max;
 
+		if (!dev_priv->psr.crtc->active) {
+			drm_dbg_kms(&dev_priv->drm, "!dev_priv->psr.crtc->active\n");
+			return;
+		}
+
 		min = dev_priv->psr.adjusted.crtc_vblank_start -
 				intel_usecs_to_scanlines(&dev_priv->psr.adjusted, 250);
 		max = dev_priv->psr.adjusted.crtc_vblank_start - 1;
@@ -1121,7 +1126,10 @@ static void psr_force_hw_tracking_exit(struct drm_i915_private *dev_priv)
 			if (scanline < min || scanline > max)
 				break;
 
-			drm_WARN_ON(&dev_priv->drm, !timeout);
+			if (!timeout) {
+				drm_err(&dev_priv->drm, "Potential atomic update failure | scanline=%i min=%i max=%i\n", scanline, min, max	);
+				break;
+			}
 
 			local_irq_enable();
 			timeout = schedule_timeout(timeout);
-- 
2.27.0