Merge branch 'locking-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[karo-tx-linux.git] / drivers / gpu / drm / i915 / intel_display.c

diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index ac407e3e1eddf5efc30d4b5fa95d64d4298178e2..b2270d576979bd2acf42b6bec10d48eed947ab57 100644 (file)
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -15101,11 +15101,15 @@ static bool primary_get_hw_state(struct intel_plane *plane)
 /* FIXME read out full plane state for all planes */
 static void readout_plane_state(struct intel_crtc *crtc)
 {
+       struct drm_plane *primary = crtc->base.primary;
        struct intel_plane_state *plane_state =
-               to_intel_plane_state(crtc->base.primary->state);
+               to_intel_plane_state(primary->state);
 
        plane_state->visible =
-               primary_get_hw_state(to_intel_plane(crtc->base.primary));
+               primary_get_hw_state(to_intel_plane(primary));
+
+       if (plane_state->visible)
+               crtc->base.state->plane_mask |= 1 << drm_plane_index(primary);
 }
 
 static void intel_modeset_readout_hw_state(struct drm_device *dev)