Merge branch 'drm-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6
* 'drm-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6: drm: delay vblank cleanup until after driver unload
This commit is contained in:
commit
186837ca3a
|
@ -516,8 +516,6 @@ void drm_put_dev(struct drm_device *dev)
|
||||||
}
|
}
|
||||||
driver = dev->driver;
|
driver = dev->driver;
|
||||||
|
|
||||||
drm_vblank_cleanup(dev);
|
|
||||||
|
|
||||||
drm_lastclose(dev);
|
drm_lastclose(dev);
|
||||||
|
|
||||||
if (drm_core_has_MTRR(dev) && drm_core_has_AGP(dev) &&
|
if (drm_core_has_MTRR(dev) && drm_core_has_AGP(dev) &&
|
||||||
|
@ -537,6 +535,8 @@ void drm_put_dev(struct drm_device *dev)
|
||||||
dev->agp = NULL;
|
dev->agp = NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
drm_vblank_cleanup(dev);
|
||||||
|
|
||||||
list_for_each_entry_safe(r_list, list_temp, &dev->maplist, head)
|
list_for_each_entry_safe(r_list, list_temp, &dev->maplist, head)
|
||||||
drm_rmmap(dev, r_list->map);
|
drm_rmmap(dev, r_list->map);
|
||||||
drm_ht_remove(&dev->map_hash);
|
drm_ht_remove(&dev->map_hash);
|
||||||
|
|
Loading…
Reference in New Issue