summaryrefslogtreecommitdiff
path: root/linux/dma.c
diff options
context:
space:
mode:
authorAlan Hourihane <alanh@fairlite.demon.co.uk>2000-10-18 13:03:30 +0000
committerAlan Hourihane <alanh@fairlite.demon.co.uk>2000-10-18 13:03:30 +0000
commit3df7bd6ce2bf07ddd09090193b4ced83ab79c127 (patch)
treea2f95d5a32210359c9c0ee29e0876ebd77addf41 /linux/dma.c
parent8648348667d15a26529dbc64dcf52f98fc62c63a (diff)
merge trunk into radeon branch.radeon-1-0-0-20001017radeon-1-0-0-branch
Diffstat (limited to 'linux/dma.c')
-rw-r--r--linux/dma.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/linux/dma.c b/linux/dma.c
index 62340170..5cc3ec36 100644
--- a/linux/dma.c
+++ b/linux/dma.c
@@ -397,10 +397,10 @@ int drm_dma_enqueue(drm_device_t *dev, drm_dma_t *d)
atomic_inc(&q->use_count);
if (atomic_read(&q->block_write)) {
- current->state = TASK_INTERRUPTIBLE;
add_wait_queue(&q->write_queue, &entry);
atomic_inc(&q->block_count);
for (;;) {
+ current->state = TASK_INTERRUPTIBLE;
if (!atomic_read(&q->block_write)) break;
schedule();
if (signal_pending(current)) {