Browse Source

drm/i915: Avoid using msleep under kdb and wait_for()

wait_for() uses msleep() to yield the cpu whilst spinning waiting for a
register to change. kdb asserts that mode changes are atomic and so
prohibits msleep. The alternative would be to use mdelay or to simply
probe the register more often instead of busy waiting.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Chris Wilson 15 years ago
parent
commit
82d7c9e7da
1 changed files with 1 additions and 1 deletions
  1. 1 1
      drivers/gpu/drm/i915/intel_drv.h

+ 1 - 1
drivers/gpu/drm/i915/intel_drv.h

@@ -41,7 +41,7 @@
 			ret__ = -ETIMEDOUT;				\
 			ret__ = -ETIMEDOUT;				\
 			break;						\
 			break;						\
 		}							\
 		}							\
-		if (W) msleep(W);					\
+		if (W && !in_dbg_master()) msleep(W);			\
 	}								\
 	}								\
 	ret__;								\
 	ret__;								\
 })
 })