From: Daniel Vetter <daniel.vetter@ffwll.ch>
Date: Thu, 27 Jul 2017 07:33:49 +0000 (+0200)
Subject: Merge airlied/drm-next into drm-intel-next-queued
X-Git-Tag: v4.14-rc1~8^2~20^2~141
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=64282ea2d2a90437c0739ce016b80a1dec16507e;p=platform%2Fkernel%2Flinux-rpi.git

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>
---

64282ea2d2a90437c0739ce016b80a1dec16507e
diff --cc drivers/gpu/drm/i915/i915_drv.c
index 5a21a6f,d310d82..6b583dc
--- a/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);
  
  	/*