]> www.infradead.org Git - users/dwmw2/linux.git/commitdiff
drm/radeon: Use ttm_bo_move_null() in radeon_bo_move()
authorHuacai Chen <chenhuacai@loongson.cn>
Wed, 13 Nov 2024 12:51:58 +0000 (20:51 +0800)
committerAlex Deucher <alexander.deucher@amd.com>
Wed, 20 Nov 2024 14:36:55 +0000 (09:36 -0500)
Since ttm_bo_move_null() is exactly the same as ttm_resource_free() +
ttm_bo_assign_mem(), we use ttm_bo_move_null() for the GTT --> SYSTEM
move case too. Then the code is more consistent as the SYSTEM --> GTT
move case.

Acked-by: Christian König <christian.koenig@amd.com>
Signed-off-by: Huacai Chen <chenhuacai@loongson.cn>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
drivers/gpu/drm/radeon/radeon_ttm.c

index 69d0c12fa419fdb86dfe4433e0e29c4a8dc9646e..616d25c8c2de7f579fb2045591f7d7498ff70689 100644 (file)
@@ -219,8 +219,7 @@ static int radeon_bo_move(struct ttm_buffer_object *bo, bool evict,
        if (old_mem->mem_type == TTM_PL_TT &&
            new_mem->mem_type == TTM_PL_SYSTEM) {
                radeon_ttm_tt_unbind(bo->bdev, bo->ttm);
-               ttm_resource_free(bo, &bo->resource);
-               ttm_bo_assign_mem(bo, new_mem);
+               ttm_bo_move_null(bo, new_mem);
                goto out;
        }
        if (rdev->ring[radeon_copy_ring_index(rdev)].ready &&