| Message ID | 20190523233049.28020-12-michal.wajdeczko@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | GuC 32.0.3 | expand |
>-----Original Message----- >From: Wajdeczko, Michal >Sent: Thursday, May 23, 2019 4:31 PM >To: intel-gfx@lists.freedesktop.org >Cc: Wajdeczko, Michal <Michal.Wajdeczko@intel.com>; Ceraolo Spurio, Daniele ><daniele.ceraolospurio@intel.com>; Srivatsa, Anusha ><anusha.srivatsa@intel.com> >Subject: [PATCH v4 11/22] drm/i915/guc: Define GuC firmware version for >Geminilake > >Define GuC firmware version for Geminilake. Thanks for this patch Michal. Reviewed-by: Anusha Srivatsa <anusha.srivatsa@intel.com> >Signed-off-by: Michal Wajdeczko <michal.wajdeczko@intel.com> >Cc: Daniele Ceraolo Spurio <daniele.ceraolospurio@intel.com> >Cc: Anusha Srivatsa <anusha.srivatsa@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 c740bf3731de..c1e9bb4e04fd 100644 >--- a/drivers/gpu/drm/i915/intel_guc_fw.c >+++ b/drivers/gpu/drm/i915/intel_guc_fw.c >@@ -58,6 +58,13 @@ MODULE_FIRMWARE(BXT_GUC_FIRMWARE_PATH); > #define KBL_GUC_FIRMWARE_PATH __MAKE_GUC_FW_PATH(KBL) >MODULE_FIRMWARE(KBL_GUC_FIRMWARE_PATH); > >+#define GLK_GUC_FW_PREFIX glk >+#define GLK_GUC_FW_MAJOR 32 >+#define GLK_GUC_FW_MINOR 0 >+#define GLK_GUC_FW_PATCH 3 >+#define GLK_GUC_FIRMWARE_PATH __MAKE_GUC_FW_PATH(GLK) >+MODULE_FIRMWARE(GLK_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); @@ - >72,6 +79,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_GEMINILAKE(i915)) { >+ guc_fw->path = GLK_GUC_FIRMWARE_PATH; >+ guc_fw->major_ver_wanted = GLK_GUC_FW_MAJOR; >+ guc_fw->minor_ver_wanted = GLK_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
diff --git a/drivers/gpu/drm/i915/intel_guc_fw.c b/drivers/gpu/drm/i915/intel_guc_fw.c index c740bf3731de..c1e9bb4e04fd 100644 --- a/drivers/gpu/drm/i915/intel_guc_fw.c +++ b/drivers/gpu/drm/i915/intel_guc_fw.c @@ -58,6 +58,13 @@ MODULE_FIRMWARE(BXT_GUC_FIRMWARE_PATH); #define KBL_GUC_FIRMWARE_PATH __MAKE_GUC_FW_PATH(KBL) MODULE_FIRMWARE(KBL_GUC_FIRMWARE_PATH); +#define GLK_GUC_FW_PREFIX glk +#define GLK_GUC_FW_MAJOR 32 +#define GLK_GUC_FW_MINOR 0 +#define GLK_GUC_FW_PATCH 3 +#define GLK_GUC_FIRMWARE_PATH __MAKE_GUC_FW_PATH(GLK) +MODULE_FIRMWARE(GLK_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); @@ -72,6 +79,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_GEMINILAKE(i915)) { + guc_fw->path = GLK_GUC_FIRMWARE_PATH; + guc_fw->major_ver_wanted = GLK_GUC_FW_MAJOR; + guc_fw->minor_ver_wanted = GLK_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;
Define GuC firmware version for Geminilake. Signed-off-by: Michal Wajdeczko <michal.wajdeczko@intel.com> Cc: Daniele Ceraolo Spurio <daniele.ceraolospurio@intel.com> Cc: Anusha Srivatsa <anusha.srivatsa@intel.com> --- drivers/gpu/drm/i915/intel_guc_fw.c | 11 +++++++++++ 1 file changed, 11 insertions(+)