Commit 8e88a2bd authored by Daniel Vetter's avatar Daniel Vetter

drm/i915: don't call modeset_init_hw in i915_reset

It seems to blow up my ilk in all kinds of strange ways. And now that
we're no longer resetting the entire modeset state, it shouldn't be
necessary any longer.

This essentially reverts

commit f817586c
Author: Daniel Vetter <daniel.vetter@ffwll.ch>
Date:   Tue Apr 10 15:50:11 2012 +0200

    drm/i915: re-init modeset hw state after gpu reset

safe for the introduction of modeset_init_hw, that one is nice to
prevent code duplication between driver load and resume.

v2: Add a comment to the code to warn future travellers of the dragon
dungeon ahead, suggested by Chris Wilson.
Acked-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Signed-Off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent 5fa8be65
...@@ -904,10 +904,13 @@ int i915_reset(struct drm_device *dev) ...@@ -904,10 +904,13 @@ int i915_reset(struct drm_device *dev)
i915_gem_context_init(dev); i915_gem_context_init(dev);
i915_gem_init_ppgtt(dev); i915_gem_init_ppgtt(dev);
mutex_unlock(&dev->struct_mutex); /*
* It would make sense to re-init all the other hw state, at
* least the rps/rc6/emon init done within modeset_init_hw. For
* some unknown reason, this blows up my ilk, so don't.
*/
if (drm_core_check_feature(dev, DRIVER_MODESET)) mutex_unlock(&dev->struct_mutex);
intel_modeset_init_hw(dev);
drm_irq_uninstall(dev); drm_irq_uninstall(dev);
drm_irq_install(dev); drm_irq_install(dev);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment