summaryrefslogtreecommitdiff
path: root/shared/via_dma.c
diff options
context:
space:
mode:
authorKeith Whitwell <keith@tungstengraphics.com>2005-01-11 10:42:52 +0000
committerKeith Whitwell <keith@tungstengraphics.com>2005-01-11 10:42:52 +0000
commit9904319b95794088fe1db34e86ed62bc20f863e7 (patch)
tree5512285e0f2bb1076134687ebff2fc7b354629f1 /shared/via_dma.c
parent17d893f567787914add42c221996c631455cdb25 (diff)
import Thomas' shared-core via changes up to 2.4.1
Diffstat (limited to 'shared/via_dma.c')
-rw-r--r--shared/via_dma.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/shared/via_dma.c b/shared/via_dma.c
index c559f931..ef789878 100644
--- a/shared/via_dma.c
+++ b/shared/via_dma.c
@@ -299,12 +299,12 @@ static int via_dispatch_cmdbuffer(drm_device_t * dev, drm_via_cmdbuffer_t * cmd)
return 0;
}
-static int via_quiescent(drm_device_t * dev)
+int via_driver_dma_quiescent(drm_device_t * dev)
{
drm_via_private_t *dev_priv = dev->dev_private;
if (!via_wait_idle(dev_priv)) {
- return DRM_ERR(EAGAIN);
+ return DRM_ERR(EBUSY);
}
return 0;
}
@@ -315,7 +315,7 @@ int via_flush_ioctl(DRM_IOCTL_ARGS)
LOCK_TEST_WITH_RETURN( dev, filp );
- return via_quiescent(dev);
+ return via_driver_dma_quiescent(dev);
}
int via_cmdbuffer(DRM_IOCTL_ARGS)