forgot to check these in.. thanks to Jon for reminding me ..

diff --git a/shared-core/i915_dma.c b/shared-core/i915_dma.c
index 2882037..fc1b356 100644 (file)
--- a/shared-core/i915_dma.c
+++ b/shared-core/i915_dma.c
@@ -81,7 +81,7 @@ void i915_kernel_lost_context(drm_device_t *dev)
 }
 
 
-static int i915_dma_cleanup(drm_device_t *dev)
+int i915_dma_cleanup(drm_device_t *dev)
 {
        /* Make sure interrupts are disabled here because the uninstall ioctl
         * may not have been called from userspace and after dev_private

diff --git a/shared/i915.h b/shared/i915.h
index f7832e2..2744d0e 100644 (file)
--- a/shared/i915.h
+++ b/shared/i915.h
@@ -64,7 +64,7 @@
                drm_i915_private_t *dev_priv = dev->dev_private;        \
                i915_mem_takedown( &(dev_priv->agp_heap) );             \
        }                                                               \
-       i915_cleanup( dev );                                    \
+       i915_dma_cleanup( dev );                                        \
 } while (0)
 
 

diff --git a/shared/i915_dma.c b/shared/i915_dma.c
index 2882037..fc1b356 100644 (file)
--- a/shared/i915_dma.c
+++ b/shared/i915_dma.c
@@ -81,7 +81,7 @@ void i915_kernel_lost_context(drm_device_t *dev)
 }
 
 
-static int i915_dma_cleanup(drm_device_t *dev)
+int i915_dma_cleanup(drm_device_t *dev)
 {
        /* Make sure interrupts are disabled here because the uninstall ioctl
         * may not have been called from userspace and after dev_private