Move drm_vblank_cleanup() after lastclose.
This may prevent a possible panic on shutdown.main
parent
cd5c66c659
commit
51d6346f9f
|
@ -524,12 +524,12 @@ static void drm_unload(struct drm_device *dev)
|
|||
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
|
||||
|
|
|
@ -397,11 +397,11 @@ static void drm_cleanup(struct drm_device * dev)
|
|||
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;
|
||||
|
|
Loading…
Reference in New Issue