aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/i915/intel_drv.h
diff options
context:
space:
mode:
authorChris Wilson <chris@chris-wilson.co.uk>2010-08-07 07:16:25 -0400
committerChris Wilson <chris@chris-wilson.co.uk>2010-09-08 05:13:30 -0400
commit82d7c9e7da9fa11b8ed968c94a19c7732e11c1ad (patch)
treefc7ba0aea076628adb0bb78cda0ab8da91cda743 /drivers/gpu/drm/i915/intel_drv.h
parent481b6af3d1f36d4a19bd36321c1e9f713db49aad (diff)
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>
Diffstat (limited to 'drivers/gpu/drm/i915/intel_drv.h')
-rw-r--r--drivers/gpu/drm/i915/intel_drv.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h
index 686ed533dbe3..1ca3c9e2667a 100644
--- a/drivers/gpu/drm/i915/intel_drv.h
+++ b/drivers/gpu/drm/i915/intel_drv.h
@@ -41,7 +41,7 @@
41 ret__ = -ETIMEDOUT; \ 41 ret__ = -ETIMEDOUT; \
42 break; \ 42 break; \
43 } \ 43 } \
44 if (W) msleep(W); \ 44 if (W && !in_dbg_master()) msleep(W); \
45 } \ 45 } \
46 ret__; \ 46 ret__; \
47}) 47})