aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/i915/intel_ringbuffer.h
diff options
context:
space:
mode:
authorDaniel Vetter <daniel.vetter@ffwll.ch>2010-09-24 15:49:27 -0400
committerChris Wilson <chris@chris-wilson.co.uk>2010-09-25 07:23:16 -0400
commit447da18742b170b8e09ac71edf63c5798d2dbb0b (patch)
tree3c7fc5ff8d4a5c8afde505ae0fa1126f352e205e /drivers/gpu/drm/i915/intel_ringbuffer.h
parent79f321b7e676bd54f563c5ce513588aa90b2cc21 (diff)
drm/i915: kill ring->setup_status_page
It's the same code, essentially, so kill all copies safe one unified version. Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch> Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Diffstat (limited to 'drivers/gpu/drm/i915/intel_ringbuffer.h')
-rw-r--r--drivers/gpu/drm/i915/intel_ringbuffer.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/i915/intel_ringbuffer.h b/drivers/gpu/drm/i915/intel_ringbuffer.h
index 43c5f7a476fa..c50919275c6f 100644
--- a/drivers/gpu/drm/i915/intel_ringbuffer.h
+++ b/drivers/gpu/drm/i915/intel_ringbuffer.h
@@ -41,8 +41,6 @@ struct intel_ring_buffer {
41 struct intel_ring_buffer *ring); 41 struct intel_ring_buffer *ring);
42 void (*user_irq_put)(struct drm_device *dev, 42 void (*user_irq_put)(struct drm_device *dev,
43 struct intel_ring_buffer *ring); 43 struct intel_ring_buffer *ring);
44 void (*setup_status_page)(struct drm_device *dev,
45 struct intel_ring_buffer *ring);
46 44
47 int (*init)(struct drm_device *dev, 45 int (*init)(struct drm_device *dev,
48 struct intel_ring_buffer *ring); 46 struct intel_ring_buffer *ring);
@@ -128,5 +126,7 @@ int intel_init_bsd_ring_buffer(struct drm_device *dev);
128 126
129u32 intel_ring_get_active_head(struct drm_device *dev, 127u32 intel_ring_get_active_head(struct drm_device *dev,
130 struct intel_ring_buffer *ring); 128 struct intel_ring_buffer *ring);
129void intel_ring_setup_status_page(struct drm_device *dev,
130 struct intel_ring_buffer *ring);
131 131
132#endif /* _INTEL_RINGBUFFER_H_ */ 132#endif /* _INTEL_RINGBUFFER_H_ */