From e114b981bc291049fa6996d487334a408acc1ce2 Mon Sep 17 00:00:00 2001
From: Jesse Barnes <jbarnes@hobbes.virtuousgeek.org>
Date: Tue, 10 Apr 2007 10:31:58 -0700
Subject: Export drm_setup for use by new driver init code.

---
 linux-core/drm_fops.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'linux-core/drm_fops.c')

diff --git a/linux-core/drm_fops.c b/linux-core/drm_fops.c
index d400a4d5..6f0465fd 100644
--- a/linux-core/drm_fops.c
+++ b/linux-core/drm_fops.c
@@ -41,7 +41,7 @@
 static int drm_open_helper(struct inode *inode, struct file *filp,
 			   drm_device_t * dev);
 
-static int drm_setup(drm_device_t * dev)
+int drm_setup(drm_device_t * dev)
 {
 	drm_local_map_t *map;
 	int i;
@@ -121,6 +121,7 @@ static int drm_setup(drm_device_t * dev)
 
 	return 0;
 }
+EXPORT_SYMBOL(drm_setup);
 
 /**
  * Open file.
-- 
cgit v1.2.3


From f2e3d790ac05b2792e795f47fee32fe896a096cc Mon Sep 17 00:00:00 2001
From: Jesse Barnes <jbarnes@hobbes.virtuousgeek.org>
Date: Thu, 12 Apr 2007 08:53:03 -0700
Subject: Revert "Export drm_setup for use by new driver init code.", we don't
 really want to use this function

This reverts commit e114b981bc291049fa6996d487334a408acc1ce2.
---
 linux-core/drm_fops.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'linux-core/drm_fops.c')

diff --git a/linux-core/drm_fops.c b/linux-core/drm_fops.c
index 6f0465fd..d400a4d5 100644
--- a/linux-core/drm_fops.c
+++ b/linux-core/drm_fops.c
@@ -41,7 +41,7 @@
 static int drm_open_helper(struct inode *inode, struct file *filp,
 			   drm_device_t * dev);
 
-int drm_setup(drm_device_t * dev)
+static int drm_setup(drm_device_t * dev)
 {
 	drm_local_map_t *map;
 	int i;
@@ -121,7 +121,6 @@ int drm_setup(drm_device_t * dev)
 
 	return 0;
 }
-EXPORT_SYMBOL(drm_setup);
 
 /**
  * Open file.
-- 
cgit v1.2.3


From 79aa1d54746f33c33ffbf98fb96ccbf88c3cb390 Mon Sep 17 00:00:00 2001
From: Dave Airlie <airlied@linux.ie>
Date: Tue, 17 Apr 2007 18:16:38 +1000
Subject: another large overhaul of interactions with userspace...

We need to keep a list of user created fbs to nuke on master exit.
We also need to use the bo properly.
---
 linux-core/drm_fops.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'linux-core/drm_fops.c')

diff --git a/linux-core/drm_fops.c b/linux-core/drm_fops.c
index d400a4d5..e4748978 100644
--- a/linux-core/drm_fops.c
+++ b/linux-core/drm_fops.c
@@ -86,7 +86,7 @@ static int drm_setup(drm_device_t * dev)
 	INIT_LIST_HEAD(&dev->ctxlist->head);
 
 	dev->vmalist = NULL;
-	dev->sigdata.lock = NULL;
+	//	dev->sigdata.lock = NULL;
 	init_waitqueue_head(&dev->lock.lock_queue);
 	dev->queue_count = 0;
 	dev->queue_reserved = 0;
@@ -270,6 +270,7 @@ static int drm_open_helper(struct inode *inode, struct file *filp,
 
 	INIT_LIST_HEAD(&priv->user_objects);
 	INIT_LIST_HEAD(&priv->refd_objects);
+	INIT_LIST_HEAD(&priv->fbs);
 
 	for (i=0; i<_DRM_NO_REF_TYPES; ++i) {
 		ret = drm_ht_create(&priv->refd_object_hash[i], DRM_FILE_HASH_ORDER);
@@ -501,6 +502,7 @@ int drm_release(struct inode *inode, struct file *filp)
 	mutex_unlock(&dev->ctxlist_mutex);
 
 	mutex_lock(&dev->struct_mutex);
+	drm_fb_release(filp);
 	drm_object_release(filp);
 	if (priv->remove_auth_on_close == 1) {
 		drm_file_t *temp = dev->file_first;
-- 
cgit v1.2.3


From 8fd8bf599b42b6caa062afabdfce7385d59a7695 Mon Sep 17 00:00:00 2001
From: Jerome Glisse <glisse@freedesktop.org>
Date: Sun, 18 Nov 2007 19:16:40 +0100
Subject: drm: don't reset to 0 irq_enabled when client open file descriptor

---
 linux-core/drm_fops.c | 1 -
 1 file changed, 1 deletion(-)

(limited to 'linux-core/drm_fops.c')

diff --git a/linux-core/drm_fops.c b/linux-core/drm_fops.c
index ffee1027..a5277b7b 100644
--- a/linux-core/drm_fops.c
+++ b/linux-core/drm_fops.c
@@ -85,7 +85,6 @@ static int drm_setup(struct drm_device * dev)
 	dev->queue_reserved = 0;
 	dev->queue_slots = 0;
 	dev->queuelist = NULL;
-	dev->irq_enabled = 0;
 	dev->context_flag = 0;
 	dev->interrupt_flag = 0;
 	dev->dma_flag = 0;
-- 
cgit v1.2.3


From a19e0efb0e03dbaad68e281b7e018663fb8c3589 Mon Sep 17 00:00:00 2001
From: Dave Airlie <airlied@redhat.com>
Date: Tue, 18 Dec 2007 19:17:11 +1100
Subject: lockdep warned about a possible locking dependency

---
 linux-core/drm_fops.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'linux-core/drm_fops.c')

diff --git a/linux-core/drm_fops.c b/linux-core/drm_fops.c
index cc09fc14..7efcb23f 100644
--- a/linux-core/drm_fops.c
+++ b/linux-core/drm_fops.c
@@ -472,8 +472,8 @@ int drm_release(struct inode *inode, struct file *filp)
 	}
 	mutex_unlock(&dev->ctxlist_mutex);
 
-	mutex_lock(&dev->struct_mutex);
 	drm_fb_release(filp);
+	mutex_lock(&dev->struct_mutex);
 	drm_object_release(filp);
 	if (file_priv->remove_auth_on_close == 1) {
 		struct drm_file *temp;
-- 
cgit v1.2.3


From 10937cf20b6814e4cf68114fab4619fad94eafcb Mon Sep 17 00:00:00 2001
From: Dave Airlie <airlied@redhat.com>
Date: Fri, 4 Jan 2008 16:12:24 +1100
Subject: drm: move drm_head to drm_minor and fix up users

---
 linux-core/drm_fops.c | 23 +++++++++++------------
 1 file changed, 11 insertions(+), 12 deletions(-)

(limited to 'linux-core/drm_fops.c')

diff --git a/linux-core/drm_fops.c b/linux-core/drm_fops.c
index 7efcb23f..28aaeb1f 100644
--- a/linux-core/drm_fops.c
+++ b/linux-core/drm_fops.c
@@ -131,13 +131,13 @@ int drm_open(struct inode *inode, struct file *filp)
 	int minor = iminor(inode);
 	int retcode = 0;
 
-	if (!((minor >= 0) && (minor < drm_cards_limit)))
+	if (!((minor >= 0) && (minor < drm_minors_limit)))
 		return -ENODEV;
 
-	if (!drm_heads[minor])
+	if (!drm_minors[minor])
 		return -ENODEV;
 
-	if (!(dev = drm_heads[minor]->dev))
+	if (!(dev = drm_minors[minor]->dev))
 		return -ENODEV;
 
 	retcode = drm_open_helper(inode, filp, dev);
@@ -182,13 +182,13 @@ int drm_stub_open(struct inode *inode, struct file *filp)
 
 	DRM_DEBUG("\n");
 
-	if (!((minor >= 0) && (minor < drm_cards_limit)))
+	if (!((minor >= 0) && (minor < drm_minors_limit)))
 		return -ENODEV;
 
-	if (!drm_heads[minor])
+	if (!drm_minors[minor])
 		return -ENODEV;
 
-	if (!(dev = drm_heads[minor]->dev))
+	if (!(dev = drm_minors[minor]->dev))
 		return -ENODEV;
 
 	old_fops = filp->f_op;
@@ -254,8 +254,7 @@ static int drm_open_helper(struct inode *inode, struct file *filp,
 	priv->filp = filp;
 	priv->uid = current->euid;
 	priv->pid = current->pid;
-	priv->minor = minor;
-	priv->head = drm_heads[minor];
+	priv->minor = drm_minors[minor];
 	priv->ioctl_count = 0;
 	/* for compatibility root is always authenticated */
 	priv->authenticated = capable(CAP_SYS_ADMIN);
@@ -321,11 +320,11 @@ static int drm_open_helper(struct inode *inode, struct file *filp,
 int drm_fasync(int fd, struct file *filp, int on)
 {
 	struct drm_file *priv = filp->private_data;
-	struct drm_device *dev = priv->head->dev;
+	struct drm_device *dev = priv->minor->dev;
 	int retcode;
 
 	DRM_DEBUG("fd = %d, device = 0x%lx\n", fd,
-		  (long)old_encode_dev(priv->head->device));
+		  (long)old_encode_dev(priv->minor->device));
 	retcode = fasync_helper(fd, filp, on, &dev->buf_async);
 	if (retcode < 0)
 		return retcode;
@@ -375,7 +374,7 @@ static void drm_object_release(struct file *filp)
 int drm_release(struct inode *inode, struct file *filp)
 {
 	struct drm_file *file_priv = filp->private_data;
-	struct drm_device *dev = file_priv->head->dev;
+	struct drm_device *dev = file_priv->minor->dev;
 	int retcode = 0;
 
 	lock_kernel();
@@ -390,7 +389,7 @@ int drm_release(struct inode *inode, struct file *filp)
 	 */
 
 	DRM_DEBUG("pid = %d, device = 0x%lx, open_count = %d\n",
-		  current->pid, (long)old_encode_dev(file_priv->head->device),
+		  current->pid, (long)old_encode_dev(file_priv->minor->device),
 		  dev->open_count);
 
 	if (dev->driver->reclaim_buffers_locked && dev->lock.hw_lock) {
-- 
cgit v1.2.3


From f276c845bde4c712aa383540a2dd2055ecc00031 Mon Sep 17 00:00:00 2001
From: Dave Airlie <airlied@redhat.com>
Date: Wed, 13 Feb 2008 12:12:52 +1000
Subject: drm: re-write minor number allocation to use an idr.

Fixup the minor number allocation scheme to use an idr and move the control
nodes up higher.
---
 linux-core/drm_fops.c | 30 ++++++++++++++----------------
 1 file changed, 14 insertions(+), 16 deletions(-)

(limited to 'linux-core/drm_fops.c')

diff --git a/linux-core/drm_fops.c b/linux-core/drm_fops.c
index 28aaeb1f..344d90e1 100644
--- a/linux-core/drm_fops.c
+++ b/linux-core/drm_fops.c
@@ -128,16 +128,15 @@ static int drm_setup(struct drm_device * dev)
 int drm_open(struct inode *inode, struct file *filp)
 {
 	struct drm_device *dev = NULL;
-	int minor = iminor(inode);
+	int minor_id = iminor(inode);
+	struct drm_minor *minor;
 	int retcode = 0;
 
-	if (!((minor >= 0) && (minor < drm_minors_limit)))
+	minor = idr_find(&drm_minors_idr, minor_id);
+	if (!minor)
 		return -ENODEV;
 
-	if (!drm_minors[minor])
-		return -ENODEV;
-
-	if (!(dev = drm_minors[minor]->dev))
+	if (!(dev = minor->dev))
 		return -ENODEV;
 
 	retcode = drm_open_helper(inode, filp, dev);
@@ -176,19 +175,18 @@ EXPORT_SYMBOL(drm_open);
 int drm_stub_open(struct inode *inode, struct file *filp)
 {
 	struct drm_device *dev = NULL;
-	int minor = iminor(inode);
+	struct drm_minor *minor;
+	int minor_id = iminor(inode);
 	int err = -ENODEV;
 	const struct file_operations *old_fops;
 
 	DRM_DEBUG("\n");
 
-	if (!((minor >= 0) && (minor < drm_minors_limit)))
+	minor = idr_find(&drm_minors_idr, minor_id);
+	if (!minor)
 		return -ENODEV;
-
-	if (!drm_minors[minor])
-		return -ENODEV;
-
-	if (!(dev = drm_minors[minor]->dev))
+	
+	if (!(dev = minor->dev))
 		return -ENODEV;
 
 	old_fops = filp->f_op;
@@ -233,7 +231,7 @@ static int drm_cpu_valid(void)
 static int drm_open_helper(struct inode *inode, struct file *filp,
 			   struct drm_device * dev)
 {
-	int minor = iminor(inode);
+	int minor_id = iminor(inode);
 	struct drm_file *priv;
 	int ret;
 	int i, j;
@@ -243,7 +241,7 @@ static int drm_open_helper(struct inode *inode, struct file *filp,
 	if (!drm_cpu_valid())
 		return -EINVAL;
 
-	DRM_DEBUG("pid = %d, minor = %d\n", current->pid, minor);
+	DRM_DEBUG("pid = %d, minor = %d\n", current->pid, minor_id);
 
 	priv = drm_alloc(sizeof(*priv), DRM_MEM_FILES);
 	if (!priv)
@@ -254,7 +252,7 @@ static int drm_open_helper(struct inode *inode, struct file *filp,
 	priv->filp = filp;
 	priv->uid = current->euid;
 	priv->pid = current->pid;
-	priv->minor = drm_minors[minor];
+	priv->minor = idr_find(&drm_minors_idr, minor_id);
 	priv->ioctl_count = 0;
 	/* for compatibility root is always authenticated */
 	priv->authenticated = capable(CAP_SYS_ADMIN);
-- 
cgit v1.2.3


From 0fbee62ec14d08714dbc558dd20cc00b9a79c042 Mon Sep 17 00:00:00 2001
From: Dave Airlie <airlied@redhat.com>
Date: Wed, 13 Feb 2008 15:19:42 +1000
Subject: major port of multi-master ideas into modesetting

---
 linux-core/drm_fops.c | 67 +++++++++++++++++++++++++++++++++------------------
 1 file changed, 44 insertions(+), 23 deletions(-)

(limited to 'linux-core/drm_fops.c')

diff --git a/linux-core/drm_fops.c b/linux-core/drm_fops.c
index 344d90e1..c699e967 100644
--- a/linux-core/drm_fops.c
+++ b/linux-core/drm_fops.c
@@ -54,8 +54,6 @@ static int drm_setup(struct drm_device * dev)
 			return ret;
 	}
 
-	dev->magicfree.next = NULL;
-
 	/* prebuild the SAREA */
 	sareapage = max(SAREA_MAX, PAGE_SIZE);
 	i = drm_addmap(dev, 0, sareapage, _DRM_SHM, _DRM_CONTAINS_LOCK, &map);
@@ -76,11 +74,8 @@ static int drm_setup(struct drm_device * dev)
 	for (i = 0; i < ARRAY_SIZE(dev->counts); i++)
 		atomic_set(&dev->counts[i], 0);
 
-	drm_ht_create(&dev->magiclist, DRM_MAGIC_HASH_ORDER);
-	INIT_LIST_HEAD(&dev->magicfree);
-
 	dev->sigdata.lock = NULL;
-	init_waitqueue_head(&dev->lock.lock_queue);
+
 	dev->queue_count = 0;
 	dev->queue_reserved = 0;
 	dev->queue_slots = 0;
@@ -282,8 +277,26 @@ static int drm_open_helper(struct inode *inode, struct file *filp,
 	}
 
 	mutex_lock(&dev->struct_mutex);
-	if (list_empty(&dev->filelist))
-		priv->master = 1;
+
+	/* if there is no current master make this fd it */
+	if (!dev->primary->master) {
+		priv->master = drm_get_master(dev);
+		if (!priv->master) {
+			ret = -ENOMEM;
+			goto out_free;
+		}
+		dev->primary->master = priv->master;
+
+		if (dev->driver->master_create) {
+			ret = dev->driver->master_create(dev, dev->primary->master);
+			if (ret) {
+				drm_put_master(dev->primary->master);
+				dev->primary->master = priv->master = NULL;
+				goto out_free;
+			}
+		}
+	} else
+		priv->master = NULL;
 
 	list_add(&priv->lhead, &dev->filelist);
 	mutex_unlock(&dev->struct_mutex);
@@ -390,23 +403,23 @@ int drm_release(struct inode *inode, struct file *filp)
 		  current->pid, (long)old_encode_dev(file_priv->minor->device),
 		  dev->open_count);
 
-	if (dev->driver->reclaim_buffers_locked && dev->lock.hw_lock) {
+	if (dev->driver->reclaim_buffers_locked && dev->primary->master->lock.hw_lock) {
 		if (drm_i_have_hw_lock(dev, file_priv)) {
 			dev->driver->reclaim_buffers_locked(dev, file_priv);
 		} else {
 			unsigned long _end=jiffies + 3*DRM_HZ;
 			int locked = 0;
 
-			drm_idlelock_take(&dev->lock);
+			drm_idlelock_take(&dev->primary->master->lock);
 
 			/*
 			 * Wait for a while.
 			 */
 
 			do{
-				spin_lock(&dev->lock.spinlock);
-				locked = dev->lock.idle_has_lock;
-				spin_unlock(&dev->lock.spinlock);
+				spin_lock(&dev->primary->master->lock.spinlock);
+				locked = dev->primary->master->lock.idle_has_lock;
+				spin_unlock(&dev->primary->master->lock.spinlock);
 				if (locked)
 					break;
 				schedule();
@@ -419,24 +432,24 @@ int drm_release(struct inode *inode, struct file *filp)
 			}
 
 			dev->driver->reclaim_buffers_locked(dev, file_priv);
-			drm_idlelock_release(&dev->lock);
+			drm_idlelock_release(&dev->primary->master->lock);
 		}
 	}
 
-	if (dev->driver->reclaim_buffers_idlelocked && dev->lock.hw_lock) {
+	if (dev->driver->reclaim_buffers_idlelocked && dev->primary->master->lock.hw_lock) {
 
-		drm_idlelock_take(&dev->lock);
+		drm_idlelock_take(&dev->primary->master->lock);
 		dev->driver->reclaim_buffers_idlelocked(dev, file_priv);
-		drm_idlelock_release(&dev->lock);
+		drm_idlelock_release(&dev->primary->master->lock);
 
 	}
 
 	if (drm_i_have_hw_lock(dev, file_priv)) {
 		DRM_DEBUG("File %p released, freeing lock for context %d\n",
-			  filp, _DRM_LOCKING_CONTEXT(dev->lock.hw_lock->lock));
+			  filp, _DRM_LOCKING_CONTEXT(dev->primary->master->lock.hw_lock->lock));
 
-		drm_lock_free(&dev->lock,
-			      _DRM_LOCKING_CONTEXT(dev->lock.hw_lock->lock));
+		drm_lock_free(&dev->primary->master->lock,
+			      _DRM_LOCKING_CONTEXT(dev->primary->master->lock.hw_lock->lock));
 	}
 
 
@@ -479,6 +492,14 @@ int drm_release(struct inode *inode, struct file *filp)
 			temp->authenticated = 0;
 	}
 	list_del(&file_priv->lhead);
+
+	if (file_priv->master) {
+		if (file_priv->master == dev->primary->master)
+		       dev->primary->master = NULL;
+	       drm_put_master(file_priv->master);
+	       file_priv->master = NULL;
+	}
+
 	mutex_unlock(&dev->struct_mutex);
 
 	if (dev->driver->postclose)
@@ -492,9 +513,9 @@ int drm_release(struct inode *inode, struct file *filp)
 	atomic_inc(&dev->counts[_DRM_STAT_CLOSES]);
 	spin_lock(&dev->count_lock);
 	if (!--dev->open_count) {
-		if (atomic_read(&dev->ioctl_count) || dev->blocked) {
-			DRM_ERROR("Device busy: %d %d\n",
-				  atomic_read(&dev->ioctl_count), dev->blocked);
+		if (atomic_read(&dev->ioctl_count)) {
+			DRM_ERROR("Device busy: %d\n",
+				  atomic_read(&dev->ioctl_count));
 			spin_unlock(&dev->count_lock);
 			unlock_kernel();
 			return -EBUSY;
-- 
cgit v1.2.3


From a4fc1d7ac6be8d2648acda463723d56c68e4122e Mon Sep 17 00:00:00 2001
From: Dave Airlie <airlied@redhat.com>
Date: Wed, 13 Feb 2008 16:30:15 +1000
Subject: start moving over to proper hierarchy wrt master accesses

---
 linux-core/drm_fops.c | 64 +++++++++++++++++++++++----------------------------
 1 file changed, 29 insertions(+), 35 deletions(-)

(limited to 'linux-core/drm_fops.c')

diff --git a/linux-core/drm_fops.c b/linux-core/drm_fops.c
index c699e967..6ac09fb9 100644
--- a/linux-core/drm_fops.c
+++ b/linux-core/drm_fops.c
@@ -43,10 +43,8 @@ static int drm_open_helper(struct inode *inode, struct file *filp,
 
 static int drm_setup(struct drm_device * dev)
 {
-	drm_local_map_t *map;
 	int i;
 	int ret;
-	int sareapage;
 
 	if (dev->driver->firstopen) {
 		ret = dev->driver->firstopen(dev);
@@ -54,12 +52,6 @@ static int drm_setup(struct drm_device * dev)
 			return ret;
 	}
 
-	/* prebuild the SAREA */
-	sareapage = max(SAREA_MAX, PAGE_SIZE);
-	i = drm_addmap(dev, 0, sareapage, _DRM_SHM, _DRM_CONTAINS_LOCK, &map);
-	if (i != 0)
-		return i;
-
 	atomic_set(&dev->ioctl_count, 0);
 	atomic_set(&dev->vma_count, 0);
 	dev->buf_use = 0;
@@ -279,25 +271,27 @@ static int drm_open_helper(struct inode *inode, struct file *filp,
 	mutex_lock(&dev->struct_mutex);
 
 	/* if there is no current master make this fd it */
-	if (!dev->primary->master) {
-		priv->master = drm_get_master(dev);
-		if (!priv->master) {
+	if (!priv->minor->master) {
+		priv->minor->master = drm_get_master(priv->minor);
+		if (!priv->minor->master) {
 			ret = -ENOMEM;
 			goto out_free;
 		}
-		dev->primary->master = priv->master;
+
+		priv->is_master = 1;
+		priv->master = priv->minor->master;
 
 		if (dev->driver->master_create) {
-			ret = dev->driver->master_create(dev, dev->primary->master);
+			ret = dev->driver->master_create(dev, priv->master);
 			if (ret) {
-				drm_put_master(dev->primary->master);
-				dev->primary->master = priv->master = NULL;
+				drm_put_master(priv->minor->master);
+				priv->minor->master = priv->master = NULL;
 				goto out_free;
 			}
 		}
-	} else
-		priv->master = NULL;
-
+	}
+	else
+		priv->master = priv->minor->master;
 	list_add(&priv->lhead, &dev->filelist);
 	mutex_unlock(&dev->struct_mutex);
 
@@ -403,23 +397,23 @@ int drm_release(struct inode *inode, struct file *filp)
 		  current->pid, (long)old_encode_dev(file_priv->minor->device),
 		  dev->open_count);
 
-	if (dev->driver->reclaim_buffers_locked && dev->primary->master->lock.hw_lock) {
+	if (dev->driver->reclaim_buffers_locked && file_priv->master->lock.hw_lock) {
 		if (drm_i_have_hw_lock(dev, file_priv)) {
 			dev->driver->reclaim_buffers_locked(dev, file_priv);
 		} else {
 			unsigned long _end=jiffies + 3*DRM_HZ;
 			int locked = 0;
 
-			drm_idlelock_take(&dev->primary->master->lock);
+			drm_idlelock_take(&file_priv->master->lock);
 
 			/*
 			 * Wait for a while.
 			 */
 
 			do{
-				spin_lock(&dev->primary->master->lock.spinlock);
-				locked = dev->primary->master->lock.idle_has_lock;
-				spin_unlock(&dev->primary->master->lock.spinlock);
+				spin_lock(&file_priv->master->lock.spinlock);
+				locked = file_priv->master->lock.idle_has_lock;
+				spin_unlock(&file_priv->master->lock.spinlock);
 				if (locked)
 					break;
 				schedule();
@@ -432,24 +426,24 @@ int drm_release(struct inode *inode, struct file *filp)
 			}
 
 			dev->driver->reclaim_buffers_locked(dev, file_priv);
-			drm_idlelock_release(&dev->primary->master->lock);
+			drm_idlelock_release(&file_priv->master->lock);
 		}
 	}
 
-	if (dev->driver->reclaim_buffers_idlelocked && dev->primary->master->lock.hw_lock) {
+	if (dev->driver->reclaim_buffers_idlelocked && file_priv->master->lock.hw_lock) {
 
-		drm_idlelock_take(&dev->primary->master->lock);
+		drm_idlelock_take(&file_priv->master->lock);
 		dev->driver->reclaim_buffers_idlelocked(dev, file_priv);
-		drm_idlelock_release(&dev->primary->master->lock);
+		drm_idlelock_release(&file_priv->master->lock);
 
 	}
 
 	if (drm_i_have_hw_lock(dev, file_priv)) {
 		DRM_DEBUG("File %p released, freeing lock for context %d\n",
-			  filp, _DRM_LOCKING_CONTEXT(dev->primary->master->lock.hw_lock->lock));
+			  filp, _DRM_LOCKING_CONTEXT(file_priv->master->lock.hw_lock->lock));
 
-		drm_lock_free(&dev->primary->master->lock,
-			      _DRM_LOCKING_CONTEXT(dev->primary->master->lock.hw_lock->lock));
+		drm_lock_free(&file_priv->master->lock,
+			      _DRM_LOCKING_CONTEXT(file_priv->master->lock.hw_lock->lock));
 	}
 
 
@@ -493,13 +487,13 @@ int drm_release(struct inode *inode, struct file *filp)
 	}
 	list_del(&file_priv->lhead);
 
-	if (file_priv->master) {
-		if (file_priv->master == dev->primary->master)
-		       dev->primary->master = NULL;
-	       drm_put_master(file_priv->master);
-	       file_priv->master = NULL;
+	if (file_priv->is_master) {
+	       drm_put_master(file_priv->minor->master);
+	       file_priv->minor->master = NULL;
 	}
 
+	file_priv->master = NULL;
+
 	mutex_unlock(&dev->struct_mutex);
 
 	if (dev->driver->postclose)
-- 
cgit v1.2.3


From 222092a1a810b67b014ad6881f0c028ec6563329 Mon Sep 17 00:00:00 2001
From: Dave Airlie <airlied@redhat.com>
Date: Fri, 15 Feb 2008 16:15:04 +1000
Subject: various fixes from trying to get userspace started

---
 linux-core/drm_fops.c | 25 ++++++++++++++++---------
 1 file changed, 16 insertions(+), 9 deletions(-)

(limited to 'linux-core/drm_fops.c')

diff --git a/linux-core/drm_fops.c b/linux-core/drm_fops.c
index 6ac09fb9..5a74f424 100644
--- a/linux-core/drm_fops.c
+++ b/linux-core/drm_fops.c
@@ -268,9 +268,9 @@ static int drm_open_helper(struct inode *inode, struct file *filp,
 			goto out_free;
 	}
 
-	mutex_lock(&dev->struct_mutex);
 
 	/* if there is no current master make this fd it */
+	mutex_lock(&dev->struct_mutex);
 	if (!priv->minor->master) {
 		priv->minor->master = drm_get_master(priv->minor);
 		if (!priv->minor->master) {
@@ -281,17 +281,22 @@ static int drm_open_helper(struct inode *inode, struct file *filp,
 		priv->is_master = 1;
 		priv->master = priv->minor->master;
 
+		mutex_unlock(&dev->struct_mutex);
 		if (dev->driver->master_create) {
 			ret = dev->driver->master_create(dev, priv->master);
 			if (ret) {
 				drm_put_master(priv->minor->master);
 				priv->minor->master = priv->master = NULL;
+				mutex_unlock(&dev->struct_mutex);
 				goto out_free;
 			}
 		}
-	}
-	else
+	} else {
 		priv->master = priv->minor->master;
+		mutex_unlock(&dev->struct_mutex);
+	}
+
+	mutex_lock(&dev->struct_mutex);
 	list_add(&priv->lhead, &dev->filelist);
 	mutex_unlock(&dev->struct_mutex);
 
@@ -477,6 +482,14 @@ int drm_release(struct inode *inode, struct file *filp)
 	mutex_unlock(&dev->ctxlist_mutex);
 
 	drm_fb_release(filp);
+
+	file_priv->master = NULL;
+
+	if (file_priv->is_master) {
+	       drm_put_master(file_priv->minor->master);
+	       file_priv->minor->master = NULL;
+	}
+
 	mutex_lock(&dev->struct_mutex);
 	drm_object_release(filp);
 	if (file_priv->remove_auth_on_close == 1) {
@@ -487,12 +500,6 @@ int drm_release(struct inode *inode, struct file *filp)
 	}
 	list_del(&file_priv->lhead);
 
-	if (file_priv->is_master) {
-	       drm_put_master(file_priv->minor->master);
-	       file_priv->minor->master = NULL;
-	}
-
-	file_priv->master = NULL;
 
 	mutex_unlock(&dev->struct_mutex);
 
-- 
cgit v1.2.3


From 01dcc47d895997f77c9457558e974d41c23ed4e1 Mon Sep 17 00:00:00 2001
From: Dave Airlie <airlied@redhat.com>
Date: Thu, 28 Feb 2008 16:24:17 +1000
Subject: drm: add modesetting as a driver feature.

This change adds a driver feature that for i915 is controlled by a module
parameter. You now need to do insmod i915.ko modeset=1 to enable it the
modesetting paths.

It also fixes up lots of X paths. I can run my new DDX driver on this code
with and without modesetting enabled
---
 linux-core/drm_fops.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'linux-core/drm_fops.c')

diff --git a/linux-core/drm_fops.c b/linux-core/drm_fops.c
index 5a74f424..fcadc544 100644
--- a/linux-core/drm_fops.c
+++ b/linux-core/drm_fops.c
@@ -481,7 +481,8 @@ int drm_release(struct inode *inode, struct file *filp)
 	}
 	mutex_unlock(&dev->ctxlist_mutex);
 
-	drm_fb_release(filp);
+	if (drm_core_check_feature(dev, DRIVER_MODESET))
+		drm_fb_release(filp);
 
 	file_priv->master = NULL;
 
-- 
cgit v1.2.3


From 981f515e2bd4d570ea33bb74ae82cd5b56cc9121 Mon Sep 17 00:00:00 2001
From: Dave Airlie <airlied@panoply-rh.(none)>
Date: Wed, 12 Mar 2008 14:48:01 +1000
Subject: drm: fix fd closing ordering.

If the master fd goes away before the aiglx fd, we try and get a lock
that actually doesn't exist.
---
 linux-core/drm_fops.c | 96 +++++++++++++++++++++++++++------------------------
 1 file changed, 50 insertions(+), 46 deletions(-)

(limited to 'linux-core/drm_fops.c')

diff --git a/linux-core/drm_fops.c b/linux-core/drm_fops.c
index fcadc544..0ca43824 100644
--- a/linux-core/drm_fops.c
+++ b/linux-core/drm_fops.c
@@ -402,59 +402,63 @@ int drm_release(struct inode *inode, struct file *filp)
 		  current->pid, (long)old_encode_dev(file_priv->minor->device),
 		  dev->open_count);
 
-	if (dev->driver->reclaim_buffers_locked && file_priv->master->lock.hw_lock) {
-		if (drm_i_have_hw_lock(dev, file_priv)) {
-			dev->driver->reclaim_buffers_locked(dev, file_priv);
-		} else {
-			unsigned long _end=jiffies + 3*DRM_HZ;
-			int locked = 0;
-
-			drm_idlelock_take(&file_priv->master->lock);
-
-			/*
-			 * Wait for a while.
-			 */
-
-			do{
-				spin_lock(&file_priv->master->lock.spinlock);
-				locked = file_priv->master->lock.idle_has_lock;
-				spin_unlock(&file_priv->master->lock.spinlock);
-				if (locked)
-					break;
-				schedule();
-			} while (!time_after_eq(jiffies, _end));
-
-			if (!locked) {
-				DRM_ERROR("reclaim_buffers_locked() deadlock. Please rework this\n"
-					  "\tdriver to use reclaim_buffers_idlelocked() instead.\n"
-					  "\tI will go on reclaiming the buffers anyway.\n");
+	/* if the master has gone away we can't do anything with the lock */
+	if (file_priv->minor->master) {
+		if (dev->driver->reclaim_buffers_locked && file_priv->master->lock.hw_lock) {
+			if (drm_i_have_hw_lock(dev, file_priv)) {
+				dev->driver->reclaim_buffers_locked(dev, file_priv);
+			} else {
+				unsigned long _end=jiffies + 3*DRM_HZ;
+				int locked = 0;
+				
+				drm_idlelock_take(&file_priv->master->lock);
+				
+				/*
+				 * Wait for a while.
+				 */
+				
+				do{
+					spin_lock(&file_priv->master->lock.spinlock);
+					locked = file_priv->master->lock.idle_has_lock;
+					spin_unlock(&file_priv->master->lock.spinlock);
+					if (locked)
+						break;
+					schedule();
+				} while (!time_after_eq(jiffies, _end));
+				
+				if (!locked) {
+					DRM_ERROR("reclaim_buffers_locked() deadlock. Please rework this\n"
+						  "\tdriver to use reclaim_buffers_idlelocked() instead.\n"
+						  "\tI will go on reclaiming the buffers anyway.\n");
+				}
+				
+				dev->driver->reclaim_buffers_locked(dev, file_priv);
+				drm_idlelock_release(&file_priv->master->lock);
 			}
+		}
 
-			dev->driver->reclaim_buffers_locked(dev, file_priv);
+		if (dev->driver->reclaim_buffers_idlelocked && file_priv->master->lock.hw_lock) {
+			
+			drm_idlelock_take(&file_priv->master->lock);
+			dev->driver->reclaim_buffers_idlelocked(dev, file_priv);
 			drm_idlelock_release(&file_priv->master->lock);
+			
 		}
-	}
-
-	if (dev->driver->reclaim_buffers_idlelocked && file_priv->master->lock.hw_lock) {
 
-		drm_idlelock_take(&file_priv->master->lock);
-		dev->driver->reclaim_buffers_idlelocked(dev, file_priv);
-		drm_idlelock_release(&file_priv->master->lock);
-
-	}
-
-	if (drm_i_have_hw_lock(dev, file_priv)) {
-		DRM_DEBUG("File %p released, freeing lock for context %d\n",
-			  filp, _DRM_LOCKING_CONTEXT(file_priv->master->lock.hw_lock->lock));
-
-		drm_lock_free(&file_priv->master->lock,
-			      _DRM_LOCKING_CONTEXT(file_priv->master->lock.hw_lock->lock));
-	}
 
+		if (drm_i_have_hw_lock(dev, file_priv)) {
+			DRM_DEBUG("File %p released, freeing lock for context %d\n",
+				  filp, _DRM_LOCKING_CONTEXT(file_priv->master->lock.hw_lock->lock));
+			
+			drm_lock_free(&file_priv->master->lock,
+				      _DRM_LOCKING_CONTEXT(file_priv->master->lock.hw_lock->lock));
+		}
+		
 
-	if (drm_core_check_feature(dev, DRIVER_HAVE_DMA) &&
-	    !dev->driver->reclaim_buffers_locked) {
-		dev->driver->reclaim_buffers(dev, file_priv);
+		if (drm_core_check_feature(dev, DRIVER_HAVE_DMA) &&
+		    !dev->driver->reclaim_buffers_locked) {
+			dev->driver->reclaim_buffers(dev, file_priv);
+		}
 	}
 
 	drm_fasync(-1, filp, 0);
-- 
cgit v1.2.3


From e6be93b2a6f508b2284a6d352f5f0640ef1a542a Mon Sep 17 00:00:00 2001
From: Dave Airlie <airlied@panoply-rh.(none)>
Date: Mon, 17 Mar 2008 16:33:15 +1000
Subject: drm: pick correct master for cleaning up

When a master is exiting, make sure we clean it up and not the currently
in charge master.
---
 linux-core/drm_fops.c | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

(limited to 'linux-core/drm_fops.c')

diff --git a/linux-core/drm_fops.c b/linux-core/drm_fops.c
index 0ca43824..d5c59b19 100644
--- a/linux-core/drm_fops.c
+++ b/linux-core/drm_fops.c
@@ -488,13 +488,15 @@ int drm_release(struct inode *inode, struct file *filp)
 	if (drm_core_check_feature(dev, DRIVER_MODESET))
 		drm_fb_release(filp);
 
-	file_priv->master = NULL;
-
 	if (file_priv->is_master) {
-	       drm_put_master(file_priv->minor->master);
-	       file_priv->minor->master = NULL;
+		if (file_priv->minor->master == file_priv->master)
+			file_priv->minor->master = NULL;
+		drm_put_master(file_priv->master);
 	}
 
+	file_priv->master = NULL;
+	file_priv->is_master = 0;
+
 	mutex_lock(&dev->struct_mutex);
 	drm_object_release(filp);
 	if (file_priv->remove_auth_on_close == 1) {
-- 
cgit v1.2.3


From acb6c9ef97df999f3fa87639b1bb4f2840970f71 Mon Sep 17 00:00:00 2001
From: Dave Airlie <airlied@redhat.com>
Date: Thu, 27 Mar 2008 15:55:49 +1000
Subject: drm: remove authentication on master exit.

using contexts for this is bad for multiple masters
---
 linux-core/drm_fops.c | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

(limited to 'linux-core/drm_fops.c')

diff --git a/linux-core/drm_fops.c b/linux-core/drm_fops.c
index d5c59b19..043552fd 100644
--- a/linux-core/drm_fops.c
+++ b/linux-core/drm_fops.c
@@ -489,6 +489,13 @@ int drm_release(struct inode *inode, struct file *filp)
 		drm_fb_release(filp);
 
 	if (file_priv->is_master) {
+		struct drm_file *temp;
+		list_for_each_entry(temp, &dev->filelist, lhead) {
+			if ((temp->master == file_priv->master) &&
+			    (temp != file_priv))
+				temp->authenticated = 0;
+		}
+
 		if (file_priv->minor->master == file_priv->master)
 			file_priv->minor->master = NULL;
 		drm_put_master(file_priv->master);
@@ -499,15 +506,9 @@ int drm_release(struct inode *inode, struct file *filp)
 
 	mutex_lock(&dev->struct_mutex);
 	drm_object_release(filp);
-	if (file_priv->remove_auth_on_close == 1) {
-		struct drm_file *temp;
 
-		list_for_each_entry(temp, &dev->filelist, lhead)
-			temp->authenticated = 0;
-	}
 	list_del(&file_priv->lhead);
 
-
 	mutex_unlock(&dev->struct_mutex);
 
 	if (dev->driver->postclose)
-- 
cgit v1.2.3


From 1eedeed09192738334570e13acab381441f3d817 Mon Sep 17 00:00:00 2001
From: Dave Airlie <airlied@redhat.com>
Date: Mon, 12 May 2008 16:28:58 +1000
Subject: drm: masters are always authenticated

---
 linux-core/drm_fops.c | 1 +
 1 file changed, 1 insertion(+)

(limited to 'linux-core/drm_fops.c')

diff --git a/linux-core/drm_fops.c b/linux-core/drm_fops.c
index a9f39ac5..03881ee6 100644
--- a/linux-core/drm_fops.c
+++ b/linux-core/drm_fops.c
@@ -281,6 +281,7 @@ static int drm_open_helper(struct inode *inode, struct file *filp,
 		priv->is_master = 1;
 		priv->master = priv->minor->master;
 
+		priv->authenticated = 1;
 		mutex_unlock(&dev->struct_mutex);
 		if (dev->driver->master_create) {
 			ret = dev->driver->master_create(dev, priv->master);
-- 
cgit v1.2.3


From 9b8d71b5eb09857b07409731d3de182751f712a2 Mon Sep 17 00:00:00 2001
From: Dave Airlie <airlied@redhat.com>
Date: Thu, 31 Jul 2008 12:54:48 +1000
Subject: TTM: remove API and userspace objects.

This removes all the TTM userspace API and all userspace objects.

It also removes the drm_bo_lock.c code
---
 linux-core/drm_fops.c | 43 -------------------------------------------
 1 file changed, 43 deletions(-)

(limited to 'linux-core/drm_fops.c')

diff --git a/linux-core/drm_fops.c b/linux-core/drm_fops.c
index 3b3a0a3c..8eb20b47 100644
--- a/linux-core/drm_fops.c
+++ b/linux-core/drm_fops.c
@@ -221,7 +221,6 @@ static int drm_open_helper(struct inode *inode, struct file *filp,
 	int minor_id = iminor(inode);
 	struct drm_file *priv;
 	int ret;
-	int i, j;
 
 	if (filp->f_flags & O_EXCL)
 		return -EBUSY;	/* No exclusive opens */
@@ -246,22 +245,8 @@ static int drm_open_helper(struct inode *inode, struct file *filp,
 	priv->lock_count = 0;
 
 	INIT_LIST_HEAD(&priv->lhead);
-	INIT_LIST_HEAD(&priv->refd_objects);
 	INIT_LIST_HEAD(&priv->fbs);
 
-	for (i = 0; i < _DRM_NO_REF_TYPES; ++i) {
-		ret = drm_ht_create(&priv->refd_object_hash[i],
-				    DRM_FILE_HASH_ORDER);
-		if (ret)
-			break;
-	}
-
-	if (ret) {
-		for (j = 0; j < i; ++j)
-			drm_ht_remove(&priv->refd_object_hash[j]);
-		goto out_free;
-	}
-
 	if (dev->driver->driver_features & DRIVER_GEM)
 		drm_gem_open(dev, priv);
 
@@ -346,33 +331,6 @@ int drm_fasync(int fd, struct file *filp, int on)
 }
 EXPORT_SYMBOL(drm_fasync);
 
-static void drm_object_release(struct file *filp)
-{
-	struct drm_file *priv = filp->private_data;
-	struct list_head *head;
-	struct drm_ref_object *ref_object;
-	int i;
-
-	/*
-	 * Free leftover ref objects created by me. Note that we cannot use
-	 * list_for_each() here, as the struct_mutex may be temporarily
-	 * released by the remove_() functions, and thus the lists may be
-	 * altered.
-	 * Also, a drm_remove_ref_object() will not remove it
-	 * from the list unless its refcount is 1.
-	 */
-
-	head = &priv->refd_objects;
-	while (head->next != head) {
-		ref_object = list_entry(head->next, struct drm_ref_object, list);
-		drm_remove_ref_object(priv, ref_object);
-		head = &priv->refd_objects;
-	}
-
-	for (i = 0; i < _DRM_NO_REF_TYPES; ++i)
-		drm_ht_remove(&priv->refd_object_hash[i]);
-}
-
 /**
  * Release file.
  *
@@ -512,7 +470,6 @@ int drm_release(struct inode *inode, struct file *filp)
 	file_priv->is_master = 0;
 
 	mutex_lock(&dev->struct_mutex);
-	drm_object_release(filp);
 
 	list_del(&file_priv->lhead);
 
-- 
cgit v1.2.3


From 717dd804d0d1d9984345a998b28ee47079c70639 Mon Sep 17 00:00:00 2001
From: Dave Airlie <airlied@redhat.com>
Date: Mon, 4 Aug 2008 14:54:32 +1000
Subject: drm: fixup master code to use krefs

---
 linux-core/drm_fops.c | 31 +++++++++++++++++++------------
 1 file changed, 19 insertions(+), 12 deletions(-)

(limited to 'linux-core/drm_fops.c')

diff --git a/linux-core/drm_fops.c b/linux-core/drm_fops.c
index 8eb20b47..f45d5e46 100644
--- a/linux-core/drm_fops.c
+++ b/linux-core/drm_fops.c
@@ -260,28 +260,34 @@ static int drm_open_helper(struct inode *inode, struct file *filp,
 	/* if there is no current master make this fd it */
 	mutex_lock(&dev->struct_mutex);
 	if (!priv->minor->master) {
-		priv->minor->master = drm_get_master(priv->minor);
+		/* create a new master */
+		priv->minor->master = drm_master_create(priv->minor);
 		if (!priv->minor->master) {
 			ret = -ENOMEM;
 			goto out_free;
 		}
 
 		priv->is_master = 1;
-		priv->master = priv->minor->master;
+		/* take another reference for the copy in the local file priv */
+		priv->master = drm_master_get(priv->minor->master);
 
 		priv->authenticated = 1;
+
 		mutex_unlock(&dev->struct_mutex);
 		if (dev->driver->master_create) {
 			ret = dev->driver->master_create(dev, priv->master);
 			if (ret) {
-				drm_put_master(priv->minor->master);
-				priv->minor->master = priv->master = NULL;
+				mutex_lock(&dev->struct_mutex);
+				/* drop both references if this fails */
+				drm_master_put(&priv->minor->master);
+				drm_master_put(&priv->master);
 				mutex_unlock(&dev->struct_mutex);
 				goto out_free;
 			}
 		}
 	} else {
-		priv->master = priv->minor->master;
+		/* get a reference to the master */
+		priv->master = drm_master_get(priv->minor->master);
 		mutex_unlock(&dev->struct_mutex);
 	}
 
@@ -453,6 +459,8 @@ int drm_release(struct inode *inode, struct file *filp)
 	if (drm_core_check_feature(dev, DRIVER_MODESET))
 		drm_fb_release(filp);
 
+	mutex_lock(&dev->struct_mutex);
+
 	if (file_priv->is_master) {
 		struct drm_file *temp;
 		list_for_each_entry(temp, &dev->filelist, lhead) {
@@ -461,18 +469,17 @@ int drm_release(struct inode *inode, struct file *filp)
 				temp->authenticated = 0;
 		}
 
-		if (file_priv->minor->master == file_priv->master)
-			file_priv->minor->master = NULL;
-		drm_put_master(file_priv->master);
+		if (file_priv->minor->master == file_priv->master) {
+			/* drop the reference held my the minor */
+			drm_master_put(&file_priv->minor->master);
+		}
 	}
 
-	file_priv->master = NULL;
+	/* drop the reference held my the file priv */
+	drm_master_put(&file_priv->master);
 	file_priv->is_master = 0;
 
-	mutex_lock(&dev->struct_mutex);
-
 	list_del(&file_priv->lhead);
-
 	mutex_unlock(&dev->struct_mutex);
 
 	if (dev->driver->postclose)
-- 
cgit v1.2.3


From 957c71ff52e93bb2c1bc01b99d29d763d0ef3899 Mon Sep 17 00:00:00 2001
From: Dave Airlie <airlied@redhat.com>
Date: Thu, 14 Aug 2008 09:10:11 +1000
Subject: radeon: FEDORA: add old DMA buffers on top of GEM

This really shouldn't go upstream, it just lets me
run the old 3D driver on GEM setup system
---
 linux-core/drm_fops.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'linux-core/drm_fops.c')

diff --git a/linux-core/drm_fops.c b/linux-core/drm_fops.c
index f45d5e46..7bc73d26 100644
--- a/linux-core/drm_fops.c
+++ b/linux-core/drm_fops.c
@@ -54,10 +54,11 @@ static int drm_setup(struct drm_device * dev)
 
 	atomic_set(&dev->ioctl_count, 0);
 	atomic_set(&dev->vma_count, 0);
-	dev->buf_use = 0;
-	atomic_set(&dev->buf_alloc, 0);
 
-	if (drm_core_check_feature(dev, DRIVER_HAVE_DMA)) {
+	if (drm_core_check_feature(dev, DRIVER_HAVE_DMA) && !drm_core_check_feature(dev, DRIVER_MODESET)) {
+		dev->buf_use = 0;
+		atomic_set(&dev->buf_alloc, 0);
+
 		i = drm_dma_setup(dev);
 		if (i < 0)
 			return i;
-- 
cgit v1.2.3