]> git.karo-electronics.de Git - karo-tx-linux.git/commit
drm/i915: Don't wait for page flips if there was GPU reset
authorVille Syrjälä <ville.syrjala@linux.intel.com>
Tue, 29 Jan 2013 16:13:34 +0000 (18:13 +0200)
committerDaniel Vetter <daniel.vetter@ffwll.ch>
Fri, 15 Feb 2013 09:30:44 +0000 (10:30 +0100)
commitabe509316bb0a6ea5d90ec450496f20b83755b8d
tree696556cb96e51df2a455bc89dba272bcdfe5f647
parent445705cd6d829e32d691b438f3853a235f8f83f0
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ä <ville.syrjala@linux.intel.com>
Reviewed-by: Damien Lespiau <damien.lespiau@intel.com>
[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 <daniel.vetter@ffwll.ch>
drivers/gpu/drm/i915/intel_display.c
drivers/gpu/drm/i915/intel_drv.h