From: Takashi Iwai <tiwai@suse.de>
Date: Wed, 23 Dec 2015 07:33:34 +0000 (+0100)
Subject: Merge branch 'for-linus' into for-next
X-Git-Tag: MMI-PSA29.97-13-9~8628^2~38
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=59c8231089be96165735585694a801ae58ec6c95;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

Merge branch 'for-linus' into for-next

Conflicts:
	drivers/gpu/drm/i915/intel_pm.c
---

59c8231089be96165735585694a801ae58ec6c95
diff --cc drivers/gpu/drm/i915/intel_display.c
index 696f7543d264,62211abe4922..15a9ab428553
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@@ -6323,12 -6307,13 +6323,14 @@@ static void intel_crtc_disable_noatomic
  		return;
  
  	if (to_intel_plane_state(crtc->primary->state)->visible) {
 -		intel_crtc_wait_for_pending_flips(crtc);
 +		WARN_ON(intel_crtc->unpin_work);
 +
  		intel_pre_disable_primary(crtc);
+ 
+ 		intel_crtc_disable_planes(crtc, 1 << drm_plane_index(crtc->primary));
+ 		to_intel_plane_state(crtc->primary->state)->visible = false;
  	}
  
- 	intel_crtc_disable_planes(crtc, crtc->state->plane_mask);
  	dev_priv->display.crtc_disable(crtc);
  	intel_crtc->active = false;
  	intel_update_watermarks(crtc);