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

airlied · airlied · commit 40bcf6ecf9f0 · 2025-09-04T12:52:19.000+10:00
- Fix incorrect migration of backed-up object to VRAM (Thomas) Signed-off-by: Dave Airlie <airlied@redhat.com> From: Rodrigo Vivi <rodrigo.vivi@intel.com> Link: https://lore.kernel.org/r/aLiP26TiHkYxtBXL@intel.com
diff --git a/drivers/gpu/drm/xe/xe_bo.c b/drivers/gpu/drm/xe/xe_bo.c
@@ -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));

Original file line number	Diff line number	Diff line change
`@@ -819,8 +819,7 @@ static int xe_bo_move(struct ttm_buffer_object *ttm_bo, bool evict,`
`819`	`819`	`return ret;`
`820`	`820`	`}`
`821`	`821`
`822`		`- tt_has_data = ttm && (ttm_tt_is_populated(ttm) \|\|`
`823`		`- (ttm->page_flags & TTM_TT_FLAG_SWAPPED));`
	`822`	`+ tt_has_data = ttm && (ttm_tt_is_populated(ttm) \|\| ttm_tt_is_swapped(ttm));`
`824`	`823`
`825`	`824`	`move_lacks_source = !old_mem \|\| (handle_system_ccs ? (!bo->ccs_cleared) :`
`826`	`825`	`(!mem_type_is_vram(old_mem_type) && !tt_has_data));`