summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIan Romanick <idr@us.ibm.com>2007-08-09 18:57:15 -0700
committerIan Romanick <idr@us.ibm.com>2007-08-09 18:57:15 -0700
commit20a0e5e4298761ae6005399e45d66b93109d2121 (patch)
treec44515fb3195f177cfa1e71cc0589eaa8b1f4624
parent06e09842dfbdaa9502d3b3e6b657de4e3630644c (diff)
After calling drm_sman_cleanup, mark both heaps as uninitialized.
Since the heaps weren't marked as uninitialized, SG memory was never re-allocated. This prevented the X-server from being able to restart without re-loading the kernel module.
-rw-r--r--linux-core/xgi_drv.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/linux-core/xgi_drv.c b/linux-core/xgi_drv.c
index f20df585..fa418c0d 100644
--- a/linux-core/xgi_drv.c
+++ b/linux-core/xgi_drv.c
@@ -301,6 +301,9 @@ void xgi_driver_lastclose(struct drm_device * dev)
if (info->fb_heap_initialized
|| info->pcie_heap_initialized) {
drm_sman_cleanup(&info->sman);
+
+ info->fb_heap_initialized = FALSE;
+ info->pcie_heap_initialized = FALSE;
}
}
}