summaryrefslogtreecommitdiff
path: root/shared-core
diff options
context:
space:
mode:
authorJesse Barnes <jesse.barnes@intel.com>2007-09-25 16:18:01 -0700
committerJesse Barnes <jesse.barnes@intel.com>2007-09-25 16:18:01 -0700
commit972ec4fa25059c84ed103c28efcb17f9f97a6d74 (patch)
tree1cce325e738fafe8b63addf21b5d50004ba3e630 /shared-core
parent053ff86566bcf050c7fd5b5dc7158bb35d39c38b (diff)
Hack out i915_mem_takedown
We may want to make the old i915 memory manager obsolete eventually, and in the meantime the takedown causes problems on unload so remove it for now.
Diffstat (limited to 'shared-core')
-rw-r--r--shared-core/i915_init.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/shared-core/i915_init.c b/shared-core/i915_init.c
index 065afcdf..918bbcb8 100644
--- a/shared-core/i915_init.c
+++ b/shared-core/i915_init.c
@@ -291,12 +291,12 @@ int i915_driver_unload(struct drm_device *dev)
DRM_DEBUG("usage is %d\n", atomic_read(&dev_priv->ring_buffer->usage));
mutex_lock(&dev->struct_mutex);
drm_bo_usage_deref_locked(&dev_priv->ring_buffer);
- mutex_unlock(&dev->struct_mutex);
if (drm_bo_clean_mm(dev, DRM_BO_MEM_VRAM)) {
DRM_ERROR("Memory manager type 3 not clean. "
"Delaying takedown\n");
}
+ mutex_unlock(&dev->struct_mutex);
drm_bo_driver_finish(dev);
@@ -315,15 +315,14 @@ void i915_driver_lastclose(struct drm_device *dev)
struct drm_i915_private *dev_priv = dev->dev_private;
i915_do_cleanup_pageflip(dev);
-
- i915_mem_takedown(&(dev_priv->agp_heap));
-
+ //i915_mem_takedown(&(dev_priv->agp_heap));
i915_dma_cleanup(dev);
}
void i915_driver_preclose(struct drm_device *dev, struct drm_file *filp)
{
struct drm_i915_private *dev_priv = dev->dev_private;
- i915_mem_release(dev, filp, dev_priv->agp_heap);
+
+ //i915_mem_release(dev, filp, dev_priv->agp_heap);
}