|
@@ -904,21 +904,11 @@ int i915_reset(struct drm_device *dev)
|
|
intel_modeset_init_hw(dev);
|
|
intel_modeset_init_hw(dev);
|
|
|
|
|
|
drm_irq_uninstall(dev);
|
|
drm_irq_uninstall(dev);
|
|
- drm_mode_config_reset(dev);
|
|
|
|
drm_irq_install(dev);
|
|
drm_irq_install(dev);
|
|
} else {
|
|
} else {
|
|
mutex_unlock(&dev->struct_mutex);
|
|
mutex_unlock(&dev->struct_mutex);
|
|
}
|
|
}
|
|
|
|
|
|
- /*
|
|
|
|
- * Perform a full modeset as on later generations, e.g. Ironlake, we may
|
|
|
|
- * need to retrain the display link and cannot just restore the register
|
|
|
|
- * values.
|
|
|
|
- */
|
|
|
|
- mutex_lock(&dev->mode_config.mutex);
|
|
|
|
- drm_helper_resume_force_mode(dev);
|
|
|
|
- mutex_unlock(&dev->mode_config.mutex);
|
|
|
|
-
|
|
|
|
return 0;
|
|
return 0;
|
|
}
|
|
}
|
|
|
|
|