summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Hellström <thomas.hellstrom@linux.intel.com>2025-09-18 10:10:32 +0200
committerThomas Hellström <thomas.hellstrom@linux.intel.com>2025-09-18 10:10:32 +0200
commit0025138210d8664b12aeed372752bb0f6a76d586 (patch)
tree32956a3a24ade203bb6dd9c773df4f59a3772469
parent6b071bef8c1ace876a4f0e8806b465696c55a135 (diff)
parentf088104d837a991c65e51fa30bb4196169b3244d (diff)
Merge remote-tracking branch 'drm-intel/drm-intel-gt-next' into drm-tip
-rw-r--r--drivers/gpu/drm/i915/gem/selftests/i915_gem_context.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/gem/selftests/i915_gem_context.c b/drivers/gpu/drm/i915/gem/selftests/i915_gem_context.c
index eb0158e43417..1330c0b431a7 100644
--- a/drivers/gpu/drm/i915/gem/selftests/i915_gem_context.c
+++ b/drivers/gpu/drm/i915/gem/selftests/i915_gem_context.c
@@ -962,13 +962,14 @@ emit_rpcs_query(struct drm_i915_gem_object *obj,
if (IS_ERR(rpcs))
return PTR_ERR(rpcs);
+ i915_gem_ww_ctx_init(&ww, false);
+
batch = i915_vma_instance(rpcs, ce->vm, NULL);
if (IS_ERR(batch)) {
err = PTR_ERR(batch);
goto err_put;
}
- i915_gem_ww_ctx_init(&ww, false);
retry:
err = i915_gem_object_lock(obj, &ww);
if (!err)