drm/i915: Don't set plane visible during HW readout if CRTC is off
authorMatt Roper <matthew.d.roper@intel.com>
Thu, 24 Sep 2015 22:53:17 +0000 (15:53 -0700)
committerDaniel Vetter <daniel.vetter@ffwll.ch>
Wed, 30 Sep 2015 15:17:55 +0000 (17:17 +0200)
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@intel.com>
Reviewed-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
drivers/gpu/drm/i915/intel_display.c

index f293de83ca9a9f6956eb27b6abf87b8542970990..b6a68bd1743c18d06b8a40909e9f5d32c7722581 100644 (file)
@@ -15166,7 +15166,7 @@ static void readout_plane_state(struct intel_crtc *crtc)
        struct intel_plane_state *plane_state =
                to_intel_plane_state(primary->state);
 
-       plane_state->visible =
+       plane_state->visible = crtc->active &&
                primary_get_hw_state(to_intel_plane(primary));
 
        if (plane_state->visible)