Back merge tag 'v4.4-rc4' into drm-next

We've picked up a few conflicts and it would be nice
to resolve them before we move onwards.

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

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

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

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

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

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

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

diff --cc drivers/gpu/drm/imx/imx-drm-core.c
index 6faa735376ecdaf10faf42351d4edb7b92de2bb0,7b990b4e96d234bcdc965572383092e3d9b303a0..882cf3d4b7a8c88d140ea0368e2557236ceeb445
--- 1/drivers/gpu/drm/imx/imx-drm-core.c
--- 2/drivers/gpu/drm/imx/imx-drm-core.c
+++ b/drivers/gpu/drm/imx/imx-drm-core.c
@@@ -62,10 -60,11 +62,9 @@@ EXPORT_SYMBOL_GPL(imx_drm_crtc_id)
  
  static void imx_drm_driver_lastclose(struct drm_device *drm)
  {
 -#if IS_ENABLED(CONFIG_DRM_IMX_FB_HELPER)
        struct imx_drm_device *imxdrm = drm->dev_private;
  
-       if (imxdrm->fbhelper)
-               drm_fbdev_cma_restore_mode(imxdrm->fbhelper);
+       drm_fbdev_cma_restore_mode(imxdrm->fbhelper);
 -#endif
  }
  
  static int imx_drm_driver_unload(struct drm_device *drm)

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_mode.h
Simple merge

diff --cc drivers/gpu/drm/virtio/virtgpu_display.c
Simple merge

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