[Intel-gfx] [PATCH] i915/HuC: Add an extra check for platforms that do not have HUC

Ander Conselvan De Oliveira conselvan2 at gmail.com
Thu Mar 2 14:14:23 UTC 2017


On Wed, 2017-03-01 at 11:58 -0800, Anusha Srivatsa wrote:
> Return silently without producing much noise on platforms
> that have a HuC but the firmware is absent.

Matches what's done for GuC.

Reviewed-by: Ander Conselvan de Oliveira <conselvan2 at gmail.com>

> Cc: Ander Conselvan De Oliveira <ander.conselvan.de.oliveira at intel.com>
> Cc: Rodrigo Vivi <rodrigo.vivi at itel.com>
> Signed-off-by: Anusha Srivatsa <anusha.srivatsa at intel.com>
> ---
>  drivers/gpu/drm/i915/intel_huc.c | 6 ++++--
>  1 file changed, 4 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/intel_huc.c b/drivers/gpu/drm/i915/intel_huc.c
> index c28543d..e660109 100644
> --- a/drivers/gpu/drm/i915/intel_huc.c
> +++ b/drivers/gpu/drm/i915/intel_huc.c
> @@ -181,12 +181,14 @@ void intel_huc_init(struct drm_i915_private *dev_priv)
>  	}
>  
>  	huc_fw->path = fw_path;
> +
> +	if (huc_fw->path == NULL)
> +		return;
> +
>  	huc_fw->fetch_status = INTEL_UC_FIRMWARE_PENDING;
>  
>  	DRM_DEBUG_DRIVER("HuC firmware pending, path %s\n", fw_path);
>  
> -	WARN(huc_fw->path == NULL, "HuC present but no fw path\n");
> -
>  	intel_uc_fw_fetch(dev_priv, huc_fw);
>  }
>  


More information about the Intel-gfx mailing list