diff options
author | Xiang, Haihao <haihao.xiang@intel.com> | 2007-01-16 09:49:20 +0800 |
---|---|---|
committer | Xiang, Haihao <haihao.xiang@intel.com> | 2007-01-16 09:49:20 +0800 |
commit | 9f5cda44dbf5b8f3c7cc00b8a58eee2690a864e6 (patch) | |
tree | b92c293d743846a23e145bdd6e76a2e7076fae85 /shared-core/i915_dma.c | |
parent | 6ac742d95dfd717ae730035da34624682c652b7b (diff) | |
parent | fdbc34fab03eba8d257e14c6d557ffed5fa32c2d (diff) |
Merge branch 'master' into crestline
Diffstat (limited to 'shared-core/i915_dma.c')
-rw-r--r-- | shared-core/i915_dma.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/shared-core/i915_dma.c b/shared-core/i915_dma.c index cd7d2b43..a2f1243a 100644 --- a/shared-core/i915_dma.c +++ b/shared-core/i915_dma.c @@ -64,6 +64,7 @@ int i915_wait_ring(drm_device_t * dev, int n, const char *caller) i = 0; last_head = ring->head; + DRM_UDELAY(1); } return DRM_ERR(EBUSY); |