drm/i915/selftests: Fixup a couple of missing serialisation with vma (8e40983d) · Commits · 戴 / test

In commit ("drm/i915: Serialize against vma moves") I managed to miss a couple of i915_vma_move_to_active() that had not serialised against an async vma pinning. Add the missing i915_request_await. Signed-off-by:

Chris Wilson <chris@chris-wilson.co.uk> Cc: Matthew Auld <matthew.auld@intel.com> Reviewed-by:

Matthew Auld <matthew.auld@intel.com> Link: https://patchwork.freedesktop.org/patch/msgid/20190821193851.18232-1-chris@chris-wilson.co.uk

drivers/gpu/drm/i915/selftests/i915_request.c

+3 −1

Original line number	Diff line number	Diff line
		@@ -994,6 +994,8 @@ static int live_sequential_engines(void *arg)
		request[id]->batch = batch;

		i915_vma_lock(batch);
		err = i915_request_await_object(request[id], batch->obj, false);
		if (err == 0)
		err = i915_vma_move_to_active(batch, request[id], 0);
		i915_vma_unlock(batch);
		GEM_BUG_ON(err);

drivers/gpu/drm/i915/selftests/igt_spinner.c

+4 −1

Original line number	Diff line number	Diff line
		@@ -78,6 +78,9 @@ static int move_to_active(struct i915_vma *vma,
		int err;

		i915_vma_lock(vma);
		err = i915_request_await_object(rq, vma->obj,
		flags & EXEC_OBJECT_WRITE);
		if (err == 0)
		err = i915_vma_move_to_active(vma, rq, flags);
		i915_vma_unlock(vma);

Admin message