[PATCH 2/2] drm/xe: Avoid crypt message when there's no GuC definition

[Francois Dugast]

On Thu, Feb 01, 2024 at 02:47:24PM -0800, Lucas De Marchi wrote:
> If there's no GuC firmware entry in the table and the user didn't pass
> an override path, the error message is very crypt: xe will simply try to

Here ^ and in the title, isn't it s/crypt/cryptic/?

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

Francois

> continue and then fail when submitting the default context:
> 
> 	xe 0000:00:02.0: [drm:xe_pci_probe [xe]] XE_LUNARLAKE  64b0:0001 dgfx:0 gfx:Xe2_LPG (20.04) media:Xe2_LPM (20.00) display:no dma_m_s:46 tc:1 gscfi:0
> 	...
> 	xe: probe of 0000:00:02.0 failed with error -22
> 
> Add an explicit error message and bail out:
> 
> 	xe 0000:00:02.0: [drm:xe_pci_probe [xe]] XE_LUNARLAKE  64b0:0001 dgfx:0 gfx:Xe2_LPG (20.04) media:Xe2_LPM (20.00) display:no dma_m_s:46 tc:1 gscfi:0
> 	xe 0000:00:02.0: [drm] *ERROR* No GuC firmware defined for platform
> 	xe 0000:00:02.0: [drm] *ERROR* GuC init failed with -2
> 	...
> 	xe: probe of 0000:00:02.0 failed with error -2
> 
> Signed-off-by: Lucas De Marchi <lucas.demarchi at intel.com>
> ---
>  drivers/gpu/drm/xe/xe_uc_fw.c | 7 ++++++-
>  1 file changed, 6 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/gpu/drm/xe/xe_uc_fw.c b/drivers/gpu/drm/xe/xe_uc_fw.c
> index c7541f1a5c0b..742170bc1a9d 100644
> --- a/drivers/gpu/drm/xe/xe_uc_fw.c
> +++ b/drivers/gpu/drm/xe/xe_uc_fw.c
> @@ -665,8 +665,13 @@ static int uc_fw_request(struct xe_uc_fw *uc_fw, const struct firmware **firmwar
>  			       XE_UC_FIRMWARE_SELECTED :
>  			       XE_UC_FIRMWARE_NOT_SUPPORTED);
>  
> -	if (!xe_uc_fw_is_supported(uc_fw))
> +	if (!xe_uc_fw_is_supported(uc_fw)) {
> +		if (uc_fw->type == XE_UC_FW_TYPE_GUC) {
> +			drm_err(&xe->drm, "No GuC firmware defined for platform\n");
> +			return -ENOENT;
> +		}
>  		return 0;
> +	}
>  
>  	/* an empty path means the firmware is disabled */
>  	if (!xe_device_uc_enabled(xe) || !(*uc_fw->path)) {
> -- 
> 2.43.0
>