From b2b09d71186a6f8985edb3201cf470391ed0e3fd Mon Sep 17 00:00:00 2001
From: Chris Wilson <chris@chris-wilson.co.uk>
Date: Sat, 7 Aug 2010 12:16:25 +0100
Subject: [PATCH] --- yaml --- r: 217892 b: refs/heads/master c:
 82d7c9e7da9fa11b8ed968c94a19c7732e11c1ad h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index b71911f76524..a23f6134e2f5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 481b6af3d1f36d4a19bd36321c1e9f713db49aad
+refs/heads/master: 82d7c9e7da9fa11b8ed968c94a19c7732e11c1ad
diff --git a/trunk/drivers/gpu/drm/i915/intel_drv.h b/trunk/drivers/gpu/drm/i915/intel_drv.h
index 686ed533dbe3..1ca3c9e2667a 100644
--- a/trunk/drivers/gpu/drm/i915/intel_drv.h
+++ b/trunk/drivers/gpu/drm/i915/intel_drv.h
@@ -41,7 +41,7 @@
 			ret__ = -ETIMEDOUT;				\
 			break;						\
 		}							\
-		if (W) msleep(W);					\
+		if (W && !in_dbg_master()) msleep(W);			\
 	}								\
 	ret__;								\
 })