Skip to content

Commit c4d0f59

Browse files
KKaras169169Andi Shyti
authored andcommitted
drm/i915/selftests: Do not overwrite error code after intel_context_migrate_clear() call
Currently this function's error code is stored in err variable, which, if a i915_request is present, will be immediately overwritten by return from dma_resv_reserve_fences(). Call DMA functions only if intel_context_migrate_clear() succeeded. Suggested-by: Matthew Auld <matthew.auld@intel.com> Signed-off-by: Krzysztof Karas <krzysztof.karas@intel.com> Reviewed-by: Sebastian Brzezinka <sebastian.brzezinka@intel.com> Reviewed-by: Andi Shyti <andi.shyti@linux.intel.com> Signed-off-by: Andi Shyti <andi.shyti@linux.intel.com> Link: https://lore.kernel.org/r/c0348e052bcb2870acdc15d60f5389fbdf4ef886.1753859971.git.krzysztof.karas@intel.com
1 parent c8bdf31 commit c4d0f59

1 file changed

Lines changed: 1 addition & 1 deletion

File tree

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1228,7 +1228,7 @@ static int __igt_mmap_migrate(struct intel_memory_region **placements,
12281228
i915_gem_object_is_lmem(obj),
12291229
expand32(POISON_INUSE), &rq);
12301230
i915_gem_object_unpin_pages(obj);
1231-
if (rq) {
1231+
if (rq && !err) {
12321232
err = dma_resv_reserve_fences(obj->base.resv, 1);
12331233
if (!err)
12341234
dma_resv_add_fence(obj->base.resv, &rq->fence,

0 commit comments

Comments
 (0)