From: Chris Wilson Date: Tue, 28 May 2013 09:38:44 +0000 (+0100) Subject: drm/i915: Avoid promoting a simulated hang to 'wedged' X-Git-Tag: v3.11-rc1~65^2~105^2~27 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2e7c8ee7a6bf3440478120f14cbf597d416f88b2;p=pandora-kernel.git drm/i915: Avoid promoting a simulated hang to 'wedged' It appears that a beneficial side-effect of Mika's more accurate hangman work is to speed up hang detection and execution. This exposes a bug in the reset code that then treats repeated simulated hangs as an indication that the machine is wedged. Jiggle the code around so that we only do the simulation processing from the hangcheck and avoid confusing it with a real hang. Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=65060 Signed-off-by: Chris Wilson Reviewed-by: Mika Kuoppala Signed-off-by: Daniel Vetter --- Reading git-diff-tree failed