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

Commit 62520e33 authored by Chris Wilson's avatar Chris Wilson
Browse files

drm/i915: Move tasklet kicking to __i915_request_queue caller 



Since __i915_request_queue() may be called from hardirq (timer) context,
we cannot use local_bh_disable/enable at the lower level. As we do want
to kick the tasklet to speed up initial submission or preemption for
normal client submission, lift it to the normal process context
callpath.

Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: default avatarMika Kuoppala <mika.kuoppala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20190815042031.27750-1-chris@chris-wilson.co.uk
parent 845f7f7e

drivers/gpu/drm/i915/i915_request.c

+2 −2
Original line number Diff line number Diff line
@@ -1203,12 +1203,10 @@ void __i915_request_queue(struct i915_request *rq, 
	 * decide whether to preempt the entire chain so that it is ready to

	 * run at the earliest possible convenience.

	 */

	local_bh_disable();

	i915_sw_fence_commit(&rq->semaphore);

	if (attr && rq->engine->schedule)

		rq->engine->schedule(rq, attr);

	i915_sw_fence_commit(&rq->submit);

	local_bh_enable(); /* Kick the execlists tasklet if just scheduled */

}



void i915_request_add(struct i915_request *rq)
@@ -1247,7 +1245,9 @@ void i915_request_add(struct i915_request *rq) 
	if (list_empty(&rq->sched.signalers_list))

		attr.priority |= I915_PRIORITY_WAIT;



	local_bh_disable();

	__i915_request_queue(rq, &attr);

	local_bh_enable(); /* Kick the execlists tasklet if just scheduled */



	/*

	 * In typical scenarios, we do not expect the previous request on