[Intel-gfx] [PATCH 33/57] drm/i915: Move busywaiting control to the scheduler

[Tvrtko Ursulin]

On 01/02/2021 08:56, Chris Wilson wrote:
> Busy-waiting is used for preempt-to-busy by schedulers, if they so
> choose. Since it is not a property of the engine, but that of the
> submission backend, move the flag from out of the engine to
> i915_sched_engine.
> 
> Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>
> ---
>   drivers/gpu/drm/i915/gt/gen8_engine_cs.c      |  4 ++--
>   .../drm/i915/gt/intel_execlists_submission.c  |  6 +++++-
>   drivers/gpu/drm/i915/gt/selftest_lrc.c        | 19 +++++++++++++------
>   drivers/gpu/drm/i915/i915_request.h           |  5 +++++
>   drivers/gpu/drm/i915/i915_scheduler_types.h   |  6 ++++++
>   5 files changed, 31 insertions(+), 9 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/gt/gen8_engine_cs.c b/drivers/gpu/drm/i915/gt/gen8_engine_cs.c
> index cac80af7ad1c..8791e03ebe61 100644
> --- a/drivers/gpu/drm/i915/gt/gen8_engine_cs.c
> +++ b/drivers/gpu/drm/i915/gt/gen8_engine_cs.c
> @@ -507,7 +507,7 @@ gen8_emit_fini_breadcrumb_tail(struct i915_request *rq, u32 *cs)
>   	*cs++ = MI_USER_INTERRUPT;
>   
>   	*cs++ = MI_ARB_ON_OFF | MI_ARB_ENABLE;
> -	if (intel_engine_has_semaphores(rq->engine))
> +	if (i915_request_use_busywait(rq))
>   		cs = emit_preempt_busywait(rq, cs);
>   
>   	rq->tail = intel_ring_offset(rq, cs);
> @@ -599,7 +599,7 @@ gen12_emit_fini_breadcrumb_tail(struct i915_request *rq, u32 *cs)
>   	*cs++ = MI_USER_INTERRUPT;
>   
>   	*cs++ = MI_ARB_ON_OFF | MI_ARB_ENABLE;
> -	if (intel_engine_has_semaphores(rq->engine))
> +	if (i915_request_use_busywait(rq))
>   		cs = gen12_emit_preempt_busywait(rq, cs);
>   
>   	rq->tail = intel_ring_offset(rq, cs);
> diff --git a/drivers/gpu/drm/i915/gt/intel_execlists_submission.c b/drivers/gpu/drm/i915/gt/intel_execlists_submission.c
> index d4b6d262265a..9245499d2082 100644
> --- a/drivers/gpu/drm/i915/gt/intel_execlists_submission.c
> +++ b/drivers/gpu/drm/i915/gt/intel_execlists_submission.c
> @@ -304,7 +304,7 @@ static bool need_preempt(const struct intel_engine_cs *engine,
>   	const struct i915_sched *se = &engine->sched;
>   	int last_prio;
>   
> -	if (!intel_engine_has_semaphores(engine))
> +	if (!i915_sched_use_busywait(se))
>   		return false;
>   
>   	/*
> @@ -2930,6 +2930,10 @@ logical_ring_default_vfuncs(struct intel_engine_cs *engine)
>   	    intel_engine_has_preemption(engine))
>   		__set_bit(I915_SCHED_HAS_TIMESLICES_BIT,
>   			  &engine->sched.flags);
> +
> +	if (intel_engine_has_preemption(engine))
> +		__set_bit(I915_SCHED_USE_BUSYWAIT_BIT,
> +			  &engine->sched.flags);

I checked GuC is not using this which was my initial concern.

>   }
>   
>   static void logical_ring_default_irqs(struct intel_engine_cs *engine)
> diff --git a/drivers/gpu/drm/i915/gt/selftest_lrc.c b/drivers/gpu/drm/i915/gt/selftest_lrc.c
> index 279091e41b41..6d73add47109 100644
> --- a/drivers/gpu/drm/i915/gt/selftest_lrc.c
> +++ b/drivers/gpu/drm/i915/gt/selftest_lrc.c
> @@ -679,9 +679,11 @@ static int live_lrc_gpr(void *arg)
>   		if (err)
>   			goto err;
>   
> -		err = __live_lrc_gpr(engine, scratch, true);
> -		if (err)
> -			goto err;
> +		if (intel_engine_has_preemption(engine)) {
> +			err = __live_lrc_gpr(engine, scratch, true);
> +			if (err)
> +				goto err;
> +		}
>   
>   err:
>   		st_engine_heartbeat_enable(engine);
> @@ -859,9 +861,11 @@ static int live_lrc_timestamp(void *arg)
>   			if (err)
>   				break;
>   
> -			err = __lrc_timestamp(&data, true);
> -			if (err)
> -				break;
> +			if (intel_engine_has_preemption(data.engine)) {
> +				err = __lrc_timestamp(&data, true);
> +				if (err)
> +					break;
> +			}
>   		}
>   
>   err:
> @@ -1508,6 +1512,9 @@ static int live_lrc_isolation(void *arg)
>   		    skip_isolation(engine))
>   			continue;
>   
> +		if (!intel_engine_has_preemption(engine))
> +			continue;
> +
>   		intel_engine_pm_get(engine);
>   		for (i = 0; i < ARRAY_SIZE(poison); i++) {
>   			int result;
> diff --git a/drivers/gpu/drm/i915/i915_request.h b/drivers/gpu/drm/i915/i915_request.h
> index 8eea25cb043e..7c29d33e7d51 100644
> --- a/drivers/gpu/drm/i915/i915_request.h
> +++ b/drivers/gpu/drm/i915/i915_request.h
> @@ -642,4 +642,9 @@ static inline bool i915_request_use_semaphores(const struct i915_request *rq)
>   	return intel_engine_has_semaphores(rq->engine);
>   }
>   
> +static inline bool i915_request_use_busywait(const struct i915_request *rq)
> +{
> +	return i915_sched_use_busywait(i915_request_get_scheduler(rq));
> +}
> +
>   #endif /* I915_REQUEST_H */
> diff --git a/drivers/gpu/drm/i915/i915_scheduler_types.h b/drivers/gpu/drm/i915/i915_scheduler_types.h
> index b4a0e4e26bfd..37475024c0de 100644
> --- a/drivers/gpu/drm/i915/i915_scheduler_types.h
> +++ b/drivers/gpu/drm/i915/i915_scheduler_types.h
> @@ -21,6 +21,7 @@ enum {
>   	I915_SCHED_ACTIVE_BIT = 0,
>   	I915_SCHED_HAS_TIMESLICES_BIT,
>   	I915_SCHED_NEEDS_BREADCRUMB_BIT,
> +	I915_SCHED_USE_BUSYWAIT_BIT,
>   };
>   
>   /**
> @@ -201,4 +202,9 @@ i915_sched_needs_breadcrumb_tasklet(const struct i915_sched *se)
>   	return test_bit(I915_SCHED_NEEDS_BREADCRUMB_BIT, &se->flags);
>   }
>   
> +static inline bool i915_sched_use_busywait(const struct i915_sched *se)
> +{
> +	return test_bit(I915_SCHED_USE_BUSYWAIT_BIT, &se->flags);
> +}
> +
>   #endif /* _I915_SCHEDULER_TYPES_H_ */
> 

Reviewed-by: Tvrtko Ursulin <tvrtko.ursulin at intel.com>

Regards,

Tvrtko