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

Commit 406ea8d2 authored by Chris Wilson's avatar Chris Wilson
Browse files

drm/i915: Treat ringbuffer writes as write to normal memory 



Ringbuffers are now being written to either through LLC or WC paths, so
treating them as simply iomem is no longer adequate. However, for the
older !llc hardware, the hardware is documentated as treating the TAIL
register update as serialising, so we can relax the barriers when filling
the rings (but even if it were not, it is still an uncached register write
and so serialising anyway.).

For simplicity, let's ignore the iomem annotation.

v2: Remove iomem from ringbuffer->virtual_address
v3: And for good measure add iomem elsewhere to keep sparse happy

Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com> #v2
Link: http://patchwork.freedesktop.org/patch/msgid/1469005202-9659-8-git-send-email-chris@chris-wilson.co.uk
Link: http://patchwork.freedesktop.org/patch/msgid/1469017917-15134-7-git-send-email-chris@chris-wilson.co.uk
parent 34911fd3

drivers/gpu/drm/i915/i915_gem_gtt.c

+2 −2
Original line number Diff line number Diff line
@@ -3681,7 +3681,7 @@ void __iomem *i915_vma_pin_iomap(struct i915_vma *vma) 


	lockdep_assert_held(&vma->vm->dev->struct_mutex);

	if (WARN_ON(!vma->obj->map_and_fenceable))

		return ERR_PTR(-ENODEV);

		return IO_ERR_PTR(-ENODEV);



	GEM_BUG_ON(!vma->is_ggtt);

	GEM_BUG_ON((vma->bound & GLOBAL_BIND) == 0);
@@ -3692,7 +3692,7 @@ void __iomem *i915_vma_pin_iomap(struct i915_vma *vma) 
					vma->node.start,

					vma->node.size);

		if (ptr == NULL)

			return ERR_PTR(-ENOMEM);

			return IO_ERR_PTR(-ENOMEM);



		vma->iomap = ptr;

	}

drivers/gpu/drm/i915/i915_gem_gtt.h

+1 −0
Original line number Diff line number Diff line
@@ -580,6 +580,7 @@ i915_ggtt_view_size(struct drm_i915_gem_object *obj, 
 * Returns a valid iomapped pointer or ERR_PTR.

 */

void __iomem *i915_vma_pin_iomap(struct i915_vma *vma);

#define IO_ERR_PTR(x) ((void __iomem *)ERR_PTR(x))



/**

 * i915_vma_unpin_iomap - unpins the mapping returned from i915_vma_iomap

drivers/gpu/drm/i915/i915_irq.c

+6 −4
Original line number Diff line number Diff line
@@ -2860,6 +2860,7 @@ static struct intel_engine_cs * 
semaphore_waits_for(struct intel_engine_cs *engine, u32 *seqno)

{

	struct drm_i915_private *dev_priv = engine->i915;

	void __iomem *vaddr;

	u32 cmd, ipehr, head;

	u64 offset = 0;

	int i, backwards;
@@ -2898,6 +2899,7 @@ semaphore_waits_for(struct intel_engine_cs *engine, u32 *seqno) 
	 */

	head = I915_READ_HEAD(engine) & HEAD_ADDR;

	backwards = (INTEL_GEN(dev_priv) >= 8) ? 5 : 4;

	vaddr = (void __iomem *)engine->buffer->virtual_start;



	for (i = backwards; i; --i) {

		/*
@@ -2908,7 +2910,7 @@ semaphore_waits_for(struct intel_engine_cs *engine, u32 *seqno) 
		head &= engine->buffer->size - 1;



		/* This here seems to blow up */

		cmd = ioread32(engine->buffer->virtual_start + head);

		cmd = ioread32(vaddr + head);

		if (cmd == ipehr)

			break;
@@ -2918,11 +2920,11 @@ semaphore_waits_for(struct intel_engine_cs *engine, u32 *seqno) 
	if (!i)

		return NULL;



	*seqno = ioread32(engine->buffer->virtual_start + head + 4) + 1;

	*seqno = ioread32(vaddr + head + 4) + 1;

	if (INTEL_GEN(dev_priv) >= 8) {

		offset = ioread32(engine->buffer->virtual_start + head + 12);

		offset = ioread32(vaddr + head + 12);

		offset <<= 32;

		offset = ioread32(engine->buffer->virtual_start + head + 8);

		offset |= ioread32(vaddr + head + 8);

	}

	return semaphore_wait_to_signaller_ring(engine, ipehr, offset);

}

drivers/gpu/drm/i915/intel_fbdev.c

+1 −1
Original line number Diff line number Diff line
@@ -189,7 +189,7 @@ static int intelfb_create(struct drm_fb_helper *helper, 
	struct i915_vma *vma;

	struct drm_i915_gem_object *obj;

	bool prealloc = false;

	void *vaddr;

	void __iomem *vaddr;

	int ret;



	if (intel_fb &&

drivers/gpu/drm/i915/intel_lrc.h

+3 −3
Original line number Diff line number Diff line
@@ -81,8 +81,9 @@ int logical_ring_flush_all_caches(struct drm_i915_gem_request *req); 
 */

static inline void intel_logical_ring_advance(struct intel_ringbuffer *ringbuf)

{

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

	__intel_ringbuffer_advance(ringbuf);

}



/**

 * intel_logical_ring_emit() - write a DWORD to the ringbuffer.

 * @ringbuf: Ringbuffer to write to.
@@ -91,8 +92,7 @@ static inline void intel_logical_ring_advance(struct intel_ringbuffer *ringbuf) 
static inline void intel_logical_ring_emit(struct intel_ringbuffer *ringbuf,

					   u32 data)

{

	iowrite32(data, ringbuf->virtual_start + ringbuf->tail);

	ringbuf->tail += 4;

	__intel_ringbuffer_emit(ringbuf, data);

}

static inline void intel_logical_ring_emit_reg(struct intel_ringbuffer *ringbuf,

					       i915_reg_t reg)