[Intel-gfx] [PATCH v2 20/22] drm/i915/guc: Define GuC firmware version for Icelake

[Srivatsa, Anusha]

>-----Original Message-----
>From: Wajdeczko, Michal
>Sent: Thursday, April 11, 2019 1:45 AM
>To: intel-gfx at lists.freedesktop.org
>Cc: Wajdeczko, Michal <Michal.Wajdeczko at intel.com>; Ceraolo Spurio, Daniele
><daniele.ceraolospurio at intel.com>; Joonas Lahtinen
><joonas.lahtinen at linux.intel.com>; Vivi, Rodrigo <rodrigo.vivi at intel.com>;
>Srivatsa, Anusha <anusha.srivatsa at intel.com>
>Subject: [PATCH v2 20/22] drm/i915/guc: Define GuC firmware version for Icelake
>
>Define GuC firmware version for Icelake.
>
>Signed-off-by: Michal Wajdeczko <michal.wajdeczko at intel.com>
>Cc: Daniele Ceraolo Spurio <daniele.ceraolospurio at intel.com>
>Cc: Joonas Lahtinen <joonas.lahtinen at linux.intel.com>
>Cc: Rodrigo Vivi <rodrigo.vivi at intel.com>
>Cc: Anusha Srivatsa <anusha.srivatsa at intel.com>
Looks good. 
Reviewed-by: Anusha Srivatsa <anusha.srivatsa at intel.com>

>---
> drivers/gpu/drm/i915/intel_guc_fw.c | 11 +++++++++++
> 1 file changed, 11 insertions(+)
>
>diff --git a/drivers/gpu/drm/i915/intel_guc_fw.c
>b/drivers/gpu/drm/i915/intel_guc_fw.c
>index c937a648c2a1..c88a089885a0 100644
>--- a/drivers/gpu/drm/i915/intel_guc_fw.c
>+++ b/drivers/gpu/drm/i915/intel_guc_fw.c
>@@ -55,9 +55,16 @@
> #define KBL_GUC_FW_PATCH 3
> #define KBL_GUC_FIRMWARE_PATH __MAKE_GUC_FW_PATH(KBL)
>
>+#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(SKL_GUC_FIRMWARE_PATH);
> MODULE_FIRMWARE(BXT_GUC_FIRMWARE_PATH);
> MODULE_FIRMWARE(KBL_GUC_FIRMWARE_PATH);
>+MODULE_FIRMWARE(ICL_GUC_FIRMWARE_PATH);
>
> static void guc_fw_select(struct intel_uc_fw *guc_fw)  { @@ -73,6 +80,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_KABYLAKE(i915) || IS_COFFEELAKE(i915)) {
> 		guc_fw->path = KBL_GUC_FIRMWARE_PATH;
> 		guc_fw->major_ver_wanted = KBL_GUC_FW_MAJOR;
>--
>2.19.2