Commit 4f16749f authored by Andrzej Hajda's avatar Andrzej Hajda Committed by Andi Shyti
Browse files

drm/i915/selftest: use igt_vma_move_to_active_unlocked if possible 



Helper replaces common sequence of calls.

Signed-off-by: default avatarAndrzej Hajda <andrzej.hajda@intel.com>
Reviewed-by: default avatarTvrtko Ursulin <tvrtko.ursulin@intel.com>
Reviewed-by: default avatarAndi Shyti <andi.shyti@linux.intel.com>
Signed-off-by: default avatarAndi Shyti <andi.shyti@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20221213121951.1515023-2-andrzej.hajda@intel.com
parent f350c74f

drivers/gpu/drm/i915/gem/selftests/i915_gem_context.c

+2 −6
Original line number Diff line number Diff line
@@ -1551,9 +1551,7 @@ static int write_to_scratch(struct i915_gem_context *ctx, 
		goto err_unpin;

	}



	i915_vma_lock(vma);

	err = i915_vma_move_to_active(vma, rq, 0);

	i915_vma_unlock(vma);

	err = igt_vma_move_to_active_unlocked(vma, rq, 0);

	if (err)

		goto skip_request;
@@ -1686,9 +1684,7 @@ static int read_from_scratch(struct i915_gem_context *ctx, 
		goto err_unpin;

	}



	i915_vma_lock(vma);

	err = i915_vma_move_to_active(vma, rq, EXEC_OBJECT_WRITE);

	i915_vma_unlock(vma);

	err = igt_vma_move_to_active_unlocked(vma, rq, EXEC_OBJECT_WRITE);

	if (err)

		goto skip_request;

drivers/gpu/drm/i915/gem/selftests/igt_gem_utils.c

+2 −6
Original line number Diff line number Diff line
@@ -130,15 +130,11 @@ int igt_gpu_fill_dw(struct intel_context *ce, 
		goto err_batch;

	}



	i915_vma_lock(batch);

	err = i915_vma_move_to_active(batch, rq, 0);

	i915_vma_unlock(batch);

	err = igt_vma_move_to_active_unlocked(batch, rq, 0);

	if (err)

		goto skip_request;



	i915_vma_lock(vma);

	err = i915_vma_move_to_active(vma, rq, EXEC_OBJECT_WRITE);

	i915_vma_unlock(vma);

	err = igt_vma_move_to_active_unlocked(vma, rq, EXEC_OBJECT_WRITE);

	if (err)

		goto skip_request;

drivers/gpu/drm/i915/gt/selftest_execlists.c

+3 −9
Original line number Diff line number Diff line
@@ -2763,13 +2763,11 @@ static int create_gang(struct intel_engine_cs *engine, 
	rq->batch = i915_vma_get(vma);

	i915_request_get(rq);



	i915_vma_lock(vma);

	err = i915_vma_move_to_active(vma, rq, 0);

	err = igt_vma_move_to_active_unlocked(vma, rq, 0);

	if (!err)

		err = rq->engine->emit_bb_start(rq,

						i915_vma_offset(vma),

						PAGE_SIZE, 0);

	i915_vma_unlock(vma);

	i915_request_add(rq);

	if (err)

		goto err_rq;
@@ -3177,9 +3175,7 @@ create_gpr_client(struct intel_engine_cs *engine, 
		goto out_batch;

	}



	i915_vma_lock(vma);

	err = i915_vma_move_to_active(vma, rq, 0);

	i915_vma_unlock(vma);

	err = igt_vma_move_to_active_unlocked(vma, rq, 0);



	i915_vma_lock(batch);

	if (!err)
@@ -3514,13 +3510,11 @@ static int smoke_submit(struct preempt_smoke *smoke, 
	}



	if (vma) {

		i915_vma_lock(vma);

		err = i915_vma_move_to_active(vma, rq, 0);

		err = igt_vma_move_to_active_unlocked(vma, rq, 0);

		if (!err)

			err = rq->engine->emit_bb_start(rq,

							i915_vma_offset(vma),

							PAGE_SIZE, 0);

		i915_vma_unlock(vma);

	}



	i915_request_add(rq);

drivers/gpu/drm/i915/gt/selftest_lrc.c

+1 −3
Original line number Diff line number Diff line
@@ -599,9 +599,7 @@ __gpr_read(struct intel_context *ce, struct i915_vma *scratch, u32 *slot) 
		*cs++ = 0;

	}



	i915_vma_lock(scratch);

	err = i915_vma_move_to_active(scratch, rq, EXEC_OBJECT_WRITE);

	i915_vma_unlock(scratch);

	err = igt_vma_move_to_active_unlocked(scratch, rq, EXEC_OBJECT_WRITE);



	i915_request_get(rq);

	i915_request_add(rq);

drivers/gpu/drm/i915/gt/selftest_mocs.c

+1 −3
Original line number Diff line number Diff line
@@ -228,9 +228,7 @@ static int check_mocs_engine(struct live_mocs *arg, 
	if (IS_ERR(rq))

		return PTR_ERR(rq);



	i915_vma_lock(vma);

	err = i915_vma_move_to_active(vma, rq, EXEC_OBJECT_WRITE);

	i915_vma_unlock(vma);

	err = igt_vma_move_to_active_unlocked(vma, rq, EXEC_OBJECT_WRITE);



	/* Read the mocs tables back using SRM */

	offset = i915_ggtt_offset(vma);