Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f2ec71d5 authored by Anusha Srivatsa's avatar Anusha Srivatsa Committed by Jani Nikula
Browse files

drm/i915/HuC: Add KBL huC loading Support 



This patch adds the support to load HuC on KBL
Version 2.0

v2: rebased on top of drm-tip. Rename KBL_FW_ to KBL_HUC_FW_
v3: rebased. Remove old checks.

Cc: Michal Wajdeczko <michal.wajdeczko@intel.com>
Cc: Tvrtko Ursulin <tvrtko.ursulin@linux.intel.com>
Signed-off-by: default avatarAnusha Srivatsa <anusha.srivatsa@intel.com>
Reviewed-by: default avatarArkadiusz Hiler <arkadiusz.hiler@intel.com>
Reviewed-by: default avatarMichal Wajdeczko <michal.wajdeczko@intel.com>
Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1484755558-1234-3-git-send-email-anusha.srivatsa@intel.com
parent cd690985

drivers/gpu/drm/i915/intel_huc.c

+13 −0
Original line number Diff line number Diff line
@@ -48,6 +48,10 @@ 
#define SKL_HUC_FW_MINOR 07

#define SKL_BLD_NUM 1398



#define KBL_HUC_FW_MAJOR 02

#define KBL_HUC_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"
@@ -59,6 +63,11 @@ MODULE_FIRMWARE(I915_SKL_HUC_UCODE); 
#define I915_BXT_HUC_UCODE HUC_FW_PATH(bxt, BXT_HUC_FW_MAJOR, \

	BXT_HUC_FW_MINOR, BXT_BLD_NUM)

MODULE_FIRMWARE(I915_BXT_HUC_UCODE);



#define I915_KBL_HUC_UCODE HUC_FW_PATH(kbl, KBL_HUC_FW_MAJOR, \

	KBL_HUC_FW_MINOR, KBL_BLD_NUM)

MODULE_FIRMWARE(I915_KBL_HUC_UCODE);



/**

 * huc_ucode_xfer() - DMA's the firmware

 * @dev_priv: the drm_i915_private device
@@ -165,6 +174,10 @@ void intel_huc_init(struct drm_i915_private *dev_priv) 
		fw_path = I915_BXT_HUC_UCODE;

		huc_fw->major_ver_wanted = BXT_HUC_FW_MAJOR;

		huc_fw->minor_ver_wanted = BXT_HUC_FW_MINOR;

	} else if (IS_KABYLAKE(dev_priv)) {

		fw_path = I915_KBL_HUC_UCODE;

		huc_fw->major_ver_wanted = KBL_HUC_FW_MAJOR;

		huc_fw->minor_ver_wanted = KBL_HUC_FW_MINOR;

	}



	huc_fw->path = fw_path;