Unverified Commit 77c8ede6 authored by Thomas Hellström's avatar Thomas Hellström Committed by Rodrigo Vivi
Browse files

drm/xe: Don't copy pinned kernel bos twice on suspend 



We were copying the bo content the bos on the list
"xe->pinned.late.kernel_bo_present" twice on suspend.

Presumingly the intent is to copy the pinned external bos on
the first pass.

This is harmless since we (currently) should have no pinned
external bos needing copy since
a) exernal system bos don't have compressed content,
b) We do not (yet) allow pinning of VRAM bos.

Still, fix this up so that we copy pinned external bos on
the first pass. We're about to allow bos pinned in VRAM.

Fixes: c6a4d46e ("drm/xe: evict user memory in PM notifier")
Cc: Matthew Auld <matthew.auld@intel.com>
Cc: <stable@vger.kernel.org> # v6.16+
Signed-off-by: default avatarThomas Hellström <thomas.hellstrom@linux.intel.com>
Reviewed-by: default avatarMatthew Auld <matthew.auld@intel.com>
Link: https://lore.kernel.org/r/20250918092207.54472-2-thomas.hellstrom@linux.intel.com


(cherry picked from commit 9e69bafe)
Signed-off-by: default avatarRodrigo Vivi <rodrigo.vivi@intel.com>
parent b67e7422

drivers/gpu/drm/xe/xe_bo_evict.c

+2 −2
Original line number Diff line number Diff line
@@ -158,8 +158,8 @@ int xe_bo_evict_all(struct xe_device *xe) 
	if (ret)

		return ret;



	ret = xe_bo_apply_to_pinned(xe, &xe->pinned.late.kernel_bo_present,

				    &xe->pinned.late.evicted, xe_bo_evict_pinned);

	ret = xe_bo_apply_to_pinned(xe, &xe->pinned.late.external,

				    &xe->pinned.late.external, xe_bo_evict_pinned);



	if (!ret)

		ret = xe_bo_apply_to_pinned(xe, &xe->pinned.late.kernel_bo_present,