---

yaml --- r: 329394 b: refs/heads/master c: 0cc2764 h: refs/heads/master v: v3
git-mirror · Sep 3, 2012 · 40c8905 · 40c8905
1 parent 3416bf3
commit 40c8905
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git 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
@@ -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__;								\
 })