Merge commit '06d1ee32a4d25356a710b49d5e95dbdd68bdf505' of git://git.kernel.org/pub...

Backmerge the drm-fixes pull from Linus's tree into drm-next.

This is to fix some conflicts and make future pulls cleaner

diff --cc drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
Simple merge

diff --cc drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
Simple merge

diff --cc drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c
Simple merge

diff --cc drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h
Simple merge

diff --cc drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
Simple merge

diff --cc drivers/gpu/drm/amd/amdgpu/dce_v11_0.c
Simple merge

diff --cc drivers/gpu/drm/drm_fb_helper.c
index abe9793d548d0cac5c674abcd4d1c037ca1855a1,ca08c472311bd3f6238f7513bc4ac26737228884..bd6d4ab2751250ab9af68f0aa9f91e0cb44463ce
--- 1/drivers/gpu/drm/drm_fb_helper.c
--- 2/drivers/gpu/drm/drm_fb_helper.c
+++ b/drivers/gpu/drm/drm_fb_helper.c
@@@ -442,10 -345,14 +442,14 @@@ static int restore_fbdev_mode(struct dr
                struct drm_crtc *crtc = mode_set->crtc;
                int ret;
  
-               if (crtc->funcs->cursor_set) {
+               if (crtc->funcs->cursor_set2) {
+                       ret = crtc->funcs->cursor_set2(crtc, NULL, 0, 0, 0, 0, 0);
+                       if (ret)
 -                              error = true;
++                              return ret;
+               } else if (crtc->funcs->cursor_set) {
                        ret = crtc->funcs->cursor_set(crtc, NULL, 0, 0, 0);
                        if (ret)
 -                              error = true;
 +                              return ret;
                }
  
                ret = drm_mode_set_config_internal(mode_set);

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

diff --cc drivers/gpu/drm/exynos/exynos_drm_crtc.c
Simple merge

diff --cc drivers/gpu/drm/exynos/exynos_drm_drv.c
Simple merge

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

diff --cc drivers/gpu/drm/i915/intel_lrc.c
index 256167b2e2abf477e1db4f66e3cd33abf71bae02,7412caedcf7f98a2a5e494c41e2bad97f34d4e34..825fa7a8df86ec1aeaa7287c0cc88f1a4ecc0f89
--- 1/drivers/gpu/drm/i915/intel_lrc.c
--- 2/drivers/gpu/drm/i915/intel_lrc.c
+++ b/drivers/gpu/drm/i915/intel_lrc.c
@@@ -519,8 -492,10 +519,8 @@@ void intel_lrc_irq_handler(struct intel
  
        while (read_pointer < write_pointer) {
                read_pointer++;
-               status = I915_READ(RING_CONTEXT_STATUS_BUF_LO(ring, read_pointer % 6));
-               status_id = I915_READ(RING_CONTEXT_STATUS_BUF_HI(ring, read_pointer % 6));
 -              status = I915_READ(RING_CONTEXT_STATUS_BUF(ring) +
 -                              (read_pointer % GEN8_CSB_ENTRIES) * 8);
 -              status_id = I915_READ(RING_CONTEXT_STATUS_BUF(ring) +
 -                              (read_pointer % GEN8_CSB_ENTRIES) * 8 + 4);
++              status = I915_READ(RING_CONTEXT_STATUS_BUF_LO(ring, read_pointer % GEN8_CSB_ENTRIES));
++              status_id = I915_READ(RING_CONTEXT_STATUS_BUF_HI(ring, read_pointer % GEN8_CSB_ENTRIES));
  
                if (status & GEN8_CTX_STATUS_IDLE_ACTIVE)
                        continue;
@@@ -1477,10 -1424,8 +1479,11 @@@ static int gen8_init_common_ring(struc
  {
        struct drm_device *dev = ring->dev;
        struct drm_i915_private *dev_priv = dev->dev_private;
+       u8 next_context_status_buffer_hw;
  
 +      lrc_setup_hardware_status_page(ring,
 +                              ring->default_context->engine[ring->id].state);
 +
        I915_WRITE_IMR(ring, ~(ring->irq_enable_mask | ring->irq_keep_mask));
        I915_WRITE(RING_HWSTAM(ring->mmio_base), 0xffffffff);
  

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

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

diff --cc drivers/gpu/drm/nouveau/nouveau_display.c
Simple merge

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

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

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

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

diff --cc include/drm/drm_dp_helper.h
Simple merge