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

Commit c9e0c8d9 authored by Michal Wajdeczko's avatar Michal Wajdeczko Committed by Chris Wilson
Browse files

drm/i915/huc: Define HuC firmware version for Icelake 



Define HuC firmware version for Icelake.

v2: 8.4.3238 is now available

Signed-off-by: default avatarMichal Wajdeczko <michal.wajdeczko@intel.com>
Cc: Daniele Ceraolo Spurio <daniele.ceraolospurio@intel.com>
Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Cc: Anusha Srivatsa <anusha.srivatsa@intel.com>
Cc: Tony Ye <tony.ye@intel.com>
Reviewed-by: default avatarTony Ye <tony.ye@intel.com>
Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Link: https://patchwork.freedesktop.org/patch/msgid/20190527183613.17076-17-michal.wajdeczko@intel.com
parent f4cc8999

drivers/gpu/drm/i915/intel_huc_fw.c

+12 −0
Original line number Diff line number Diff line
@@ -38,6 +38,10 @@ 
#define GLK_HUC_FW_MINOR 01

#define GLK_BLD_NUM 2893



#define ICL_HUC_FW_MAJOR 8

#define ICL_HUC_FW_MINOR 4

#define ICL_BLD_NUM 3238



#define HUC_FW_PATH(platform, major, minor, bld_num) \

	"i915/" __stringify(platform) "_huc_ver" __stringify(major) "_" \

	__stringify(minor) "_" __stringify(bld_num) ".bin"
@@ -58,6 +62,10 @@ MODULE_FIRMWARE(I915_KBL_HUC_UCODE); 
	GLK_HUC_FW_MINOR, GLK_BLD_NUM)

MODULE_FIRMWARE(I915_GLK_HUC_UCODE);



#define I915_ICL_HUC_UCODE HUC_FW_PATH(icl, ICL_HUC_FW_MAJOR, \

	ICL_HUC_FW_MINOR, ICL_BLD_NUM)

MODULE_FIRMWARE(I915_ICL_HUC_UCODE);



static void huc_fw_select(struct intel_uc_fw *huc_fw)

{

	struct intel_huc *huc = container_of(huc_fw, struct intel_huc, fw);
@@ -88,6 +96,10 @@ static void huc_fw_select(struct intel_uc_fw *huc_fw) 
		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_ICELAKE(dev_priv)) {

		huc_fw->path = I915_ICL_HUC_UCODE;

		huc_fw->major_ver_wanted = ICL_HUC_FW_MAJOR;

		huc_fw->minor_ver_wanted = ICL_HUC_FW_MINOR;

	}

}