[Intel-gfx] [PATCH v2 21/22] drm/i915/huc: Define HuC firmware version for Icelake

[Ye, Tony]

On 4/11/2019 4:44 PM, Michal Wajdeczko wrote:
> This patch adds the support to load HuC on ICL.
>
> Signed-off-by: Michal Wajdeczko <michal.wajdeczko at intel.com>
> Cc: Daniele Ceraolo Spurio <daniele.ceraolospurio at intel.com>
> Cc: Joonas Lahtinen <joonas.lahtinen at linux.intel.com>
> Cc: Anusha Srivatsa <anusha.srivatsa at intel.com>
> Cc: Tony Ye <tony.ye at intel.com>
> ---
>   drivers/gpu/drm/i915/intel_huc_fw.c | 12 ++++++++++++
>   1 file changed, 12 insertions(+)
>
> diff --git a/drivers/gpu/drm/i915/intel_huc_fw.c b/drivers/gpu/drm/i915/intel_huc_fw.c
> index 68d47c105939..b8e160dc4621 100644
> --- a/drivers/gpu/drm/i915/intel_huc_fw.c
> +++ b/drivers/gpu/drm/i915/intel_huc_fw.c
> @@ -34,6 +34,10 @@
>   #define KBL_HUC_FW_MINOR 00
>   #define KBL_BLD_NUM 1810
>   
> +#define ICL_HUC_FW_MAJOR 8
> +#define ICL_HUC_FW_MINOR 4
> +#define ICL_BLD_NUM 3132

There is a new build of ICL HuC FW, icl_huc_ver8_4_3238.bin. Can we 
update with that build?

Regards,

Tony

> +
>   #define HUC_FW_PATH(platform, major, minor, bld_num) \
>   	"i915/" __stringify(platform) "_huc_ver" __stringify(major) "_" \
>   	__stringify(minor) "_" __stringify(bld_num) ".bin"
> @@ -50,6 +54,10 @@ MODULE_FIRMWARE(I915_BXT_HUC_UCODE);
>   	KBL_HUC_FW_MINOR, KBL_BLD_NUM)
>   MODULE_FIRMWARE(I915_KBL_HUC_UCODE);
>   
> +#define I915_ICL_HUC_UCODE HUC_FW_PATH(icl, ICL_HUC_FW_MAJOR, \
> +	ICL_HUC_FW_MINOR, ICL_BLD_NUM)
> +MODULE_FIRMWARE(I915_ICL_HUC_UCODE);
> +
>   static void huc_fw_select(struct intel_uc_fw *huc_fw)
>   {
>   	struct intel_huc *huc = container_of(huc_fw, struct intel_huc, fw);
> @@ -76,6 +84,10 @@ static void huc_fw_select(struct intel_uc_fw *huc_fw)
>   		huc_fw->path = I915_KBL_HUC_UCODE;
>   		huc_fw->major_ver_wanted = KBL_HUC_FW_MAJOR;
>   		huc_fw->minor_ver_wanted = KBL_HUC_FW_MINOR;
> +	} else if (IS_ICELAKE(dev_priv)) {
> +		huc_fw->path = I915_ICL_HUC_UCODE;
> +		huc_fw->major_ver_wanted = ICL_HUC_FW_MAJOR;
> +		huc_fw->minor_ver_wanted = ICL_HUC_FW_MINOR;
>   	}
>   }
>