Skip to content

Commit

Permalink
drm/i915: kill ring->get_active_head
Browse files Browse the repository at this point in the history 
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>
  • Loading branch information
Daniel Vetter authored and Chris Wilson committed Sep 25, 2010
1 parent 3d281d8 commit 79f321b
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 21 deletions.
21 changes: 2 additions & 19 deletions drivers/gpu/drm/i915/intel_ringbuffer.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -127,8 +127,8 @@ static void ring_set_tail(struct drm_device *dev,
I915_WRITE_TAIL(ring, ring->tail);
}

static unsigned int render_ring_get_active_head(struct drm_device *dev,
struct intel_ring_buffer *ring)
u32 intel_ring_get_active_head(struct drm_device *dev,
struct intel_ring_buffer *ring)
{
drm_i915_private_t *dev_priv = dev->dev_private;
u32 acthd_reg = INTEL_INFO(dev)->gen >= 4 ?
Expand Down Expand Up @@ -376,13 +376,6 @@ bsd_ring_flush(struct drm_device *dev,
intel_ring_advance(dev, ring);
}

static unsigned int bsd_ring_get_active_head(struct drm_device *dev,
struct intel_ring_buffer *ring)
{
drm_i915_private_t *dev_priv = dev->dev_private;
return I915_READ(RING_ACTHD(ring->mmio_base));
}

static int init_bsd_ring(struct drm_device *dev,
struct intel_ring_buffer *ring)
{
Expand Down Expand Up @@ -771,7 +764,6 @@ static const struct intel_ring_buffer render_ring = {
.setup_status_page = render_setup_status_page,
.init = init_render_ring,
.set_tail = ring_set_tail,
.get_active_head = render_ring_get_active_head,
.flush = render_ring_flush,
.add_request = render_ring_add_request,
.get_seqno = render_ring_get_seqno,
Expand All @@ -790,7 +782,6 @@ static const struct intel_ring_buffer bsd_ring = {
.setup_status_page = bsd_setup_status_page,
.init = init_bsd_ring,
.set_tail = ring_set_tail,
.get_active_head = bsd_ring_get_active_head,
.flush = bsd_ring_flush,
.add_request = bsd_ring_add_request,
.get_seqno = bsd_ring_get_seqno,
Expand Down Expand Up @@ -831,13 +822,6 @@ static void gen6_bsd_ring_set_tail(struct drm_device *dev,
GEN6_BSD_SLEEP_PSMI_CONTROL_RC_ILDL_MESSAGE_ENABLE);
}

static unsigned int gen6_bsd_ring_get_active_head(struct drm_device *dev,
struct intel_ring_buffer *ring)
{
drm_i915_private_t *dev_priv = dev->dev_private;
return I915_READ(RING_ACTHD(ring->mmio_base));
}

static void gen6_bsd_ring_flush(struct drm_device *dev,
struct intel_ring_buffer *ring,
u32 invalidate_domains,
Expand Down Expand Up @@ -881,7 +865,6 @@ static const struct intel_ring_buffer gen6_bsd_ring = {
.setup_status_page = gen6_bsd_setup_status_page,
.init = init_bsd_ring,
.set_tail = gen6_bsd_ring_set_tail,
.get_active_head = gen6_bsd_ring_get_active_head,
.flush = gen6_bsd_ring_flush,
.add_request = bsd_ring_add_request,
.get_seqno = bsd_ring_get_seqno,
Expand Down
5 changes: 3 additions & 2 deletions drivers/gpu/drm/i915/intel_ringbuffer.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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_ */

0 comments on commit 79f321b

Please sign in to comment.