Commit 225bc03d authored by Matthew Auld's avatar Matthew Auld Committed by Lucas De Marchi
Browse files

drm/xe/evict: drop bogus assert 

This assert can trigger here with non pin_map users that select
LATE_RESTORE, since the vmap is allowed to be NULL given that
save/restore can now use the blitter instead. The check here doesn't
seem to have much value anymore given that we no longer move pinned
memory, so any existing vmap is left well alone, and doesn't need to be
recreated upon restore, so just drop the assert here.

Fixes: 86f69c26 ("drm/xe: use backup object for pinned save/restore")
Closes: https://gitlab.freedesktop.org/drm/xe/kernel/-/issues/6213


Signed-off-by: default avatarMatthew Auld <matthew.auld@intel.com>
Cc: Thomas Hellström <thomas.hellstrom@linux.intel.com>
Cc: Matthew Brost <matthew.brost@intel.com>
Reviewed-by: default avatarThomas Hellström <thomas.hellstrom@linux.intel.com>
Link: https://lore.kernel.org/r/20251010152457.177884-2-matthew.auld@intel.com


(cherry picked from commit a10b4a69)
Signed-off-by: default avatarLucas De Marchi <lucas.demarchi@intel.com>
parent 6a91af25

drivers/gpu/drm/xe/xe_bo_evict.c

+0 −8
Original line number Diff line number Diff line
@@ -182,7 +182,6 @@ int xe_bo_evict_all(struct xe_device *xe) 


static int xe_bo_restore_and_map_ggtt(struct xe_bo *bo)

{

	struct xe_device *xe = xe_bo_device(bo);

	int ret;



	ret = xe_bo_restore_pinned(bo);
@@ -201,13 +200,6 @@ static int xe_bo_restore_and_map_ggtt(struct xe_bo *bo) 
		}

	}



	/*

	 * We expect validate to trigger a move VRAM and our move code

	 * should setup the iosys map.

	 */

	xe_assert(xe, !(bo->flags & XE_BO_FLAG_PINNED_LATE_RESTORE) ||

		  !iosys_map_is_null(&bo->vmap));



	return 0;

}