geemili
/
drm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix for [Bug #112247] Hard MGA lock with trispd -size 50000

main
Rik Faith 2000-09-13 15:00:09 +00:00
parent bda40b4146
commit 1f8651163a
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
linux/mga_dma.c
View File

@ -214,6 +214,7 @@ drm_buf_t *mga_freelist_get(drm_device_t *dev)
drm_mga_freelist_t *prev; drm_mga_freelist_t *prev;
drm_mga_freelist_t *next; drm_mga_freelist_t *next;
static int failed = 0; static int failed = 0;
int return_null = 0;
DRM_DEBUG("%s : tail->age : %d last_prim_age : %d\n", __FUNCTION__, DRM_DEBUG("%s : tail->age : %d last_prim_age : %d\n", __FUNCTION__,
dev_priv->tail->age, dev_priv->last_prim_age); 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", DRM_DEBUG("I'm waiting on the freelist!!! %d\n",
dev_priv->last_prim_age); dev_priv->last_prim_age);
set_bit(MGA_IN_GETBUF, &dev_priv->dispatch_status); set_bit(MGA_IN_GETBUF, &dev_priv->dispatch_status);
current->state = TASK_INTERRUPTIBLE;
add_wait_queue(&dev_priv->buf_queue, &entry); add_wait_queue(&dev_priv->buf_queue, &entry);
for (;;) { for (;;) {
mga_dma_schedule(dev, 0); mga_dma_schedule(dev, 0);
@ -230,15 +230,18 @@ drm_buf_t *mga_freelist_get(drm_device_t *dev)
&dev_priv->dispatch_status)) &dev_priv->dispatch_status))
break; break;
atomic_inc(&dev->total_sleeps); atomic_inc(&dev->total_sleeps);
current->state = TASK_INTERRUPTIBLE;
schedule(); schedule();
if (signal_pending(current)) { if (signal_pending(current)) {
DRM_ERROR("Returning NULL\n");
++return_null;
clear_bit(MGA_IN_GETBUF, clear_bit(MGA_IN_GETBUF,
&dev_priv->dispatch_status); &dev_priv->dispatch_status);
goto failed_getbuf; break;
} }
} }
current->state = TASK_RUNNING;
remove_wait_queue(&dev_priv->buf_queue, &entry); remove_wait_queue(&dev_priv->buf_queue, &entry);
if (return_null) return NULL;
} }
if(dev_priv->tail->age < dev_priv->last_prim_age) { 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; failed = 0;
return next->buf; return next->buf;
} }
failed_getbuf:
failed++; failed++;
return NULL; return NULL;
} }