aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/i915/intel_ringbuffer.h
diff options
context:
space:
mode:
authorDaniel Vetter <daniel.vetter@ffwll.ch>2010-09-24 21:20:10 +0200
committerChris Wilson <chris@chris-wilson.co.uk>2010-09-25 12:23:15 +0100
commit79f321b7e676bd54f563c5ce513588aa90b2cc21 (patch)
tree9ef460994bb367ee35a58ae566926a33ddd5265f /drivers/gpu/drm/i915/intel_ringbuffer.h
parentdrm/i915: kill per-ring macros (diff)
downloadlinux-dev-79f321b7e676bd54f563c5ce513588aa90b2cc21.tar.xz
linux-dev-79f321b7e676bd54f563c5ce513588aa90b2cc21.zip
drm/i915: kill ring->get_active_head
All functions are extremely similar, so fold them into one generic implementation. This function isn't used anyway, because there's not yet a bsd ring error state dumper. 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.h5
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/gpu/drm/i915/intel_ringbuffer.h b/drivers/gpu/drm/i915/intel_ringbuffer.h
index d506da1605b4..43c5f7a476fa 100644
--- a/drivers/gpu/drm/i915/intel_ringbuffer.h
+++ b/drivers/gpu/drm/i915/intel_ringbuffer.h
@@ -50,8 +50,6 @@ struct intel_ring_buffer {
void (*set_tail)(struct drm_device *dev,
struct intel_ring_buffer *ring,
u32 value);
- unsigned int (*get_active_head)(struct drm_device *dev,
- struct intel_ring_buffer *ring);
void (*flush)(struct drm_device *dev,
struct intel_ring_buffer *ring,
u32 invalidate_domains,
@@ -128,4 +126,7 @@ u32 intel_ring_get_seqno(struct drm_device *dev,
int intel_init_render_ring_buffer(struct drm_device *dev);
int intel_init_bsd_ring_buffer(struct drm_device *dev);
+u32 intel_ring_get_active_head(struct drm_device *dev,
+ struct intel_ring_buffer *ring);
+
#endif /* _INTEL_RINGBUFFER_H_ */