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

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

drm/i915/guc: Define GuC firmware version for Icelake 



Define GuC firmware version for Icelake.

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: Rodrigo Vivi <rodrigo.vivi@intel.com>
Cc: Anusha Srivatsa <anusha.srivatsa@intel.com>
Reviewed-by: default avatarAnusha Srivatsa <anusha.srivatsa@intel.com>
Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Link: https://patchwork.freedesktop.org/patch/msgid/20190527183613.17076-16-michal.wajdeczko@intel.com
parent a18c3d5e

drivers/gpu/drm/i915/intel_guc_fw.c

+11 −0
Original line number Diff line number Diff line
@@ -65,6 +65,13 @@ MODULE_FIRMWARE(KBL_GUC_FIRMWARE_PATH); 
#define GLK_GUC_FIRMWARE_PATH __MAKE_GUC_FW_PATH(GLK)

MODULE_FIRMWARE(GLK_GUC_FIRMWARE_PATH);



#define ICL_GUC_FW_PREFIX icl

#define ICL_GUC_FW_MAJOR 32

#define ICL_GUC_FW_MINOR 0

#define ICL_GUC_FW_PATCH 3

#define ICL_GUC_FIRMWARE_PATH __MAKE_GUC_FW_PATH(ICL)

MODULE_FIRMWARE(ICL_GUC_FIRMWARE_PATH);



static void guc_fw_select(struct intel_uc_fw *guc_fw)

{

	struct intel_guc *guc = container_of(guc_fw, struct intel_guc, fw);
@@ -79,6 +86,10 @@ static void guc_fw_select(struct intel_uc_fw *guc_fw) 
		guc_fw->path = i915_modparams.guc_firmware_path;

		guc_fw->major_ver_wanted = 0;

		guc_fw->minor_ver_wanted = 0;

	} else if (IS_ICELAKE(i915)) {

		guc_fw->path = ICL_GUC_FIRMWARE_PATH;

		guc_fw->major_ver_wanted = ICL_GUC_FW_MAJOR;

		guc_fw->minor_ver_wanted = ICL_GUC_FW_MINOR;

	} else if (IS_GEMINILAKE(i915)) {

		guc_fw->path = GLK_GUC_FIRMWARE_PATH;

		guc_fw->major_ver_wanted = GLK_GUC_FW_MAJOR;