Merge airlied/drm-next into drm-intel-next-queued

Resync with upstream to avoid git getting too badly confused. Also, we
have a conflict with the drm_vblank_cleanup removal, which cannot be
resolved by simply taking our side. Bake that in properly.

Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>

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

diff --cc drivers/gpu/drm/i915/i915_drv.c
index 5a21a6fcc90de6b89014ccdee0f3b2ada32e1e43,d310d8245dca6adff2bdfe3f0b35b1ef97b38efc..6b583dc2eb1fa33843c23601220853ec77253d0a
--- 1/drivers/gpu/drm/i915/i915_drv.c
--- 2/drivers/gpu/drm/i915/i915_drv.c
+++ b/drivers/gpu/drm/i915/i915_drv.c
@@@ -1385,8 -1382,8 +1383,6 @@@ void i915_driver_unload(struct drm_devi
  
        intel_gvt_cleanup(dev_priv);
  
-       drm_vblank_cleanup(dev);
 -      i915_driver_unregister(dev_priv);
--
        intel_modeset_cleanup(dev);
  
        /*

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_irq.c
Simple merge

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

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