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

Commit 1500f7ea authored by Ben Widawsky's avatar Ben Widawsky Committed by Daniel Vetter
Browse files

drm/i915: hide (seqno-1) in ringbuffer code 



Waiting for seqno-1 in our object synchronization code is an
implementation detail given how we've decided to do the waits within the
rest of our code.

Requested-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: default avatarBen Widawsky <benjamin.widawsky@intel.com>
Reviewed-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent e3a5a225

drivers/gpu/drm/i915/i915_gem.c

+1 −1
Original line number Diff line number Diff line
@@ -2002,7 +2002,7 @@ i915_gem_object_sync(struct drm_i915_gem_object *obj, 
	}





	ret = to->sync_to(to, from, seqno - 1);

	ret = to->sync_to(to, from, seqno);

	if (!ret)

		from->sync_seqno[idx] = seqno;

drivers/gpu/drm/i915/intel_ringbuffer.c

+6 −0
Original line number Diff line number Diff line
@@ -482,6 +482,12 @@ intel_ring_sync(struct intel_ring_buffer *waiter, 
		  MI_SEMAPHORE_COMPARE |

		  MI_SEMAPHORE_REGISTER;



	/* Throughout all of the GEM code, seqno passed implies our current

	 * seqno is >= the last seqno executed. However for hardware the

	 * comparison is strictly greater than.

	 */

	seqno -= 1;



	ret = intel_ring_begin(waiter, 4);

	if (ret)

		return ret;