From 176fdc0c6b98d6e19d2bcfb117c66a25c74318d2 Mon Sep 17 00:00:00 2001
From: Chris Wilson <chris@chris-wilson.co.uk>
Date: Sat, 4 Dec 2010 18:17:15 +0000
Subject: [PATCH] --- yaml --- r: 228779 b: refs/heads/master c:
 340479aac697bc73e225c122a9753d4964eeda3f h: refs/heads/master i:   228777:
 ae888ea4a982f1c4ae8f75d13945fdde8036924b   228775:
 f4acefe163bb6a361834735dedb6a9c638bedec0 v: v3

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

diff --git a/[refs] b/[refs]
index 20744b3f859f..3bcfda73bbae 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4add75c43f39573edc884d46b7c2b7414f01171a
+refs/heads/master: 340479aac697bc73e225c122a9753d4964eeda3f
diff --git a/trunk/drivers/gpu/drm/i915/i915_drv.c b/trunk/drivers/gpu/drm/i915/i915_drv.c
index 1a15b7886b8c..64844e2e9f86 100644
--- a/trunk/drivers/gpu/drm/i915/i915_drv.c
+++ b/trunk/drivers/gpu/drm/i915/i915_drv.c
@@ -440,7 +440,8 @@ int i915_reset(struct drm_device *dev, u8 flags)
 	bool need_display = true;
 	int ret;
 
-	mutex_lock(&dev->struct_mutex);
+	if (!mutex_trylock(&dev->struct_mutex))
+		return -EBUSY;
 
 	i915_gem_reset(dev);