public inbox for intel-gfx@lists.freedesktop.org
 help / color / mirror / Atom feed
* [Intel-gfx] [PATCH] drm/i915/display: Ensure PSR gets disabled if no encoders in new state
@ 2022-07-11  6:16 Jouni Högander
  2022-07-11  6:49 ` [Intel-gfx] ✓ Fi.CI.BAT: success for " Patchwork
                   ` (2 more replies)
  0 siblings, 3 replies; 4+ messages in thread
From: Jouni Högander @ 2022-07-11  6:16 UTC (permalink / raw)
  To: intel-gfx

Currently PSR is left enabled when all planes are disabled if there
is no attached encoder in new state. This seems to be causing FIFO
underruns.

Fix this by checking if old and new crtc encoder masks are differing.
PSR is disabled for encoders not in new crtc state encoder mask.

Cc: Mika Kahola <mika.kahola@intel.com>
Reported-by: Stanislav Lisovskiy <stanislav.lisovskiy@intel.com>
Signed-off-by: Jouni Högander <jouni.hogander@intel.com>
---
 drivers/gpu/drm/i915/display/intel_psr.c | 72 +++++++++++++++++-------
 1 file changed, 51 insertions(+), 21 deletions(-)

diff --git a/drivers/gpu/drm/i915/display/intel_psr.c b/drivers/gpu/drm/i915/display/intel_psr.c
index e6a870641cd2..710cc31ace22 100644
--- a/drivers/gpu/drm/i915/display/intel_psr.c
+++ b/drivers/gpu/drm/i915/display/intel_psr.c
@@ -1863,36 +1863,66 @@ void intel_psr_pre_plane_update(struct intel_atomic_state *state,
 				struct intel_crtc *crtc)
 {
 	struct drm_i915_private *i915 = to_i915(state->base.dev);
-	const struct intel_crtc_state *crtc_state =
-		intel_atomic_get_new_crtc_state(state, crtc);
+	struct intel_crtc_state *new_crtc_state, *old_crtc_state;
 	struct intel_encoder *encoder;
+	struct intel_dp *intel_dp;
+	struct intel_psr *psr;
+	int i;
 
 	if (!HAS_PSR(i915))
 		return;
 
-	for_each_intel_encoder_mask_with_psr(state->base.dev, encoder,
-					     crtc_state->uapi.encoder_mask) {
-		struct intel_dp *intel_dp = enc_to_intel_dp(encoder);
-		struct intel_psr *psr = &intel_dp->psr;
-		bool needs_to_disable = false;
-
-		mutex_lock(&psr->lock);
-
+	for_each_oldnew_intel_crtc_in_state(state, crtc, old_crtc_state,
+					    new_crtc_state, i) {
 		/*
-		 * Reasons to disable:
-		 * - PSR disabled in new state
-		 * - All planes will go inactive
-		 * - Changing between PSR versions
+		 * Check if encoder exists in new state and disable
+		 * psr if it doesn't. Otherwise we will end update
+		 * having all planes disabled and psr enabled which
+		 * seems to be causing problems.
 		 */
-		needs_to_disable |= intel_crtc_needs_modeset(crtc_state);
-		needs_to_disable |= !crtc_state->has_psr;
-		needs_to_disable |= !crtc_state->active_planes;
-		needs_to_disable |= crtc_state->has_psr2 != psr->psr2_enabled;
+		if (old_crtc_state->uapi.encoder_mask != new_crtc_state->uapi.encoder_mask) {
+			for_each_intel_encoder_mask_with_psr(state->base.dev, encoder,
+							     old_crtc_state->uapi.encoder_mask) {
+				intel_dp = enc_to_intel_dp(encoder);
+				psr = &intel_dp->psr;
 
-		if (psr->enabled && needs_to_disable)
-			intel_psr_disable_locked(intel_dp);
+				if (new_crtc_state->uapi.encoder_mask &
+				    drm_encoder_mask(&(encoder)->base))
+					continue;
 
-		mutex_unlock(&psr->lock);
+				mutex_lock(&psr->lock);
+
+				if (psr->enabled)
+					intel_psr_disable_locked(intel_dp);
+
+				mutex_unlock(&psr->lock);
+			}
+		}
+		for_each_intel_encoder_mask_with_psr(state->base.dev, encoder,
+						     new_crtc_state->uapi.encoder_mask) {
+			bool needs_to_disable = false;
+
+			intel_dp = enc_to_intel_dp(encoder);
+			psr = &intel_dp->psr;
+
+			mutex_lock(&psr->lock);
+
+			/*
+			 * Reasons to disable:
+			 * - PSR disabled in new state
+			 * - All planes will go inactive
+			 * - Changing between PSR versions
+			 */
+			needs_to_disable |= intel_crtc_needs_modeset(new_crtc_state);
+			needs_to_disable |= !new_crtc_state->has_psr;
+			needs_to_disable |= !new_crtc_state->active_planes;
+			needs_to_disable |= new_crtc_state->has_psr2 != psr->psr2_enabled;
+
+			if (psr->enabled && needs_to_disable)
+				intel_psr_disable_locked(intel_dp);
+
+			mutex_unlock(&psr->lock);
+		}
 	}
 }
 
-- 
2.25.1


^ permalink raw reply related	[flat|nested] 4+ messages in thread
end of thread, other threads:[~2022-07-11  9:09 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-07-11  6:16 [Intel-gfx] [PATCH] drm/i915/display: Ensure PSR gets disabled if no encoders in new state Jouni Högander
2022-07-11  6:49 ` [Intel-gfx] ✓ Fi.CI.BAT: success for " Patchwork
2022-07-11  8:12 ` [Intel-gfx] ✗ Fi.CI.IGT: failure " Patchwork
2022-07-11  9:09 ` [Intel-gfx] [PATCH] " Lisovskiy, Stanislav

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox