summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeff Hartmann <jhartmann@valinux.com>2000-02-15 16:36:36 +0000
committerJeff Hartmann <jhartmann@valinux.com>2000-02-15 16:36:36 +0000
commit71f5f1de26acc17c736ee90247504818792bdf97 (patch)
treeb8dcfcbbd7b94eda9a474a58f7aa4b6ac5388703
parent99f656d561292a2c522df81bceaa77ff902890a7 (diff)
mga_ioctl_flush: flush was a finish
-rw-r--r--linux/mga_dma.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/linux/mga_dma.c b/linux/mga_dma.c
index 0bbf22d7..683260d1 100644
--- a/linux/mga_dma.c
+++ b/linux/mga_dma.c
@@ -1418,7 +1418,7 @@ int mga_flush_queue(drm_device_t *dev)
DRM_DEBUG("Calling schedule from flush_queue : %d\n",
atomic_read(&dev_priv->pending_bufs));
mga_dma_schedule(dev, 0);
- schedule_timeout(DRM_LOCK_SLICE);
+ schedule_timeout((HZ/60));
if (signal_pending(current)) {
ret = -EINTR; /* Can't restart */
break;
@@ -1521,7 +1521,9 @@ int mga_flush_ioctl(struct inode *inode, struct file *filp,
DRM_DEBUG("mga_flush_ioctl\n");
atomic_set(&dev_priv->in_flush, 1);
mga_flush_queue(dev);
+#if 0
mga_dma_quiescent(dev);
+#endif
atomic_set(&dev_priv->in_flush, 0);
return 0;
}