[Intel-gfx] [PATCH 2/2] drm/i915/HuC/GLK: Load HuC on GLK

[Srivatsa, Anusha]

>-----Original Message-----
>From: Spotswood, John A
>Sent: Tuesday, March 21, 2017 3:40 PM
>To: Srivatsa, Anusha <anusha.srivatsa at intel.com>; intel-
>gfx at lists.freedesktop.org
>Cc: Mcgee, Jeff <jeff.mcgee at intel.com>; Vivi, Rodrigo <rodrigo.vivi at intel.com>
>Subject: RE: [PATCH 2/2] drm/i915/HuC/GLK: Load HuC on GLK
>
>In Hunk #3 at lines 174 and 175, you are still referencing KBL_HUC_FW_MAJOR
>and KBL_HUC_FW_MINOR instead of GLK_HUC_FW_MAJOR and
>GLK_HUC_FW_MINOR.

Oops! Thanks for pointing it out. Will correct it.

Thanks,
Anusha
>John
>
>-----Original Message-----
>From: Srivatsa, Anusha
>Sent: Tuesday, March 21, 2017 2:11 PM
>To: intel-gfx at lists.freedesktop.org
>Cc: Srivatsa, Anusha <anusha.srivatsa at intel.com>; Mcgee, Jeff
><jeff.mcgee at intel.com>; Spotswood, John A <john.a.spotswood at intel.com>;
>Vivi, Rodrigo <rodrigo.vivi at intel.com>
>Subject: [PATCH 2/2] drm/i915/HuC/GLK: Load HuC on GLK
>
>Load HuC version 1.07.1748 on GLK.
>
>Cc: Jeff Mcgee <jeff.mcgee at intel.com>
>Cc: John Spotswood <john.a.spotswood at intel.com>
>Cc: Rodrigo Vivi <rodrigo.vivi at intel.com>
>Signed-off-by: Anusha Srivatsa <anusha.srivatsa at intel.com>
>---
> drivers/gpu/drm/i915/intel_huc.c | 11 +++++++++++
> 1 file changed, 11 insertions(+)
>
>diff --git a/drivers/gpu/drm/i915/intel_huc.c b/drivers/gpu/drm/i915/intel_huc.c
>index 7af900b..8dfb917 100644
>--- a/drivers/gpu/drm/i915/intel_huc.c
>+++ b/drivers/gpu/drm/i915/intel_huc.c
>@@ -52,6 +52,10 @@
> #define KBL_HUC_FW_MINOR 00
> #define KBL_BLD_NUM 1810
>
>+#define GLK_HUC_FW_MAJOR 01
>+#define GLK_HUC_FW_MINOR 07
>+#define GLK_BLD_NUM 1748
>+
> #define HUC_FW_PATH(platform, major, minor, bld_num) \
> 	"i915/" __stringify(platform) "_huc_ver" __stringify(major) "_" \
> 	__stringify(minor) "_" __stringify(bld_num) ".bin"
>@@ -68,6 +72,9 @@ 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)
>+
> /**
>  * huc_ucode_xfer() - DMA's the firmware
>  * @dev_priv: the drm_i915_private device @@ -169,6 +176,10 @@ void
>intel_huc_select_fw(struct intel_huc *huc)
> 		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 = KBL_HUC_FW_MAJOR;
>+		huc->fw.minor_ver_wanted = KBL_HUC_FW_MINOR;
> 	} else {
> 		DRM_ERROR("No HuC firmware known for platform with
>HuC!\n");
> 		return;
>--
>2.7.4