Reviewed-by: Jeff McGee <jeff.mc...@intel.com>
On Thu, Nov 10, 2016 at 04:15:18PM -0800, Anusha Srivatsa wrote:
> This patch adds the support to load HuC on KBL
> Version 2.0
>
> Cc: Jeff Mcgee <jeff.mc...@intel.com>
> Signed-off-by: Anusha Srivatsa <anusha.sriva...@intel.com>
> ---
> drivers/gpu/drm/i915/intel_huc_loader.c | 15 ++++++++++++++-
> 1 file changed, 14 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/i915/intel_huc_loader.c
> b/drivers/gpu/drm/i915/intel_huc_loader.c
> index 5a7ce65..dab64ba 100644
> --- a/drivers/gpu/drm/i915/intel_huc_loader.c
> +++ b/drivers/gpu/drm/i915/intel_huc_loader.c
> @@ -49,6 +49,10 @@
> #define BXT_FW_MINOR 07
> #define BXT_BLD_NUM 1398
>
> +#define KBL_FW_MAJOR 02
> +#define KBL_FW_MINOR 00
> +#define KBL_BLD_NUM 1810
> +
> #define HUC_FW_PATH(platform, major, minor, bld_num) \
> "i915/" __stringify(platform) "_huc_ver" __stringify(major) "_" \
> __stringify(minor) "_" __stringify(bld_num) ".bin"
> @@ -60,6 +64,11 @@ MODULE_FIRMWARE(I915_SKL_HUC_UCODE);
> #define I915_BXT_HUC_UCODE HUC_FW_PATH(bxt, BXT_FW_MAJOR, \
> BXT_FW_MINOR, BXT_BLD_NUM)
> MODULE_FIRMWARE(I915_BXT_HUC_UCODE);
> +
> +#define I915_KBL_HUC_UCODE HUC_FW_PATH(kbl, KBL_FW_MAJOR, \
> + KBL_FW_MINOR, KBL_BLD_NUM)
> +MODULE_FIRMWARE(I915_KBL_HUC_UCODE);
> +
> /**
> * huc_ucode_xfer() - DMA's the firmware
> * @dev_priv: the drm device
> @@ -171,8 +180,12 @@ void intel_huc_init(struct drm_device *dev)
> fw_path = I915_BXT_HUC_UCODE;
> huc_fw->major_ver_wanted = BXT_FW_MAJOR;
> huc_fw->minor_ver_wanted = BXT_FW_MINOR;
> + } else if (IS_KABYLAKE(dev_priv)) {
> + fw_path = I915_KBL_HUC_UCODE;
> + huc_fw->major_ver_wanted = KBL_FW_MAJOR;
> + huc_fw->minor_ver_wanted = KBL_FW_MINOR;
> }
> -
> +
> if (fw_path == NULL)
> return;
>
> --
> 2.7.4
>
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
