|
@@ -1853,8 +1853,12 @@ int i915_driver_unload(struct drm_device *dev)
|
|
|
|
|
|
acpi_video_unregister();
|
|
|
|
|
|
- if (drm_core_check_feature(dev, DRIVER_MODESET)) {
|
|
|
+ if (drm_core_check_feature(dev, DRIVER_MODESET))
|
|
|
intel_fbdev_fini(dev);
|
|
|
+
|
|
|
+ drm_vblank_cleanup(dev);
|
|
|
+
|
|
|
+ if (drm_core_check_feature(dev, DRIVER_MODESET)) {
|
|
|
intel_modeset_cleanup(dev);
|
|
|
|
|
|
/*
|
|
@@ -1895,8 +1899,6 @@ int i915_driver_unload(struct drm_device *dev)
|
|
|
i915_free_hws(dev);
|
|
|
}
|
|
|
|
|
|
- drm_vblank_cleanup(dev);
|
|
|
-
|
|
|
intel_teardown_gmbus(dev);
|
|
|
intel_teardown_mchbar(dev);
|
|
|
|