Re: [PATCH] drm/xe/evict: drop bogus assert

["Thomas Hellström" <thomas.hellstrom@linux.intel.com>]

On Fri, 2025-10-10 at 16:24 +0100, Matthew Auld wrote:
> 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: 86f69c26113c ("drm/xe: use backup object for pinned
> save/restore")
> Closes: https://gitlab.freedesktop.org/drm/xe/kernel/-/issues/6213
> Signed-off-by: Matthew Auld <matthew.auld@intel.com>
> Cc: Thomas Hellström <thomas.hellstrom@linux.intel.com>
> Cc: Matthew Brost <matthew.brost@intel.com>

Reviewed-by: Thomas Hellström <thomas.hellstrom@linux.intel.com>

> ---
>  drivers/gpu/drm/xe/xe_bo_evict.c | 8 --------
>  1 file changed, 8 deletions(-)
> 
> diff --git a/drivers/gpu/drm/xe/xe_bo_evict.c
> b/drivers/gpu/drm/xe/xe_bo_evict.c
> index 1a12675b2ea9..7661fca7f278 100644
> --- a/drivers/gpu/drm/xe/xe_bo_evict.c
> +++ b/drivers/gpu/drm/xe/xe_bo_evict.c
> @@ -191,7 +191,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);
> @@ -210,13 +209,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;
>  }
>