From: Matt Roper <matthew.d.roper@intel.com>
Date: Thu, 24 Sep 2015 22:53:17 +0000 (-0700)
Subject: drm/i915: Don't set plane visible during HW readout if CRTC is off
X-Git-Tag: v4.4-rc1~66^2~18^2~59
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=a4611e4;p=users%2Fjedix%2Flinux-maple.git

drm/i915: Don't set plane visible during HW readout if CRTC is off

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>
---

diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index f293de83ca9a..b6a68bd1743c 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -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)