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

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>
Reviewed-by: Anusha Srivatsa <anusha.srivatsa@intel.com>
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: https://patchwork.freedesktop.org/patch/msgid/20190527183613.17076-7-michal.wajdeczko@intel.com

diff --git a/drivers/gpu/drm/i915/intel_guc_fw.c b/drivers/gpu/drm/i915/intel_guc_fw.c
index c740bf3731de326383e359faaa3594a55133d4f6..c1e9bb4e04fd28fd162fa11c4eb647cff0c5513d 100644 (file)
--- 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;