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

-----BEGIN PGP SIGNATURE-----
 
 iQEzBAABCgAdFiEEbSBwaO7dZQkcLOKj+mJfZA7rE8oFAmi4j68ACgkQ+mJfZA7r
 E8rYDAf/epeG1nwJUZ3TTw2FyWGYtIUVrGU3ZW1EEvTxuaJPHlEHjW6q1h84Fg6f
 dqY5XizLFxZEVrYZp2K3b26xiQBSH4H/qFG5q+44a1dBSagNRZDpI28FZGpCnPLS
 ugzLnA/uuGFQrKd/Dr7Wltmk697PwwSqYdeVWTzRRmL52p+OMXVpmq8aHFWkcqOR
 tPEZ3u49a0HxKlnkM1CYDF2GqiT4EdVvn/utxwAo9ikHLobWJ/k0RGB2AxrUqNkT
 HuvNtWt4PpqN8f9bQQB3+75XQi+EwHJS10VbQrzJAR4jix0yggwFYxeyC6f2Filq
 kjcyfpAvIJSh7G7ZVaM/vGG6sovMTQ==
 =fKmY
 -----END PGP SIGNATURE-----

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: Dave Airlie <airlied@redhat.com>

From: Rodrigo Vivi <rodrigo.vivi@intel.com>
Link: https://lore.kernel.org/r/aLiP26TiHkYxtBXL@intel.com
This commit is contained in:
Dave Airlie 2025-09-04 12:51:58 +10:00
commit 40bcf6ecf9

View File

@ -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));