From: Daniel Vetter <daniel.vetter@ffwll.ch>
Date: Fri, 20 Mar 2015 10:43:59 +0000 (+0100)
Subject: Merge tag 'drm-intel-fixes-2015-03-19' into drm-intel-next
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=0f9e9cd61f46c07246e30871fd638ffeaca3c576;p=GitHub%2FLineageOS%2Fandroid_kernel_motorola_exynos9610.git

Merge tag 'drm-intel-fixes-2015-03-19' into drm-intel-next

Backmerge because of numerous and interleaving conflicts and git
rerere getting confused a bit too often.

Conflicts:
	drivers/gpu/drm/i915/intel_display.c

All conflicts are because of -next patches backported to -fixes, so
just go with the code in -next.

Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
---

0f9e9cd61f46c07246e30871fd638ffeaca3c576
diff --cc drivers/gpu/drm/i915/intel_display.c
index 10af910c3d26,6d22128d97b1..90b460cf2b57
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@@ -2537,7 -2471,8 +2538,6 @@@ intel_find_plane_obj(struct intel_crtc 
  			break;
  		}
  	}
--
 -	update_state_fb(intel_crtc->base.primary);
  }
  
  static void i9xx_update_primary_plane(struct drm_crtc *crtc,