]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
Revert "i915: don't use a vma that didn't match the context VM"
authorJoonas Lahtinen <joonas.lahtinen@linux.intel.com>
Mon, 18 May 2026 09:29:41 +0000 (12:29 +0300)
committerJoonas Lahtinen <joonas.lahtinen@linux.intel.com>
Wed, 20 May 2026 07:46:41 +0000 (10:46 +0300)
This reverts commit 5401b9adebc9e5f68df58226f51493ef0e6ceb4d.

Superseded by a13edf9b92fc ("drm/i915/gem: Drop check for changed
VM in EXECBUF"). Else block is now no-op.

Link: https://lore.kernel.org/intel-gfx/CAHk-=whfUM8y3PoFfT21+guKWK-mJmAE=8uLzOT+7HGv5NtqSw@mail.gmail.com/
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
Cc: Tvrtko Ursulin <tursulin@ursulin.net>
Signed-off-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Reviewed-by: Tvrtko Ursulin <tvrtko.ursulin@igalia.com>
Link: https://patch.msgid.link/20260518092941.47247-1-joonas.lahtinen@linux.intel.com
drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c

index 05997e8bbb29ac0d677746d3a63d6bf9733f51b3..1f303d4eaa4d4f253e7de40b527a9d909692c08d 100644 (file)
@@ -898,8 +898,6 @@ static struct i915_vma *eb_lookup_vma(struct i915_execbuffer *eb, u32 handle)
                vma = radix_tree_lookup(&eb->gem_context->handles_vma, handle);
                if (likely(vma))
                        vma = i915_vma_tryget(vma);
-               else
-                       vma = NULL;
                rcu_read_unlock();
                if (likely(vma))
                        return vma;