Commit 6d171cb4 authored by Chris Wilson's avatar Chris Wilson Committed by Daniel Vetter

drm/i915: Remove unused ring->irq_seqno

Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: default avatarBen Widawsky <ben@bwidawsk.net>
Signed-Off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent 3b88cc0d
...@@ -414,8 +414,6 @@ static void i915_ring_seqno_info(struct seq_file *m, ...@@ -414,8 +414,6 @@ static void i915_ring_seqno_info(struct seq_file *m,
if (ring->get_seqno) { if (ring->get_seqno) {
seq_printf(m, "Current sequence (%s): %d\n", seq_printf(m, "Current sequence (%s): %d\n",
ring->name, ring->get_seqno(ring)); ring->name, ring->get_seqno(ring));
seq_printf(m, "IRQ sequence (%s): %d\n",
ring->name, ring->irq_seqno);
} }
} }
......
...@@ -331,15 +331,12 @@ static void notify_ring(struct drm_device *dev, ...@@ -331,15 +331,12 @@ static void notify_ring(struct drm_device *dev,
struct intel_ring_buffer *ring) struct intel_ring_buffer *ring)
{ {
struct drm_i915_private *dev_priv = dev->dev_private; struct drm_i915_private *dev_priv = dev->dev_private;
u32 seqno;
if (ring->obj == NULL) if (ring->obj == NULL)
return; return;
seqno = ring->get_seqno(ring); trace_i915_gem_request_complete(ring, ring->get_seqno(ring));
trace_i915_gem_request_complete(ring, seqno);
ring->irq_seqno = seqno;
wake_up_all(&ring->irq_queue); wake_up_all(&ring->irq_queue);
if (i915_enable_hangcheck) { if (i915_enable_hangcheck) {
dev_priv->hangcheck_count = 0; dev_priv->hangcheck_count = 0;
......
...@@ -58,7 +58,6 @@ struct intel_ring_buffer { ...@@ -58,7 +58,6 @@ struct intel_ring_buffer {
u32 irq_refcount; /* protected by dev_priv->irq_lock */ u32 irq_refcount; /* protected by dev_priv->irq_lock */
u32 irq_enable_mask; /* bitmask to enable ring interrupt */ u32 irq_enable_mask; /* bitmask to enable ring interrupt */
u32 irq_seqno; /* last seq seem at irq time */
u32 trace_irq_seqno; u32 trace_irq_seqno;
u32 sync_seqno[I915_NUM_RINGS-1]; u32 sync_seqno[I915_NUM_RINGS-1];
bool __must_check (*irq_get)(struct intel_ring_buffer *ring); bool __must_check (*irq_get)(struct intel_ring_buffer *ring);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment