From 40c8905321a03f4e726050d91fb83a868b5b7717 Mon Sep 17 00:00:00 2001
From: Ben Widawsky <ben@bwidawsk.net>
Date: Sat, 1 Sep 2012 22:59:48 -0700
Subject: [PATCH] --- yaml --- r: 329394 b: refs/heads/master c:
 0cc2764cc4a4bd73df55f8893c871778cf7ddd0f h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 96246ad4200a..8958eb27348e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b67a4376d53e1ae6eaef05389cfd0e6e5b7097db
+refs/heads/master: 0cc2764cc4a4bd73df55f8893c871778cf7ddd0f
diff --git a/trunk/drivers/gpu/drm/i915/intel_drv.h b/trunk/drivers/gpu/drm/i915/intel_drv.h
index ee0beb4833fb..3f7eefc5d976 100644
--- a/trunk/drivers/gpu/drm/i915/intel_drv.h
+++ b/trunk/drivers/gpu/drm/i915/intel_drv.h
@@ -41,7 +41,11 @@
 			ret__ = -ETIMEDOUT;				\
 			break;						\
 		}							\
-		if (W && drm_can_sleep()) msleep(W);	\
+		if (W && drm_can_sleep())  {				\
+			msleep(W);					\
+		} else {						\
+			cpu_relax();					\
+		}							\
 	}								\
 	ret__;								\
 })