From eb9fc670e410ac6cf3b65680d5586a5b7beecb09 Mon Sep 17 00:00:00 2001
From: Chris Wilson <chris@chris-wilson.co.uk>
Date: Thu, 24 Mar 2011 11:37:03 +0000
Subject: [PATCH] --- yaml --- r: 243677 b: refs/heads/master c:
 9f01b25048ad12b5d71f4f7d3b62ef737639a08d h: refs/heads/master i:   243675:
 f14de2e5108ecb126ac763ef9d47cd55689bf012 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 cb688373182f..b74f564c2dc7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6ee3b5a12740eddc5a76e130b6cc7cc64468d1f7
+refs/heads/master: 9f01b25048ad12b5d71f4f7d3b62ef737639a08d
diff --git a/trunk/drivers/gpu/drm/i915/intel_drv.h b/trunk/drivers/gpu/drm/i915/intel_drv.h
index 5daa991cb287..f5b0d8306d83 100644
--- a/trunk/drivers/gpu/drm/i915/intel_drv.h
+++ b/trunk/drivers/gpu/drm/i915/intel_drv.h
@@ -39,7 +39,7 @@
 			ret__ = -ETIMEDOUT;				\
 			break;						\
 		}							\
-		if (W && !in_dbg_master()) msleep(W);			\
+		if (W && !(in_atomic() || in_dbg_master())) msleep(W);	\
 	}								\
 	ret__;								\
 })