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.

diff --cc drivers/gpu/drm/drm_crtc.c
Simple merge

diff --cc drivers/gpu/drm/i915/i915_dma.c
Simple merge

diff --cc drivers/gpu/drm/i915/i915_drv.h
Simple merge

diff --cc drivers/gpu/drm/i915/i915_gem.c
Simple merge

diff --cc drivers/gpu/drm/i915/i915_reg.h
Simple merge

diff --cc drivers/gpu/drm/i915/intel_bios.c
Simple merge

diff --cc drivers/gpu/drm/i915/intel_display.c
index 0b327ebb2d9e6662a9c1da7f08b9828d9e1b9aab,d8324c69fa868de2364cf1b272426f5a634c5c31..32ede71fbe7f8500a200807409b26b8a6d58f539
--- 1/drivers/gpu/drm/i915/intel_display.c
--- 2/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;
  

diff --cc drivers/gpu/drm/i915/intel_dp.c
Simple merge

diff --cc drivers/gpu/drm/i915/intel_lvds.c
Simple merge

diff --cc drivers/gpu/drm/i915/intel_ringbuffer.c
Simple merge

diff --cc drivers/gpu/drm/msm/hdmi/hdmi.c
Simple merge

diff --cc drivers/gpu/drm/msm/mdp/mdp4/mdp4_crtc.c
Simple merge

diff --cc drivers/gpu/drm/msm/msm_drv.c
Simple merge

diff --cc drivers/gpu/drm/radeon/cik.c
Simple merge

diff --cc drivers/gpu/drm/radeon/r600.c
Simple merge

diff --cc drivers/gpu/drm/radeon/radeon.h
Simple merge

diff --cc drivers/gpu/drm/radeon/radeon_semaphore.c
Simple merge

diff --cc drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c
Simple merge

diff --cc drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c
Simple merge

diff --cc drivers/staging/imx-drm/ipuv3-plane.c
Simple merge