Merge drm/drm-next into drm-misc-next

Picking up v5.0 + missed misc-fixes from last release

Signed-off-by: Sean Paul <seanpaul@chromium.org>

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

diff --cc drivers/gpu/drm/drm_file.c
index f782d31,83a5bbc..9701469
--- 1/drivers/gpu/drm/drm_file.c
--- 2/drivers/gpu/drm/drm_file.c
+++ b/drivers/gpu/drm/drm_file.c
@@@ -473,15 -487,13 +487,11 @@@ int drm_release(struct inode *inode, st
  
        DRM_DEBUG("open_count = %d\n", dev->open_count);
  
-       mutex_lock(&dev->filelist_mutex);
-       list_del(&file_priv->lhead);
-       mutex_unlock(&dev->filelist_mutex);
- 
-       drm_file_free(file_priv);
+       drm_close_helper(filp);
  
 -      if (!--dev->open_count) {
 +      if (!--dev->open_count)
                drm_lastclose(dev);
 -              if (drm_dev_is_unplugged(dev))
 -                      drm_put_dev(dev);
 -      }
 +
        mutex_unlock(&drm_global_mutex);
  
        drm_minor_release(minor);

diff --cc drivers/gpu/drm/imx/imx-drm-core.c
Simple merge

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

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

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