[Intel-gfx] [PATCH 12/14] drm/i915: Don't set plane visible during HW readout if CRTC is off

Matt Roper matthew.d.roper at intel.com
Mon Sep 14 19:19:28 PDT 2015


We already ensure that pstate->visible = false when crtc->active = false
during runtime programming; make sure we follow the same logic when
reading out initial hardware state.

Signed-off-by: Matt Roper <matthew.d.roper at 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 0f513e5..36eee4a 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -15108,7 +15108,7 @@ static void readout_plane_state(struct intel_crtc *crtc,
 
 		plane_state = to_intel_plane_state(p->base.state);
 
-		if (p->base.type == DRM_PLANE_TYPE_PRIMARY)
+		if (p->base.type == DRM_PLANE_TYPE_PRIMARY && active)
 			plane_state->visible = primary_get_hw_state(crtc);
 		else {
 			if (active)
-- 
2.1.4



More information about the Intel-gfx mailing list