diff options
author | Chris Wilson <chris@chris-wilson.co.uk> | 2013-06-10 06:20:19 -0400 |
---|---|---|
committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2013-06-11 05:40:58 -0400 |
commit | 50f018dff180942dc40e601de6e97145a4aaeaa9 (patch) | |
tree | 10ccf572df0d1cc31e5e84eea95197c93b57ed6b /drivers/gpu/drm/i915/intel_ringbuffer.c | |
parent | 2f28c50bb3881f11afee8f8c9041dad2c96653aa (diff) |
drm/i915: Initialize ring->hangcheck upon ring init
When we reset and restart a ring, we also want to clear any existing
hangcheck.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: Mika Kuoppala <mika.kuoppala@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu/drm/i915/intel_ringbuffer.c')
-rw-r--r-- | drivers/gpu/drm/i915/intel_ringbuffer.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/intel_ringbuffer.c b/drivers/gpu/drm/i915/intel_ringbuffer.c index 1ef081cd1706..a3cfa35b0573 100644 --- a/drivers/gpu/drm/i915/intel_ringbuffer.c +++ b/drivers/gpu/drm/i915/intel_ringbuffer.c | |||
@@ -453,6 +453,8 @@ static int init_ring_common(struct intel_ring_buffer *ring) | |||
453 | ring->last_retired_head = -1; | 453 | ring->last_retired_head = -1; |
454 | } | 454 | } |
455 | 455 | ||
456 | memset(&ring->hangcheck, 0, sizeof(ring->hangcheck)); | ||
457 | |||
456 | out: | 458 | out: |
457 | if (HAS_FORCE_WAKE(dev)) | 459 | if (HAS_FORCE_WAKE(dev)) |
458 | gen6_gt_force_wake_put(dev_priv); | 460 | gen6_gt_force_wake_put(dev_priv); |