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

Commit 49f08598 authored by Chris Wilson's avatar Chris Wilson
Browse files

drm/i915: Switch the global i915.semaphores check to a local predicate 



Rather than use a global modparam, we can just check to see if the
engine has semaphores configured upon it.

Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: default avatarJoonas Lahtinen <joonas.lahtinen@linux.intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/20170503093924.5320-7-chris@chris-wilson.co.uk
parent fc9d4d2b

drivers/gpu/drm/i915/i915_gem_request.c

+3 −1
Original line number Diff line number Diff line
@@ -711,13 +711,15 @@ i915_gem_request_await_request(struct drm_i915_gem_request *to, 
	if (!seqno)

		goto await_dma_fence;



	if (!i915.semaphores) {

	if (!to->engine->semaphore.sync_to) {

		if (!__i915_gem_request_started(from, seqno))

			goto await_dma_fence;



		if (!__i915_spin_request(from, seqno, TASK_INTERRUPTIBLE, 2))

			goto await_dma_fence;

	} else {

		GEM_BUG_ON(!from->engine->semaphore.signal);



		if (seqno <= to->timeline->global_sync[from->engine->id])

			return 0;