[Intel-gfx] [PATCH] drm/i915/selftests: Also wait for the scratch buffer to be bound

[Mika Kuoppala]

Chris Wilson <chris at chris-wilson.co.uk> writes:

> Since PIN_GLOBAL is no longer guaranteed to be synchronous, we must no
> forget to include a wait-for-vma prior to execution.

Dunno if we got em all, we soon know.

Cried for helper but lets move first,

Reviewed-by: Mika Kuoppala <mika.kuoppala at linux.intel.com>

>
> Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>
> ---
>  drivers/gpu/drm/i915/gt/intel_workarounds.c   | 10 ++++++
>  drivers/gpu/drm/i915/gt/selftest_lrc.c        | 33 +++++++++++++++++++
>  .../gpu/drm/i915/gt/selftest_workarounds.c    |  9 +++++
>  3 files changed, 52 insertions(+)
>
> diff --git a/drivers/gpu/drm/i915/gt/intel_workarounds.c b/drivers/gpu/drm/i915/gt/intel_workarounds.c
> index 5a7db279f702..8d7c3191137c 100644
> --- a/drivers/gpu/drm/i915/gt/intel_workarounds.c
> +++ b/drivers/gpu/drm/i915/gt/intel_workarounds.c
> @@ -1612,6 +1612,16 @@ static int engine_wa_list_verify(struct intel_context *ce,
>  		goto err_vma;
>  	}
>  
> +	i915_vma_lock(vma);
> +	err = i915_request_await_object(rq, vma->obj, true);
> +	if (err == 0)
> +		err = i915_vma_move_to_active(vma, rq, EXEC_OBJECT_WRITE);
> +	i915_vma_unlock(vma);
> +	if (err) {
> +		i915_request_add(rq);
> +		goto err_vma;
> +	}
> +
>  	err = wa_list_srm(rq, wal, vma);
>  	if (err)
>  		goto err_vma;
> diff --git a/drivers/gpu/drm/i915/gt/selftest_lrc.c b/drivers/gpu/drm/i915/gt/selftest_lrc.c
> index f5214a374fb7..0efb46665667 100644
> --- a/drivers/gpu/drm/i915/gt/selftest_lrc.c
> +++ b/drivers/gpu/drm/i915/gt/selftest_lrc.c
> @@ -734,6 +734,10 @@ static int live_timeslice_preempt(void *arg)
>  	if (err)
>  		goto err_map;
>  
> +	err = i915_vma_sync(vma);
> +	if (err)
> +		goto err_pin;
> +
>  	for_each_prime_number_from(count, 1, 16) {
>  		struct intel_engine_cs *engine;
>  		enum intel_engine_id id;
> @@ -827,6 +831,10 @@ static int live_timeslice_queue(void *arg)
>  	if (err)
>  		goto err_map;
>  
> +	err = i915_vma_sync(vma);
> +	if (err)
> +		goto err_unpin;
> +
>  	for_each_engine(engine, gt, id) {
>  		struct i915_sched_attr attr = {
>  			.priority = I915_USER_PRIORITY(I915_PRIORITY_MAX),
> @@ -913,6 +921,7 @@ static int live_timeslice_queue(void *arg)
>  			break;
>  	}
>  
> +err_unpin:
>  	i915_vma_unpin(vma);
>  err_map:
>  	i915_gem_object_unpin_map(obj);
> @@ -971,6 +980,10 @@ static int live_busywait_preempt(void *arg)
>  	if (err)
>  		goto err_map;
>  
> +	err = i915_vma_sync(vma);
> +	if (err)
> +		goto err_vma;
> +
>  	for_each_engine(engine, gt, id) {
>  		struct i915_request *lo, *hi;
>  		struct igt_live_test t;
> @@ -3204,6 +3217,10 @@ static int preserved_virtual_engine(struct intel_gt *gt,
>  	if (IS_ERR(scratch))
>  		return PTR_ERR(scratch);
>  
> +	err = i915_vma_sync(scratch);
> +	if (err)
> +		goto out_scratch;
> +
>  	ve = intel_execlists_create_virtual(siblings, nsibling);
>  	if (IS_ERR(ve)) {
>  		err = PTR_ERR(ve);
> @@ -4030,8 +4047,16 @@ static int __live_lrc_state(struct intel_engine_cs *engine,
>  	*cs++ = i915_ggtt_offset(scratch) + RING_TAIL_IDX * sizeof(u32);
>  	*cs++ = 0;
>  
> +	i915_vma_lock(scratch);
> +	err = i915_request_await_object(rq, scratch->obj, true);
> +	if (!err)
> +		err = i915_vma_move_to_active(scratch, rq, EXEC_OBJECT_WRITE);
> +	i915_vma_unlock(scratch);
> +
>  	i915_request_get(rq);
>  	i915_request_add(rq);
> +	if (err)
> +		goto err_rq;
>  
>  	intel_engine_flush_submission(engine);
>  	expected[RING_TAIL_IDX] = ce->ring->tail;
> @@ -4166,8 +4191,16 @@ static int __live_gpr_clear(struct intel_engine_cs *engine,
>  		*cs++ = 0;
>  	}
>  
> +	i915_vma_lock(scratch);
> +	err = i915_request_await_object(rq, scratch->obj, true);
> +	if (!err)
> +		err = i915_vma_move_to_active(scratch, rq, EXEC_OBJECT_WRITE);
> +	i915_vma_unlock(scratch);
> +
>  	i915_request_get(rq);
>  	i915_request_add(rq);
> +	if (err)
> +		goto err_rq;
>  
>  	if (i915_request_wait(rq, 0, HZ / 5) < 0) {
>  		err = -ETIME;
> diff --git a/drivers/gpu/drm/i915/gt/selftest_workarounds.c b/drivers/gpu/drm/i915/gt/selftest_workarounds.c
> index ac1921854cbf..5ed323254ee1 100644
> --- a/drivers/gpu/drm/i915/gt/selftest_workarounds.c
> +++ b/drivers/gpu/drm/i915/gt/selftest_workarounds.c
> @@ -583,6 +583,15 @@ static int check_dirty_whitelist(struct intel_context *ce)
>  		if (err)
>  			goto err_request;
>  
> +		i915_vma_lock(scratch);
> +		err = i915_request_await_object(rq, scratch->obj, true);
> +		if (err == 0)
> +			err = i915_vma_move_to_active(scratch, rq,
> +						      EXEC_OBJECT_WRITE);
> +		i915_vma_unlock(scratch);
> +		if (err)
> +			goto err_request;
> +
>  		err = engine->emit_bb_start(rq,
>  					    batch->node.start, PAGE_SIZE,
>  					    0);
> -- 
> 2.25.0
>
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx at lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx