[Intel-gfx] [PATCH] drm/i915/HUC: Load HuC on Cannonlake

[Anusha Srivatsa]

Load HuC version 6.00.2188 on Cannonlake.

Cc: Rodrigo Vivi <rodigo.vivi at intel.com>
Cc: Cheng Lyncoln <lyncoln.cheng 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 6145fa0..0d7701f 100644
--- a/drivers/gpu/drm/i915/intel_huc.c
+++ b/drivers/gpu/drm/i915/intel_huc.c
@@ -56,6 +56,10 @@
 #define GLK_HUC_FW_MINOR 00
 #define GLK_BLD_NUM 1748
 
+#define CNL_HUC_FW_MAJOR 06
+#define CNL_HUC_FW_MINOR 00
+#define CNL_BLD_NUM 2188
+
 #define HUC_FW_PATH(platform, major, minor, bld_num) \
 	"i915/" __stringify(platform) "_huc_ver" __stringify(major) "_" \
 	__stringify(minor) "_" __stringify(bld_num) ".bin"
@@ -75,6 +79,9 @@ 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)
 
+#define I915_CNL_HUC_UCODE HUC_FW_PATH(cnl, CNL_HUC_FW_MAJOR, \
+	CNL_HUC_FW_MINOR, CNL_BLD_NUM)
+
 /**
  * huc_ucode_xfer() - DMA's the firmware
  * @dev_priv: the drm_i915_private device
@@ -175,6 +182,10 @@ void intel_huc_select_fw(struct intel_huc *huc)
 		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_CANNONLAKE(dev_priv)) {
+		huc->fw.path = I915_CNL_HUC_UCODE;
+		huc->fw.major_ver_wanted = CNL_HUC_FW_MAJOR;
+		huc->fw.minor_ver_wanted = CNL_HUC_FW_MINOR;
 	} else {
 		DRM_ERROR("No HuC firmware known for platform with HuC!\n");
 		return;
-- 
2.7.4