diff options
| author | Rik Faith <faith@alephnull.com> | 2000-09-13 15:00:09 +0000 |
|---|---|---|
| committer | Rik Faith <faith@alephnull.com> | 2000-09-13 15:00:09 +0000 |
| commit | 1f8651163acb06b0691322ec9ab96bc606ba8777 (patch) | |
| tree | e4c3b6a7ab8fb7fe8bc2754be442076c9dd7b7f0 /linux/mga_dma.c | |
| parent | bda40b41465ab67f8eef0b89cd26f9bbe8cf4a85 (diff) | |
Fix for [Bug #112247] Hard MGA lock with trispd -size 50000
Diffstat (limited to 'linux/mga_dma.c')
| -rw-r--r-- | linux/mga_dma.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/linux/mga_dma.c b/linux/mga_dma.c index f80fb489..f115d712 100644 --- a/linux/mga_dma.c +++ b/linux/mga_dma.c @@ -214,6 +214,7 @@ drm_buf_t *mga_freelist_get(drm_device_t *dev) drm_mga_freelist_t *prev; drm_mga_freelist_t *next; static int failed = 0; + int return_null = 0; DRM_DEBUG("%s : tail->age : %d last_prim_age : %d\n", __FUNCTION__, dev_priv->tail->age, dev_priv->last_prim_age); @@ -222,7 +223,6 @@ drm_buf_t *mga_freelist_get(drm_device_t *dev) DRM_DEBUG("I'm waiting on the freelist!!! %d\n", dev_priv->last_prim_age); set_bit(MGA_IN_GETBUF, &dev_priv->dispatch_status); - current->state = TASK_INTERRUPTIBLE; add_wait_queue(&dev_priv->buf_queue, &entry); for (;;) { mga_dma_schedule(dev, 0); @@ -230,15 +230,18 @@ drm_buf_t *mga_freelist_get(drm_device_t *dev) &dev_priv->dispatch_status)) break; atomic_inc(&dev->total_sleeps); + current->state = TASK_INTERRUPTIBLE; schedule(); if (signal_pending(current)) { + DRM_ERROR("Returning NULL\n"); + ++return_null; clear_bit(MGA_IN_GETBUF, &dev_priv->dispatch_status); - goto failed_getbuf; + break; } } - current->state = TASK_RUNNING; remove_wait_queue(&dev_priv->buf_queue, &entry); + if (return_null) return NULL; } if(dev_priv->tail->age < dev_priv->last_prim_age) { @@ -251,8 +254,6 @@ drm_buf_t *mga_freelist_get(drm_device_t *dev) failed = 0; return next->buf; } - -failed_getbuf: failed++; return NULL; } |