Commit 40bcf6ec authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'drm-xe-fixes-2025-09-03' of https://gitlab.freedesktop.org/drm/xe/kernel into drm-fixes 



- Fix incorrect migration of backed-up object to VRAM (Thomas)

Signed-off-by: default avatarDave Airlie <airlied@redhat.com>

From: Rodrigo Vivi <rodrigo.vivi@intel.com>
Link: https://lore.kernel.org/r/aLiP26TiHkYxtBXL@intel.com
parents 42e0a73b 379b3c98

drivers/gpu/drm/xe/xe_bo.c

+1 −2
Original line number Diff line number Diff line
@@ -819,8 +819,7 @@ static int xe_bo_move(struct ttm_buffer_object *ttm_bo, bool evict, 
		return ret;

	}



	tt_has_data = ttm && (ttm_tt_is_populated(ttm) ||

			      (ttm->page_flags & TTM_TT_FLAG_SWAPPED));

	tt_has_data = ttm && (ttm_tt_is_populated(ttm) || ttm_tt_is_swapped(ttm));



	move_lacks_source = !old_mem || (handle_system_ccs ? (!bo->ccs_cleared) :

					 (!mem_type_is_vram(old_mem_type) && !tt_has_data));