Commit db5ba0d8 authored by Anusha Srivatsa's avatar Anusha Srivatsa Committed by Ander Conselvan de Oliveira

drm/i915/GLK/HuC: Load HuC on GLK

Load HuC version 1.07.1748 on GLK.

v2: rebased.
v3: Use name of the right platform(John Spotswood)
v4: rebased.

Cc: Jeff Mcgee <jeff.mcgee@intel.com>
Cc: John Spotswood <john.a.spotswood@intel.com>
Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
Signed-off-by: default avatarAnusha Srivatsa <anusha.srivatsa@intel.com>
Reviewed-by: default avatarJohn Spotswood <john.a.spotswood@intel.com>
Signed-off-by: default avatarAnder Conselvan de Oliveira <ander.conselvan.de.oliveira@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1490905447-15815-2-git-send-email-anusha.srivatsa@intel.com
parent 90f192c8
...@@ -52,6 +52,10 @@ ...@@ -52,6 +52,10 @@
#define KBL_HUC_FW_MINOR 00 #define KBL_HUC_FW_MINOR 00
#define KBL_BLD_NUM 1810 #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) \ #define HUC_FW_PATH(platform, major, minor, bld_num) \
"i915/" __stringify(platform) "_huc_ver" __stringify(major) "_" \ "i915/" __stringify(platform) "_huc_ver" __stringify(major) "_" \
__stringify(minor) "_" __stringify(bld_num) ".bin" __stringify(minor) "_" __stringify(bld_num) ".bin"
...@@ -68,6 +72,9 @@ MODULE_FIRMWARE(I915_BXT_HUC_UCODE); ...@@ -68,6 +72,9 @@ MODULE_FIRMWARE(I915_BXT_HUC_UCODE);
KBL_HUC_FW_MINOR, KBL_BLD_NUM) KBL_HUC_FW_MINOR, KBL_BLD_NUM)
MODULE_FIRMWARE(I915_KBL_HUC_UCODE); 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 * huc_ucode_xfer() - DMA's the firmware
* @dev_priv: the drm_i915_private device * @dev_priv: the drm_i915_private device
...@@ -169,6 +176,10 @@ void intel_huc_select_fw(struct intel_huc *huc) ...@@ -169,6 +176,10 @@ void intel_huc_select_fw(struct intel_huc *huc)
huc->fw.path = I915_KBL_HUC_UCODE; huc->fw.path = I915_KBL_HUC_UCODE;
huc->fw.major_ver_wanted = KBL_HUC_FW_MAJOR; huc->fw.major_ver_wanted = KBL_HUC_FW_MAJOR;
huc->fw.minor_ver_wanted = KBL_HUC_FW_MINOR; 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;
} else { } else {
DRM_ERROR("No HuC firmware known for platform with HuC!\n"); DRM_ERROR("No HuC firmware known for platform with HuC!\n");
return; return;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment