diff options
| author | Chris Wilson | 2014-06-06 11:22:29 +0200 |
|---|---|---|
| committer | Jani Nikula | 2014-06-11 10:06:43 +0200 |
| commit | 4be173813e57c7298103a83155c2391b5b167b4c (patch) | |
| tree | 594dce46be8caef7687d138cfc21ef580da6f01d /drivers/gpu/drm/i915/intel_ringbuffer.h | |
| parent | drm/i95: Initialize active ring->pid to -1 (diff) | |
| download | kernel-qcow2-linux-4be173813e57c7298103a83155c2391b5b167b4c.tar.gz kernel-qcow2-linux-4be173813e57c7298103a83155c2391b5b167b4c.tar.xz kernel-qcow2-linux-4be173813e57c7298103a83155c2391b5b167b4c.zip | |
drm/i915: Reorder semaphore deadlock check
If a semaphore is waiting on another ring, which in turn happens to be
waiting on the first ring, but that second semaphore has been signalled,
we will be able to kick the second ring and so can treat the first ring
as a valid WAIT and not as HUNG.
v2: Be paranoid and cap the potential recursion depth whilst visiting
the semaphore signallers. (Mika)
References: https://bugs.freedesktop.org/show_bug.cgi?id=54226
References: https://bugs.freedesktop.org/show_bug.cgi?id=75502
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Mika Kuoppala <mika.kuoppala@linux.intel.com>
Cc: stable@vger.kernel.org
Reviewed-by: Mika Kuoppala <mika.kuoppala@intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Diffstat (limited to 'drivers/gpu/drm/i915/intel_ringbuffer.h')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_ringbuffer.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/intel_ringbuffer.h b/drivers/gpu/drm/i915/intel_ringbuffer.h index 910c83cf7d44..e72017bdcd7f 100644 --- a/drivers/gpu/drm/i915/intel_ringbuffer.h +++ b/drivers/gpu/drm/i915/intel_ringbuffer.h @@ -55,7 +55,7 @@ struct intel_ring_hangcheck { u32 seqno; int score; enum intel_ring_hangcheck_action action; - bool deadlock; + int deadlock; }; struct intel_ringbuffer { |