From 9fb2ba6c50f44cae57e9f684c6cef01aa51b7081 Mon Sep 17 00:00:00 2001
From: Daniel Vetter <daniel.vetter@ffwll.ch>
Date: Wed, 4 Jul 2012 22:18:39 +0200
Subject: [PATCH] --- yaml --- r: 318658 b: refs/heads/master c:
 d54a02c041ccfdcfe3efcd1e5b90c6e8d5e7a8d9 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index c1367c58dfe4..aaa6825a8b7d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4c3c115a1eaea5c699caa49e824df6e5b48396a4
+refs/heads/master: d54a02c041ccfdcfe3efcd1e5b90c6e8d5e7a8d9
diff --git a/trunk/drivers/gpu/drm/i915/i915_drv.c b/trunk/drivers/gpu/drm/i915/i915_drv.c
index 6edb2d5ec13c..e754cdfaec79 100644
--- a/trunk/drivers/gpu/drm/i915/i915_drv.c
+++ b/trunk/drivers/gpu/drm/i915/i915_drv.c
@@ -730,8 +730,7 @@ int i915_reset(struct drm_device *dev)
 	if (!i915_try_reset)
 		return 0;
 
-	if (!mutex_trylock(&dev->struct_mutex))
-		return -EBUSY;
+	mutex_lock(&dev->struct_mutex);
 
 	i915_gem_reset(dev);