]> rtime.felk.cvut.cz Git - linux-imx.git/commitdiff
drm/i915: Initialize ring->hangcheck upon ring init
authorChris Wilson <chris@chris-wilson.co.uk>
Mon, 10 Jun 2013 10:20:19 +0000 (11:20 +0100)
committerDaniel Vetter <daniel.vetter@ffwll.ch>
Tue, 11 Jun 2013 09:40:58 +0000 (11:40 +0200)
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>
drivers/gpu/drm/i915/intel_ringbuffer.c

index 1ef081cd1706128257068c91a41950a3d4c2af4b..a3cfa35b05738cddc6b49b806673d81ebbd598b8 100644 (file)
@@ -453,6 +453,8 @@ static int init_ring_common(struct intel_ring_buffer *ring)
                ring->last_retired_head = -1;
        }
 
+       memset(&ring->hangcheck, 0, sizeof(ring->hangcheck));
+
 out:
        if (HAS_FORCE_WAKE(dev))
                gen6_gt_force_wake_put(dev_priv);