From 66d32e678627b59e2c45bde8db417154cf85e6d0 Mon Sep 17 00:00:00 2001
From: Chris Wilson <chris@chris-wilson.co.uk>
Date: Sun, 26 Sep 2010 11:03:27 +0100
Subject: [PATCH] --- yaml --- r: 218111 b: refs/heads/master c:
 1c25595f8d31392b8c36b54c624d01591dbfb87b h: refs/heads/master i:   218109:
 01266cc52ae2ea957c9d82ef232dc91e1e67a9b3   218107:
 5de6f243738e5172953dc36f7855ae4e7c6e2964   218103:
 6f066034c2b9c664242eca23b7ac0eedf6728461   218095:
 d56091029388d72af60201c4088199a21961f80f   218079:
 4e45ffe929ae1055a62c50788f4121ee923b7f14   218047:
 598925f27cdea0edd670186b152eae2a91a6e5ed   217983:
 3f95e0116629cbed43dc5754a3ca16825e29f3f0   217855:
 be1545db0f53f55d1f7ddae86f3b9f0fb13d8377   217599:
 478c209b0657fe921ba4de3b93bf898a23dc84b6   217087:
 3db2d0f183aa5c1026c1c4fab28098498e7e4d79 v: v3

---
 [refs]                                |  2 +-
 trunk/drivers/gpu/drm/i915/i915_dma.c |  2 +-
 trunk/drivers/gpu/drm/i915/i915_drv.h |  2 +-
 trunk/drivers/gpu/drm/i915/i915_gem.c | 28 ++++++++++++++-------------
 4 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/[refs] b/[refs]
index d3cdfa7ba566..b7e5d0af946e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 447da18742b170b8e09ac71edf63c5798d2dbb0b
+refs/heads/master: 1c25595f8d31392b8c36b54c624d01591dbfb87b
diff --git a/trunk/drivers/gpu/drm/i915/i915_dma.c b/trunk/drivers/gpu/drm/i915/i915_dma.c
index ba050ed8df51..b752c31fbcff 100644
--- a/trunk/drivers/gpu/drm/i915/i915_dma.c
+++ b/trunk/drivers/gpu/drm/i915/i915_dma.c
@@ -2173,8 +2173,8 @@ int i915_driver_open(struct drm_device *dev, struct drm_file *file)
 
 	file->driver_priv = file_priv;
 
+	spin_lock_init(&file_priv->mm.lock);
 	INIT_LIST_HEAD(&file_priv->mm.request_list);
-	mutex_init(&file_priv->mutex);
 
 	return 0;
 }
diff --git a/trunk/drivers/gpu/drm/i915/i915_drv.h b/trunk/drivers/gpu/drm/i915/i915_drv.h
index f2ff258cdfd5..710d59ea479c 100644
--- a/trunk/drivers/gpu/drm/i915/i915_drv.h
+++ b/trunk/drivers/gpu/drm/i915/i915_drv.h
@@ -851,8 +851,8 @@ struct drm_i915_gem_request {
 };
 
 struct drm_i915_file_private {
-	struct mutex mutex;
 	struct {
+		struct spinlock lock;
 		struct list_head request_list;
 	} mm;
 };
diff --git a/trunk/drivers/gpu/drm/i915/i915_gem.c b/trunk/drivers/gpu/drm/i915/i915_gem.c
index ac5bff85a4c7..78282edc02ca 100644
--- a/trunk/drivers/gpu/drm/i915/i915_gem.c
+++ b/trunk/drivers/gpu/drm/i915/i915_gem.c
@@ -1694,11 +1694,11 @@ i915_add_request(struct drm_device *dev,
 	list_add_tail(&request->list, &ring->request_list);
 
 	if (file_priv) {
-		mutex_lock(&file_priv->mutex);
+		spin_lock(&file_priv->mm.lock);
 		request->file_priv = file_priv;
 		list_add_tail(&request->client_list,
 			      &file_priv->mm.request_list);
-		mutex_unlock(&file_priv->mutex);
+		spin_unlock(&file_priv->mm.lock);
 	}
 
 	if (!dev_priv->mm.suspended) {
@@ -1733,11 +1733,15 @@ i915_retire_commands(struct drm_device *dev, struct intel_ring_buffer *ring)
 static inline void
 i915_gem_request_remove_from_client(struct drm_i915_gem_request *request)
 {
-	if (request->file_priv) {
-		mutex_lock(&request->file_priv->mutex);
-		list_del(&request->client_list);
-		mutex_unlock(&request->file_priv->mutex);
-	}
+	struct drm_i915_file_private *file_priv = request->file_priv;
+
+	if (!file_priv)
+		return;
+
+	spin_lock(&file_priv->mm.lock);
+	list_del(&request->client_list);
+	request->file_priv = NULL;
+	spin_unlock(&file_priv->mm.lock);
 }
 
 static void i915_gem_reset_ring_lists(struct drm_i915_private *dev_priv,
@@ -3464,7 +3468,7 @@ i915_gem_ring_throttle(struct drm_device *dev, struct drm_file *file)
 	u32 seqno = 0;
 	int ret;
 
-	mutex_lock(&file_priv->mutex);
+	spin_lock(&file_priv->mm.lock);
 	list_for_each_entry(request, &file_priv->mm.request_list, client_list) {
 		if (time_after_eq(request->emitted_jiffies, recent_enough))
 			break;
@@ -3472,7 +3476,7 @@ i915_gem_ring_throttle(struct drm_device *dev, struct drm_file *file)
 		ring = request->ring;
 		seqno = request->seqno;
 	}
-	mutex_unlock(&file_priv->mutex);
+	spin_unlock(&file_priv->mm.lock);
 
 	if (seqno == 0)
 		return 0;
@@ -4974,8 +4978,7 @@ void i915_gem_release(struct drm_device *dev, struct drm_file *file)
 	 * later retire_requests won't dereference our soon-to-be-gone
 	 * file_priv.
 	 */
-	mutex_lock(&dev->struct_mutex);
-	mutex_lock(&file_priv->mutex);
+	spin_lock(&file_priv->mm.lock);
 	while (!list_empty(&file_priv->mm.request_list)) {
 		struct drm_i915_gem_request *request;
 
@@ -4985,8 +4988,7 @@ void i915_gem_release(struct drm_device *dev, struct drm_file *file)
 		list_del(&request->client_list);
 		request->file_priv = NULL;
 	}
-	mutex_unlock(&file_priv->mutex);
-	mutex_unlock(&dev->struct_mutex);
+	spin_unlock(&file_priv->mm.lock);
 }
 
 static int