Commit 641bcf87 authored by Matthew Auld's avatar Matthew Auld
Browse files

drm/xe/migrate: don't misalign current bytes 

If current bytes exceeds the max copy size, ensure the clamped size
still accounts for the XE_CACHELINE_BYTES alignment, otherwise we
trigger the assert in xe_migrate_vram with the size now being out of
alignment.

Fixes: 8c2d61e0 ("drm/xe/migrate: don't overflow max copy size")
Link: https://gitlab.freedesktop.org/drm/xe/kernel/-/issues/6212


Signed-off-by: default avatarMatthew Auld <matthew.auld@intel.com>
Cc: Stuart Summers <stuart.summers@intel.com>
Cc: Matthew Brost <matthew.brost@intel.com>
Reviewed-by: default avatarMatthew Brost <matthew.brost@intel.com>
Link: https://lore.kernel.org/r/20251010162020.190962-2-matthew.auld@intel.com
parent 961a7582

drivers/gpu/drm/xe/xe_migrate.c

+3 −1
Original line number Diff line number Diff line
@@ -2176,7 +2176,9 @@ int xe_migrate_access_memory(struct xe_migrate *m, struct xe_bo *bo, 
		if (current_bytes & ~PAGE_MASK) {

			int pitch = 4;



			current_bytes = min_t(int, current_bytes, S16_MAX * pitch);

			current_bytes = min_t(int, current_bytes,

					      round_down(S16_MAX * pitch,

							 XE_CACHELINE_BYTES));

		}



		__fence = xe_migrate_vram(m, current_bytes,