Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e36c1cd7 authored by Chris Wilson's avatar Chris Wilson
Browse files

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: default avatarChris Wilson <chris@chris-wilson.co.uk>
parent c7179667

drivers/gpu/drm/i915/intel_ringbuffer.c

+0 −15
Original line number Diff line number Diff line
@@ -733,21 +733,6 @@ void intel_ring_advance(struct drm_device *dev, 
	ring->set_tail(dev, ring, ring->tail);

}



void intel_fill_struct(struct drm_device *dev,

		       struct intel_ring_buffer *ring,

		       void *data,

		       unsigned int len)

{

	unsigned int *virt = ring->virtual_start + ring->tail;

	BUG_ON((len&~(4-1)) != 0);

	intel_ring_begin(dev, ring, len/4);

	memcpy(virt, data, len);

	ring->tail += len;

	ring->tail &= ring->size - 1;

	ring->space -= len;

	intel_ring_advance(dev, ring);

}



static const struct intel_ring_buffer render_ring = {

	.name			= "render ring",

	.id			= RING_RENDER,

drivers/gpu/drm/i915/intel_ringbuffer.h

+0 −4
Original line number Diff line number Diff line
@@ -116,10 +116,6 @@ static inline void intel_ring_emit(struct drm_device *dev, 
	ring->tail += 4;

}



void intel_fill_struct(struct drm_device *dev,

		struct intel_ring_buffer *ring,

		void *data,

		unsigned int len);

void intel_ring_advance(struct drm_device *dev,

		struct intel_ring_buffer *ring);