From: Dave Airlie <airlied@redhat.com>
Date: Wed, 6 Aug 2014 07:21:13 +0000 (+1000)
Subject: Merge branch 'drm-next' of git://people.freedesktop.org/~dvdhrm/linux into drm-next
X-Git-Tag: v3.17-rc1~82^2~4
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=acf8294fecd4b805b408d02c321a0fd7eef95555;p=linux.git

Merge branch 'drm-next' of git://people.freedesktop.org/~dvdhrm/linux into drm-next

bunch of cleanups
* 'drm-next' of git://people.freedesktop.org/~dvdhrm/linux:
  drm: mark drm_context support as legacy
  drm: make sysfs device always available for minors
  drm: make minor->index available early
  drm: merge drm_drv.c into drm_ioctl.c
  drm: move module initialization to drm_stub.c
  drm: don't de-authenticate clients on master-close
  drm: drop redundant drm_file->is_master
  drm: extract legacy ctxbitmap flushing
---

acf8294fecd4b805b408d02c321a0fd7eef95555
diff --cc drivers/gpu/drm/drm_fops.c
index 8f91062db5b6,ed45ee628e3b..4b060942cb3c
--- a/drivers/gpu/drm/drm_fops.c
+++ b/drivers/gpu/drm/drm_fops.c
@@@ -519,9 -449,12 +453,8 @@@ int drm_release(struct inode *inode, st
  	/* drop the master reference held by the file priv */
  	if (file_priv->master)
  		drm_master_put(&file_priv->master);
- 	file_priv->is_master = 0;
  	mutex_unlock(&dev->master_mutex);
  
 -	mutex_lock(&dev->struct_mutex);
 -	list_del(&file_priv->lhead);
 -	mutex_unlock(&dev->struct_mutex);
 -
  	if (dev->driver->postclose)
  		dev->driver->postclose(dev, file_priv);