aboutsummaryrefslogtreecommitdiff
path: root/shared-core/i915_dma.c
diff options
context:
space:
mode:
authorAlan Hourihane <alanh@fairlite.demon.co.uk>2005-01-06 17:51:32 +0000
committerAlan Hourihane <alanh@fairlite.demon.co.uk>2005-01-06 17:51:32 +0000
commitfcece3cf34ed5cc7e82d324362a40b3dd5493bbe (patch)
tree82d3690128574e1a0ac43068d658e90c685dcb2d /shared-core/i915_dma.c
parentc6c7496ca090dd56599de5bb1398f69762569d5e (diff)
Add i915GM support Add resume functionality (must be used with later DDX)
Bump to 1.2
Diffstat (limited to 'shared-core/i915_dma.c')
-rw-r--r--shared-core/i915_dma.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/shared-core/i915_dma.c b/shared-core/i915_dma.c
index 8d986129..fea848f0 100644
--- a/shared-core/i915_dma.c
+++ b/shared-core/i915_dma.c
@@ -209,7 +209,7 @@ static int i915_initialize(drm_device_t * dev,
return 0;
}
-static int i915_resume(drm_device_t * dev)
+static int i915_dma_resume(drm_device_t * dev)
{
drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private;
@@ -266,7 +266,7 @@ int i915_dma_init(DRM_IOCTL_ARGS)
retcode = i915_dma_cleanup(dev);
break;
case I915_RESUME_DMA:
- retcode = i915_resume(dev);
+ retcode = i915_dma_resume(dev);
break;
default:
retcode = -EINVAL;