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

[Ye, Tony]

Reviewed-by: Tony Ye <tony.ye at intel.com>

> 在 2019年5月24日，上午7:32，Wajdeczko, Michal <Michal.Wajdeczko at intel.com> 写道：
> 
> Define HuC firmware version for Icelake.
> 
> 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>
> 
> v2: 8.4.3238 is now available
> ---
> 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 8bac6a051c18..05cbf8338f53 100644
> --- a/drivers/gpu/drm/i915/intel_huc_fw.c
> +++ b/drivers/gpu/drm/i915/intel_huc_fw.c
> @@ -38,6 +38,10 @@
> #define GLK_HUC_FW_MINOR 01
> #define GLK_BLD_NUM 2893
> 
> +#define ICL_HUC_FW_MAJOR 8
> +#define ICL_HUC_FW_MINOR 4
> +#define ICL_BLD_NUM 3238
> +
> #define HUC_FW_PATH(platform, major, minor, bld_num) \
>    "i915/" __stringify(platform) "_huc_ver" __stringify(major) "_" \
>    __stringify(minor) "_" __stringify(bld_num) ".bin"
> @@ -58,6 +62,10 @@ MODULE_FIRMWARE(I915_KBL_HUC_UCODE);
>    GLK_HUC_FW_MINOR, GLK_BLD_NUM)
> MODULE_FIRMWARE(I915_GLK_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);
> @@ -88,6 +96,10 @@ static void huc_fw_select(struct intel_uc_fw *huc_fw)
>        huc_fw->path = I915_GLK_HUC_UCODE;
>        huc_fw->major_ver_wanted = GLK_HUC_FW_MAJOR;
>        huc_fw->minor_ver_wanted = GLK_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;
>    }
> }
> 
> -- 
> 2.19.2
>