[Intel-gfx] [PATCH] drm/i915: Do not update pipe state when crtc is inactive.

Maarten Lankhorst maarten.lankhorst at linux.intel.com
Tue Sep 22 07:26:14 PDT 2015


Nothing good can come from detaching scalers or updating pipe config
when the crtc is already disabled. Touching registers while the crtc
and power wells are disabled causes unclaimed register access warnings.

Reported-by: Mika Kuoppala <mika.kuoppala at intel.com>
Signed-off-by: Maarten Lankhorst <maarten.lankhorst at linux.intel.com>
---
 drivers/gpu/drm/i915/intel_display.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index a4c24e6f5d6f..5a68290bf8c6 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -13527,7 +13527,7 @@ static void intel_begin_crtc_commit(struct drm_crtc *crtc,
 	/* Perform vblank evasion around commit operation */
 	intel_pipe_update_start(intel_crtc);
 
-	if (modeset)
+	if (modeset || !crtc->state->active)
 		return;
 
 	if (to_intel_crtc_state(crtc->state)->update_pipe)
-- 
2.1.0



More information about the Intel-gfx mailing list