From: Dave Airlie <airlied@redhat.com>
Date: Tue, 16 Sep 2014 01:28:52 +0000 (+1000)
Subject: drm: backmerge tag 'v3.17-rc5' into drm-next
X-Git-Tag: Ubuntu-5.2.0-15.16~12609^2~35
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=b2efb3f0a1db62aff5e824125785ec6731143b6d;p=mirror_ubuntu-eoan-kernel.git

drm: backmerge tag 'v3.17-rc5' into drm-next

This is requested to get the fixes for intel and radeon into the
same tree for future development work.

i915_display.c: fix missing dev_priv conflict.
---

b2efb3f0a1db62aff5e824125785ec6731143b6d
diff --cc drivers/gpu/drm/i915/intel_display.c
index 0b327ebb2d9e,d8324c69fa86..32ede71fbe7f
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@@ -8253,9 -8209,10 +8263,10 @@@ static int intel_crtc_cursor_set_obj(st
  				     uint32_t width, uint32_t height)
  {
  	struct drm_device *dev = crtc->dev;
+ 	struct drm_i915_private *dev_priv = dev->dev_private;
  	struct intel_crtc *intel_crtc = to_intel_crtc(crtc);
  	enum pipe pipe = intel_crtc->pipe;
 -	unsigned old_width;
 +	unsigned old_width, stride;
  	uint32_t addr;
  	int ret;