[PATCH 1/2] drm/xe: Restore system memory GGTT mappings

[Matthew Brost]

On Fri, Nov 01, 2024 at 03:47:25PM +0000, Matthew Auld wrote:
> From: Matthew Brost <matthew.brost at intel.com>
> 
> GGTT mappings reside on the device and this state is lost during suspend
> / d3cold thus this state must be restored resume regardless if the BO is
> in system memory or VRAM.
> 
> Signed-off-by: Matthew Brost <matthew.brost at intel.com>
> Reviewed-by: Matthew Auld <matthew.auld at intel.com>
> Signed-off-by: Matthew Auld <matthew.auld at intel.com>

I just merged this one...

Matt

> ---
>  drivers/gpu/drm/xe/xe_bo.c       | 14 +++++++++++---
>  drivers/gpu/drm/xe/xe_bo_evict.c |  1 -
>  2 files changed, 11 insertions(+), 4 deletions(-)
> 
> diff --git a/drivers/gpu/drm/xe/xe_bo.c b/drivers/gpu/drm/xe/xe_bo.c
> index 5b232f2951b1..d79d8ef5c7d5 100644
> --- a/drivers/gpu/drm/xe/xe_bo.c
> +++ b/drivers/gpu/drm/xe/xe_bo.c
> @@ -888,8 +888,8 @@ int xe_bo_evict_pinned(struct xe_bo *bo)
>  	if (WARN_ON(!xe_bo_is_pinned(bo)))
>  		return -EINVAL;
>  
> -	if (WARN_ON(!xe_bo_is_vram(bo)))
> -		return -EINVAL;
> +	if (!xe_bo_is_vram(bo))
> +		return 0;
>  
>  	ret = ttm_bo_mem_space(&bo->ttm, &placement, &new_mem, &ctx);
>  	if (ret)
> @@ -939,6 +939,7 @@ int xe_bo_restore_pinned(struct xe_bo *bo)
>  		.interruptible = false,
>  	};
>  	struct ttm_resource *new_mem;
> +	struct ttm_place *place = &(bo->placements[0]);
>  	int ret;
>  
>  	xe_bo_assert_held(bo);
> @@ -952,6 +953,9 @@ int xe_bo_restore_pinned(struct xe_bo *bo)
>  	if (WARN_ON(xe_bo_is_vram(bo) || !bo->ttm.ttm))
>  		return -EINVAL;
>  
> +	if (!mem_type_is_vram(place->mem_type))
> +		return 0;
> +
>  	ret = ttm_bo_mem_space(&bo->ttm, &bo->placement, &new_mem, &ctx);
>  	if (ret)
>  		return ret;
> @@ -1804,7 +1808,10 @@ int xe_bo_pin(struct xe_bo *bo)
>  			place->fpfn = (xe_bo_addr(bo, 0, PAGE_SIZE) -
>  				       vram_region_gpu_offset(bo->ttm.resource)) >> PAGE_SHIFT;
>  			place->lpfn = place->fpfn + (bo->size >> PAGE_SHIFT);
> +		}
>  
> +		if (mem_type_is_vram(place->mem_type) ||
> +		    bo->flags & XE_BO_FLAG_GGTT) {
>  			spin_lock(&xe->pinned.lock);
>  			list_add_tail(&bo->pinned_link, &xe->pinned.kernel_bo_present);
>  			spin_unlock(&xe->pinned.lock);
> @@ -1865,7 +1872,8 @@ void xe_bo_unpin(struct xe_bo *bo)
>  	    bo->flags & XE_BO_FLAG_INTERNAL_TEST)) {
>  		struct ttm_place *place = &(bo->placements[0]);
>  
> -		if (mem_type_is_vram(place->mem_type)) {
> +		if (mem_type_is_vram(place->mem_type) ||
> +		    bo->flags & XE_BO_FLAG_GGTT) {
>  			spin_lock(&xe->pinned.lock);
>  			xe_assert(xe, !list_empty(&bo->pinned_link));
>  			list_del_init(&bo->pinned_link);
> diff --git a/drivers/gpu/drm/xe/xe_bo_evict.c b/drivers/gpu/drm/xe/xe_bo_evict.c
> index 541b49007d73..32043e1e5a86 100644
> --- a/drivers/gpu/drm/xe/xe_bo_evict.c
> +++ b/drivers/gpu/drm/xe/xe_bo_evict.c
> @@ -159,7 +159,6 @@ int xe_bo_restore_kernel(struct xe_device *xe)
>  		 * should setup the iosys map.
>  		 */
>  		xe_assert(xe, !iosys_map_is_null(&bo->vmap));
> -		xe_assert(xe, xe_bo_is_vram(bo));
>  
>  		xe_bo_put(bo);
>  
> -- 
> 2.47.0
>