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

[Srivatsa, Anusha]

>-----Original Message-----
>From: Wajdeczko, Michal
>Sent: Thursday, May 23, 2019 4:31 PM
>To: intel-gfx at lists.freedesktop.org
>Cc: Wajdeczko, Michal <Michal.Wajdeczko at intel.com>; Ceraolo Spurio, Daniele
><daniele.ceraolospurio at intel.com>; Joonas Lahtinen
><joonas.lahtinen at linux.intel.com>; Srivatsa, Anusha
><anusha.srivatsa at intel.com>; Ye, Tony <tony.ye at intel.com>
>Subject: [PATCH v4 12/22] drm/i915/huc: Define HuC firmware version for
>Geminilake
>
>Define HuC firmware version for Geminilake.
>
Reviewed-by: Anusha Srivatsa <anusha.srivatsa at intel.com>

>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 44c559526072..8bac6a051c18 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 GLK_HUC_FW_MAJOR 03
>+#define GLK_HUC_FW_MINOR 01
>+#define GLK_BLD_NUM 2893
>+
> #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_GLK_HUC_UCODE HUC_FW_PATH(glk, GLK_HUC_FW_MAJOR, \
>+	GLK_HUC_FW_MINOR, GLK_BLD_NUM)
>+MODULE_FIRMWARE(I915_GLK_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_GEMINILAKE(dev_priv)) {
>+		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;
> 	}
> }
>
>--
>2.19.2