drm/i915: Remove unused ring->irq_seqno

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: Ben Widawsky <ben@bwidawsk.net>
Signed-Off-by: Daniel Vetter <daniel.vetter@ffwll.ch>

diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c
index 9d4bf6bfc46a526313900ef2762b5d4bba71f074..c83791e1e16fda9543fbd6f866593b5cc163335a 100644 (file)
--- a/drivers/gpu/drm/i915/i915_debugfs.c
+++ b/drivers/gpu/drm/i915/i915_debugfs.c
@@ -414,8 +414,6 @@ static void i915_ring_seqno_info(struct seq_file *m,
        if (ring->get_seqno) {
                seq_printf(m, "Current sequence (%s): %d\n",
                           ring->name, ring->get_seqno(ring));
-               seq_printf(m, "IRQ sequence (%s):     %d\n",
-                          ring->name, ring->irq_seqno);
        }
 }
 

diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c
index a0129cfc3b313f6790faebacbbddaadbd2e9caac..2e93ac0232f63afd37e57f0eecf6e9563cc57c34 100644 (file)
--- a/drivers/gpu/drm/i915/i915_irq.c
+++ b/drivers/gpu/drm/i915/i915_irq.c
@@ -331,15 +331,12 @@ static void notify_ring(struct drm_device *dev,
                        struct intel_ring_buffer *ring)
 {
        struct drm_i915_private *dev_priv = dev->dev_private;
-       u32 seqno;
 
        if (ring->obj == NULL)
                return;
 
-       seqno = ring->get_seqno(ring);
-       trace_i915_gem_request_complete(ring, seqno);
+       trace_i915_gem_request_complete(ring, ring->get_seqno(ring));
 
-       ring->irq_seqno = seqno;
        wake_up_all(&ring->irq_queue);
        if (i915_enable_hangcheck) {
                dev_priv->hangcheck_count = 0;

diff --git a/drivers/gpu/drm/i915/intel_ringbuffer.h b/drivers/gpu/drm/i915/intel_ringbuffer.h
index d3bf2595589f1eab9eca1317e67b0fc990445371..4d1c6c4235d688d5a60ab9d919d04b4ea0c5ecf6 100644 (file)
--- a/drivers/gpu/drm/i915/intel_ringbuffer.h
+++ b/drivers/gpu/drm/i915/intel_ringbuffer.h
@@ -58,7 +58,6 @@ struct  intel_ring_buffer {
 
        u32             irq_refcount;           /* protected by dev_priv->irq_lock */
        u32             irq_enable_mask;        /* bitmask to enable ring interrupt */
-       u32             irq_seqno;              /* last seq seem at irq time */
        u32             trace_irq_seqno;
        u32             sync_seqno[I915_NUM_RINGS-1];
        bool __must_check (*irq_get)(struct intel_ring_buffer *ring);