diff options
author | Chris Wilson <chris@chris-wilson.co.uk> | 2012-04-28 04:00:03 -0400 |
---|---|---|
committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2012-05-03 05:18:23 -0400 |
commit | 6d171cb4c2b74a34283333af93fdd7bebdf57e6d (patch) | |
tree | 89490009be03e8778da3de8ccf348188f613e998 /drivers/gpu | |
parent | 3b88cc0dd72e82df65c634f19417158787d86bfe (diff) |
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>
Diffstat (limited to 'drivers/gpu')
-rw-r--r-- | drivers/gpu/drm/i915/i915_debugfs.c | 2 | ||||
-rw-r--r-- | drivers/gpu/drm/i915/i915_irq.c | 5 | ||||
-rw-r--r-- | drivers/gpu/drm/i915/intel_ringbuffer.h | 1 |
3 files changed, 1 insertions, 7 deletions
diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c index 9d4bf6bfc46a..c83791e1e16f 100644 --- 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, | |||
414 | if (ring->get_seqno) { | 414 | if (ring->get_seqno) { |
415 | seq_printf(m, "Current sequence (%s): %d\n", | 415 | seq_printf(m, "Current sequence (%s): %d\n", |
416 | ring->name, ring->get_seqno(ring)); | 416 | ring->name, ring->get_seqno(ring)); |
417 | seq_printf(m, "IRQ sequence (%s): %d\n", | ||
418 | ring->name, ring->irq_seqno); | ||
419 | } | 417 | } |
420 | } | 418 | } |
421 | 419 | ||
diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c index a0129cfc3b31..2e93ac0232f6 100644 --- 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, | |||
331 | struct intel_ring_buffer *ring) | 331 | struct intel_ring_buffer *ring) |
332 | { | 332 | { |
333 | struct drm_i915_private *dev_priv = dev->dev_private; | 333 | struct drm_i915_private *dev_priv = dev->dev_private; |
334 | u32 seqno; | ||
335 | 334 | ||
336 | if (ring->obj == NULL) | 335 | if (ring->obj == NULL) |
337 | return; | 336 | return; |
338 | 337 | ||
339 | seqno = ring->get_seqno(ring); | 338 | trace_i915_gem_request_complete(ring, ring->get_seqno(ring)); |
340 | trace_i915_gem_request_complete(ring, seqno); | ||
341 | 339 | ||
342 | ring->irq_seqno = seqno; | ||
343 | wake_up_all(&ring->irq_queue); | 340 | wake_up_all(&ring->irq_queue); |
344 | if (i915_enable_hangcheck) { | 341 | if (i915_enable_hangcheck) { |
345 | dev_priv->hangcheck_count = 0; | 342 | dev_priv->hangcheck_count = 0; |
diff --git a/drivers/gpu/drm/i915/intel_ringbuffer.h b/drivers/gpu/drm/i915/intel_ringbuffer.h index d3bf2595589f..4d1c6c4235d6 100644 --- a/drivers/gpu/drm/i915/intel_ringbuffer.h +++ b/drivers/gpu/drm/i915/intel_ringbuffer.h | |||
@@ -58,7 +58,6 @@ struct intel_ring_buffer { | |||
58 | 58 | ||
59 | u32 irq_refcount; /* protected by dev_priv->irq_lock */ | 59 | u32 irq_refcount; /* protected by dev_priv->irq_lock */ |
60 | u32 irq_enable_mask; /* bitmask to enable ring interrupt */ | 60 | u32 irq_enable_mask; /* bitmask to enable ring interrupt */ |
61 | u32 irq_seqno; /* last seq seem at irq time */ | ||
62 | u32 trace_irq_seqno; | 61 | u32 trace_irq_seqno; |
63 | u32 sync_seqno[I915_NUM_RINGS-1]; | 62 | u32 sync_seqno[I915_NUM_RINGS-1]; |
64 | bool __must_check (*irq_get)(struct intel_ring_buffer *ring); | 63 | bool __must_check (*irq_get)(struct intel_ring_buffer *ring); |