From bbe9271cf4ee9880a296ee8179a107d433d5a45c Mon Sep 17 00:00:00 2001
From: Eric Anholt <eric@anholt.net>
Date: Mon, 9 Nov 2009 14:57:34 -0800
Subject: [PATCH] --- yaml --- r: 185612 b: refs/heads/master c:
 21099537dbacc5c8999d833e6bfd1b72edd89189 h: refs/heads/master v: v3

---
 [refs]                                | 2 +-
 trunk/drivers/gpu/drm/i915/i915_dma.c | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 89fa231b5e2d..eaab94789a61 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c2416fc6bb16fa87bcc4b9d90a7632f3531bdee6
+refs/heads/master: 21099537dbacc5c8999d833e6bfd1b72edd89189
diff --git a/trunk/drivers/gpu/drm/i915/i915_dma.c b/trunk/drivers/gpu/drm/i915/i915_dma.c
index 7bfded5e90bb..281faca3e37c 100644
--- a/trunk/drivers/gpu/drm/i915/i915_dma.c
+++ b/trunk/drivers/gpu/drm/i915/i915_dma.c
@@ -1405,7 +1405,9 @@ static int i915_load_modeset_init(struct drm_device *dev,
 	return 0;
 
 destroy_ringbuffer:
+	mutex_lock(&dev->struct_mutex);
 	i915_gem_cleanup_ringbuffer(dev);
+	mutex_unlock(&dev->struct_mutex);
 out:
 	return ret;
 }