diff options
| author | Gareth Hughes <gareth@users.sourceforge.net> | 2000-12-13 03:19:20 +0000 |
|---|---|---|
| committer | Gareth Hughes <gareth@users.sourceforge.net> | 2000-12-13 03:19:20 +0000 |
| commit | feb5627964d33d7f694c441f21219539ea1ee818 (patch) | |
| tree | 336b5050898eb0324d2be7c433920326e94b5d9d /linux/mga_dma.c | |
| parent | a13cd4a9f7147c4b1ff7c0a6ef0c38fb3a2146d9 (diff) | |
- Manually disable 2D acceleration, leave sync routine.
- Fix pitch values.
- Update clear ioctl parameters.
Diffstat (limited to 'linux/mga_dma.c')
| -rw-r--r-- | linux/mga_dma.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/linux/mga_dma.c b/linux/mga_dma.c index 6adffb8a..60a0100d 100644 --- a/linux/mga_dma.c +++ b/linux/mga_dma.c @@ -534,7 +534,7 @@ int mga_dma_schedule(drm_device_t *dev, int locked) int retval = 0; if (!dev_priv) return -EBUSY; - + if (test_and_set_bit(0, &dev->dma_flag)) { retval = -EBUSY; goto sch_out_wakeup; @@ -889,7 +889,7 @@ static int mga_flush_queue(drm_device_t *dev) if(dev_priv->next_prim->num_dwords != 0) { add_wait_queue(&dev_priv->flush_queue, &entry); - if (test_bit(MGA_IN_FLUSH, &dev_priv->dispatch_status)) + if (test_bit(MGA_IN_FLUSH, &dev_priv->dispatch_status)) DRM_ERROR("Incorrect mga_flush_queue logic\n"); set_bit(MGA_IN_FLUSH, &dev_priv->dispatch_status); mga_dma_schedule(dev, 0); @@ -924,7 +924,7 @@ void mga_reclaim_buffers(drm_device_t *dev, pid_t pid) if(dma->buflist == NULL) return; DRM_DEBUG("buf_count=%d\n", dma->buf_count); - + mga_flush_queue(dev); for (i = 0; i < dma->buf_count; i++) { @@ -941,6 +941,7 @@ void mga_reclaim_buffers(drm_device_t *dev, pid_t pid) } } +#if 0 int mga_lock(struct inode *inode, struct file *filp, unsigned int cmd, unsigned long arg) { @@ -1014,6 +1015,7 @@ int mga_lock(struct inode *inode, struct file *filp, unsigned int cmd, ret ? "interrupted" : "has lock"); return ret; } +#endif int mga_flush_ioctl(struct inode *inode, struct file *filp, unsigned int cmd, unsigned long arg) |