[Intel-gfx] [PATCH 1/2] drm/i915: Fix intel_crtc_disable_noatomic disabling.

[Maarten Lankhorst]

plane_mask is not accurate during hw readout,
use 1 << drm_plane_index(primary) instead.

wait_for_pending_flips should be a noop now. This function is now
only called during init or resume sanitization. In both cases
there are no pending flips from the driver.

Signed-off-by: Maarten Lankhorst <maarten.lankhorst at linux.intel.com>
---
 drivers/gpu/drm/i915/intel_display.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index 69c95213c27b..904e900c0d83 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -6153,11 +6153,13 @@ static void intel_crtc_disable_noatomic(struct drm_crtc *crtc)
 		return;
 
 	if (to_intel_plane_state(crtc->primary->state)->visible) {
-		intel_crtc_wait_for_pending_flips(crtc);
+		unsigned plane_mask = 1 << drm_plane_index(crtc->primary);
+
 		intel_pre_disable_primary(crtc);
+
+		intel_crtc_disable_planes(crtc, plane_mask);
 	}
 
-	intel_crtc_disable_planes(crtc, crtc->state->plane_mask);
 	dev_priv->display.crtc_disable(crtc);
 	intel_disable_shared_dpll(intel_crtc);
 
-- 
2.1.0