From: Sean Paul <seanpaul@chromium.org>
Date: Wed, 6 Mar 2019 14:22:18 +0000 (-0500)
Subject: Merge drm/drm-next into drm-misc-next
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=cd7d3a1bb42e0756b17ccfafbd956ca7ed757846;p=linux.git

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

cd7d3a1bb42e0756b17ccfafbd956ca7ed757846
diff --cc drivers/gpu/drm/drm_file.c
index f782d3103d29b,83a5bbca6e7e0..9701469a6e933
--- a/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);