diff options
author | Chris Wilson <chris@chris-wilson.co.uk> | 2010-10-21 14:00:02 -0400 |
---|---|---|
committer | Chris Wilson <chris@chris-wilson.co.uk> | 2010-10-21 14:00:02 -0400 |
commit | e36c1cd7292efcb8daca26cd6331481736544742 (patch) | |
tree | d952a08fc4540175842c3dd94e8409355ff491c1 /drivers/gpu/drm | |
parent | c717966744e618af76aa5d7fe6cc44dba487bdc6 (diff) |
drm/i915/ringbuffer: Remove broken intel_fill_struct()
... before someone tries to use it. The code both calls
intel_ring_begin/advance() and open-codes the bookkeeping performed by
those two functions.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Diffstat (limited to 'drivers/gpu/drm')
-rw-r--r-- | drivers/gpu/drm/i915/intel_ringbuffer.c | 15 | ||||
-rw-r--r-- | drivers/gpu/drm/i915/intel_ringbuffer.h | 4 |
2 files changed, 0 insertions, 19 deletions
diff --git a/drivers/gpu/drm/i915/intel_ringbuffer.c b/drivers/gpu/drm/i915/intel_ringbuffer.c index f1e0538b21f5..8da5ff790da3 100644 --- a/drivers/gpu/drm/i915/intel_ringbuffer.c +++ b/drivers/gpu/drm/i915/intel_ringbuffer.c | |||
@@ -733,21 +733,6 @@ void intel_ring_advance(struct drm_device *dev, | |||
733 | ring->set_tail(dev, ring, ring->tail); | 733 | ring->set_tail(dev, ring, ring->tail); |
734 | } | 734 | } |
735 | 735 | ||
736 | void intel_fill_struct(struct drm_device *dev, | ||
737 | struct intel_ring_buffer *ring, | ||
738 | void *data, | ||
739 | unsigned int len) | ||
740 | { | ||
741 | unsigned int *virt = ring->virtual_start + ring->tail; | ||
742 | BUG_ON((len&~(4-1)) != 0); | ||
743 | intel_ring_begin(dev, ring, len/4); | ||
744 | memcpy(virt, data, len); | ||
745 | ring->tail += len; | ||
746 | ring->tail &= ring->size - 1; | ||
747 | ring->space -= len; | ||
748 | intel_ring_advance(dev, ring); | ||
749 | } | ||
750 | |||
751 | static const struct intel_ring_buffer render_ring = { | 736 | static const struct intel_ring_buffer render_ring = { |
752 | .name = "render ring", | 737 | .name = "render ring", |
753 | .id = RING_RENDER, | 738 | .id = RING_RENDER, |
diff --git a/drivers/gpu/drm/i915/intel_ringbuffer.h b/drivers/gpu/drm/i915/intel_ringbuffer.h index 9725f783db20..5b37ff3a6949 100644 --- a/drivers/gpu/drm/i915/intel_ringbuffer.h +++ b/drivers/gpu/drm/i915/intel_ringbuffer.h | |||
@@ -116,10 +116,6 @@ static inline void intel_ring_emit(struct drm_device *dev, | |||
116 | ring->tail += 4; | 116 | ring->tail += 4; |
117 | } | 117 | } |
118 | 118 | ||
119 | void intel_fill_struct(struct drm_device *dev, | ||
120 | struct intel_ring_buffer *ring, | ||
121 | void *data, | ||
122 | unsigned int len); | ||
123 | void intel_ring_advance(struct drm_device *dev, | 119 | void intel_ring_advance(struct drm_device *dev, |
124 | struct intel_ring_buffer *ring); | 120 | struct intel_ring_buffer *ring); |
125 | 121 | ||