]> git.baikalelectronics.ru Git - kernel.git/commit
drm/i915: don't call modeset_init_hw in i915_reset
authorDaniel Vetter <daniel.vetter@ffwll.ch>
Tue, 19 Jun 2012 16:40:00 +0000 (18:40 +0200)
committerDaniel Vetter <daniel.vetter@ffwll.ch>
Wed, 20 Jun 2012 09:31:44 +0000 (11:31 +0200)
commit7eb950338bd338ecf4a9b54caf49ecd4bf09b27a
tree5d32107298cf3258e5b391fd092854d76f58d0b8
parent83b29b436f9961b3241a46f56c880dbbd6499ce3
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 fb9ad5c2fffb1c7641b380c306e51f39b66ee486
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: Chris Wilson <chris@chris-wilson.co.uk>
Signed-Off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
drivers/gpu/drm/i915/i915_drv.c