aboutsummaryrefslogtreecommitdiff
path: root/linux
diff options
context:
space:
mode:
authorAlan Hourihane <alanh@fairlite.demon.co.uk>2002-05-17 08:21:34 +0000
committerAlan Hourihane <alanh@fairlite.demon.co.uk>2002-05-17 08:21:34 +0000
commit91d7b17e82e8d8659405832a3cd1e7a904ad283f (patch)
tree579f1da0aaedf761f80a159dd8d9387742519620 /linux
parent9e67da5626b683df58f2041fdb0f743eb4da7036 (diff)
same udelay fixes
Diffstat (limited to 'linux')
-rw-r--r--linux/i810_dma.c3
-rw-r--r--linux/i830_dma.c5
2 files changed, 3 insertions, 5 deletions
diff --git a/linux/i810_dma.c b/linux/i810_dma.c
index 6722acd2..a2899b5f 100644
--- a/linux/i810_dma.c
+++ b/linux/i810_dma.c
@@ -352,8 +352,7 @@ static int i810_wait_ring(drm_device_t *dev, int n)
DRM_ERROR("lockup\n");
goto out_wait_ring;
}
-
- for (i = 0 ; i < 2000 ; i++) ;
+ udelay(1);
}
out_wait_ring:
diff --git a/linux/i830_dma.c b/linux/i830_dma.c
index a2b39ee0..6d0e3223 100644
--- a/linux/i830_dma.c
+++ b/linux/i830_dma.c
@@ -62,7 +62,7 @@ do { \
do { \
_head = I830_READ(LP_RING + RING_HEAD) & HEAD_ADDR; \
_tail = I830_READ(LP_RING + RING_TAIL) & TAIL_ADDR; \
- for(_i = 0; _i < 65535; _i++); \
+ udelay(10); \
} while(_head != _tail); \
} while(0)
@@ -390,8 +390,7 @@ static int i830_wait_ring(drm_device_t *dev, int n)
DRM_ERROR("lockup\n");
goto out_wait_ring;
}
-
- for (i = 0 ; i < 2000 ; i++) ;
+ udelay(1);
}
out_wait_ring: