From: Ville Syrjälä Date: Tue, 29 Jan 2013 16:13:34 +0000 (+0200) Subject: drm/i915: Don't wait for page flips if there was GPU reset X-Git-Tag: v3.9-rc1~83^2~11^2~15 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=10d8373064762b21e16e73bc7dfde49d68f4e31f;p=pandora-kernel.git drm/i915: Don't wait for page flips if there was GPU reset If a GPU reset occurs while a page flip has been submitted to the ring, the flip will never complete once the ring has been reset. The GPU reset can be detected by sampling the reset_counter before the flip is submitted, and then while waiting for the flip, the sampled counter is compared with the current reset_counter value. Signed-off-by: Ville Syrjälä Reviewed-by: Damien Lespiau [danvet: Move the reset_counter assignment to an earlier place in common code as discussed on the mailing list.] Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=60140 Signed-off-by: Daniel Vetter --- Reading git-diff-tree failed