]> git.baikalelectronics.ru Git - kernel.git/commit
drm/i915: fix gen4 gpu reset
authorDaniel Vetter <daniel.vetter@ffwll.ch>
Wed, 2 May 2012 19:33:52 +0000 (21:33 +0200)
committerDaniel Vetter <daniel.vetter@ffwll.ch>
Sat, 5 May 2012 17:46:20 +0000 (19:46 +0200)
commit817f81c4a539eaae758ea286745b95c6d4b41152
treea843905231ca2e825934ebaaefd023c26b79db52
parente7dd9e225bc6373941379e483ed6c2a47033cd83
drm/i915: fix gen4 gpu reset

While trying to fix up gen4 gpu reset in

commit 2178ca76c8039ffca17d36cabad5760d8059cc46
Author: Kenneth Graunke <kenneth@whitecape.org>
Date:   Sat Sep 11 01:19:14 2010 -0700

    drm/i915: Actually set the reset bit in i965_reset

a little confusion about when wait_for times out has been introduced -
wait for loops _until_ the condition is true.

This fixes gpu reset on my gm45, testing with my hangman code shows
that it's now fairly reliable - it only died after well over 100 reset
cycles.

Cc: Eric Anholt <eric@anholt.net>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Eugeni Dodonov <eugeni.dodonov@intel.com>
Signed-Off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
drivers/gpu/drm/i915/i915_drv.c