[PATCH 4/7] drm/xe: Stop ignoring errors from xe_ttm_stolen_mgr_init()

[Francois Dugast]

On Fri, Jan 31, 2025 at 02:31:37PM -0800, Lucas De Marchi wrote:
> Make sure to differentiate normal behavior, e.g. there's no stolen, from
> allocation errors or failure to initialize lower layers.
> 
> Signed-off-by: Lucas De Marchi <lucas.demarchi at intel.com>

Reviewed-by: Francois Dugast <francois.dugast at intel.com>

> ---
>  drivers/gpu/drm/xe/xe_device.c         |  4 +++-
>  drivers/gpu/drm/xe/xe_ttm_stolen_mgr.c | 17 +++++++++--------
>  drivers/gpu/drm/xe/xe_ttm_stolen_mgr.h |  2 +-
>  3 files changed, 13 insertions(+), 10 deletions(-)
> 
> diff --git a/drivers/gpu/drm/xe/xe_device.c b/drivers/gpu/drm/xe/xe_device.c
> index 2e874906d4f31..e519f435b1606 100644
> --- a/drivers/gpu/drm/xe/xe_device.c
> +++ b/drivers/gpu/drm/xe/xe_device.c
> @@ -826,7 +826,9 @@ int xe_device_probe(struct xe_device *xe)
>  	}
>  
>  	/* Allocate and map stolen after potential VRAM resize */
> -	xe_ttm_stolen_mgr_init(xe);
> +	err = xe_ttm_stolen_mgr_init(xe);
> +	if (err)
> +		return err;
>  
>  	/*
>  	 * Now that GT is initialized (TTM in particular),
> diff --git a/drivers/gpu/drm/xe/xe_ttm_stolen_mgr.c b/drivers/gpu/drm/xe/xe_ttm_stolen_mgr.c
> index 423856cc18d40..e1a1200fdf22d 100644
> --- a/drivers/gpu/drm/xe/xe_ttm_stolen_mgr.c
> +++ b/drivers/gpu/drm/xe/xe_ttm_stolen_mgr.c
> @@ -201,17 +201,16 @@ static u64 detect_stolen(struct xe_device *xe, struct xe_ttm_stolen_mgr *mgr)
>  #endif
>  }
>  
> -void xe_ttm_stolen_mgr_init(struct xe_device *xe)
> +int xe_ttm_stolen_mgr_init(struct xe_device *xe)
>  {
> -	struct xe_ttm_stolen_mgr *mgr = drmm_kzalloc(&xe->drm, sizeof(*mgr), GFP_KERNEL);
>  	struct pci_dev *pdev = to_pci_dev(xe->drm.dev);
> +	struct xe_ttm_stolen_mgr *mgr;
>  	u64 stolen_size, io_size;
>  	int err;
>  
> -	if (!mgr) {
> -		drm_dbg_kms(&xe->drm, "Stolen mgr init failed\n");
> -		return;
> -	}
> +	mgr = drmm_kzalloc(&xe->drm, sizeof(*mgr), GFP_KERNEL);
> +	if (!mgr)
> +		return -ENOMEM;
>  
>  	if (IS_SRIOV_VF(xe))
>  		stolen_size = 0;
> @@ -224,7 +223,7 @@ void xe_ttm_stolen_mgr_init(struct xe_device *xe)
>  
>  	if (!stolen_size) {
>  		drm_dbg_kms(&xe->drm, "No stolen memory support\n");
> -		return;
> +		return 0;
>  	}
>  
>  	/*
> @@ -240,7 +239,7 @@ void xe_ttm_stolen_mgr_init(struct xe_device *xe)
>  				     io_size, PAGE_SIZE);
>  	if (err) {
>  		drm_dbg_kms(&xe->drm, "Stolen mgr init failed: %i\n", err);
> -		return;
> +		return err;
>  	}
>  
>  	drm_dbg_kms(&xe->drm, "Initialized stolen memory support with %llu bytes\n",
> @@ -248,6 +247,8 @@ void xe_ttm_stolen_mgr_init(struct xe_device *xe)
>  
>  	if (io_size)
>  		mgr->mapping = devm_ioremap_wc(&pdev->dev, mgr->io_base, io_size);
> +
> +	return 0;
>  }
>  
>  u64 xe_ttm_stolen_io_offset(struct xe_bo *bo, u32 offset)
> diff --git a/drivers/gpu/drm/xe/xe_ttm_stolen_mgr.h b/drivers/gpu/drm/xe/xe_ttm_stolen_mgr.h
> index 1777245ff8101..8e877d1e839bd 100644
> --- a/drivers/gpu/drm/xe/xe_ttm_stolen_mgr.h
> +++ b/drivers/gpu/drm/xe/xe_ttm_stolen_mgr.h
> @@ -12,7 +12,7 @@ struct ttm_resource;
>  struct xe_bo;
>  struct xe_device;
>  
> -void xe_ttm_stolen_mgr_init(struct xe_device *xe);
> +int xe_ttm_stolen_mgr_init(struct xe_device *xe);
>  int xe_ttm_stolen_io_mem_reserve(struct xe_device *xe, struct ttm_resource *mem);
>  bool xe_ttm_stolen_cpu_access_needs_ggtt(struct xe_device *xe);
>  u64 xe_ttm_stolen_io_offset(struct xe_bo *bo, u32 offset);
> -- 
> 2.48.0
>