summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: cd5c66c)
raw | patch | inline | side by side (parent: cd5c66c)
author | Robert Noland <rnoland@2hip.net> | |
Tue, 31 Mar 2009 18:33:18 +0000 (13:33 -0500) | ||
committer | Robert Noland <rnoland@2hip.net> | |
Tue, 31 Mar 2009 18:36:04 +0000 (13:36 -0500) |
This may prevent a possible panic on shutdown.
bsd-core/drm_drv.c | patch | blob | history | |
linux-core/drm_drv.c | patch | blob | history |
diff --git a/bsd-core/drm_drv.c b/bsd-core/drm_drv.c
index a9165a4aff3770c7706cb643b7b06f81fd9d41c3..ce683a66fdc5bdf54fa53edb0e17c6505439d981 100644 (file)
--- a/bsd-core/drm_drv.c
+++ b/bsd-core/drm_drv.c
DRM_DEBUG("mtrr_del = %d", retcode);
}
- drm_vblank_cleanup(dev);
-
DRM_LOCK();
drm_lastclose(dev);
DRM_UNLOCK();
+ drm_vblank_cleanup(dev);
+
/* Clean up PCI resources allocated by drm_bufs.c. We're not really
* worried about resource consumption while the DRM is inactive (between
* lastclose and firstopen or unload) because these aren't actually
diff --git a/linux-core/drm_drv.c b/linux-core/drm_drv.c
index c68e237c4d4c4989b727d61f668454a4faa41b71..72f0e98b3349b0155f4f6a8220b80e725d3d6efb 100644 (file)
--- a/linux-core/drm_drv.c
+++ b/linux-core/drm_drv.c
return;
}
- drm_vblank_cleanup(dev);
-
drm_lastclose(dev);
drm_fence_manager_takedown(dev);
+ drm_vblank_cleanup(dev);
+
if (drm_core_has_MTRR(dev) && drm_core_has_AGP(dev) && dev->agp
&& dev->agp->agp_mtrr >= 0) {
int retval;