Skip to content

Commit 225bc03

Browse files
matt-auldlucasdemarchi
authored andcommitted
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: 86f69c2 ("drm/xe: use backup object for pinned save/restore") Closes: https://gitlab.freedesktop.org/drm/xe/kernel/-/issues/6213 Signed-off-by: Matthew Auld <[email protected]> Cc: Thomas Hellström <[email protected]> Cc: Matthew Brost <[email protected]> Reviewed-by: Thomas Hellström <[email protected]> Link: https://lore.kernel.org/r/[email protected] (cherry picked from commit a10b4a6) Signed-off-by: Lucas De Marchi <[email protected]>
1 parent 6a91af2 commit 225bc03

File tree

1 file changed

+0
-8
lines changed

1 file changed

+0
-8
lines changed

drivers/gpu/drm/xe/xe_bo_evict.c

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,6 @@ int xe_bo_evict_all(struct xe_device *xe)
182182

183183
static int xe_bo_restore_and_map_ggtt(struct xe_bo *bo)
184184
{
185-
struct xe_device *xe = xe_bo_device(bo);
186185
int ret;
187186

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

204-
/*
205-
* We expect validate to trigger a move VRAM and our move code
206-
* should setup the iosys map.
207-
*/
208-
xe_assert(xe, !(bo->flags & XE_BO_FLAG_PINNED_LATE_RESTORE) ||
209-
!iosys_map_is_null(&bo->vmap));
210-
211203
return 0;
212204
}
213205

0 commit comments

Comments
 (0)