Intel-GFX Archive on lore.kernel.org
 help / color / mirror / Atom feed
From: Anusha <anusha.srivatsa@intel.com>
To: intel-gfx@lists.freedesktop.org
Cc: Tomi Sarvela <tomi.p.sarvela@intel.com>
Subject: [PATCH 5/6] firmware/guc/glk: Load GuC v11.98 for Geminilake.
Date: Thu, 29 Nov 2018 16:43:17 -0800	[thread overview]
Message-ID: <20181130004318.16371-6-anusha.srivatsa@intel.com> (raw)
In-Reply-To: <20181130004318.16371-1-anusha.srivatsa@intel.com>

From: John Spotswood <john.a.spotswood@intel.com>

load the v11.98 guC on geminilake.

v2: rebased.

v3: Change subject prefix. (Anusha)

Cc: Tomi Sarvela <tomi.p.sarvela@intel.com>
Cc: Jani Saarinen <jani.saarinen@intel.com>
Signed-off-by: Anusha Srivatsa <anusha.srivatsa@intel.com>
Signed-off-by: John Spotswood <john.a.spotswood@intel.com>
---
 drivers/gpu/drm/i915/intel_guc_fw.c | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/drivers/gpu/drm/i915/intel_guc_fw.c b/drivers/gpu/drm/i915/intel_guc_fw.c
index a67144ee5ceb..55900937882a 100644
--- a/drivers/gpu/drm/i915/intel_guc_fw.c
+++ b/drivers/gpu/drm/i915/intel_guc_fw.c
@@ -39,6 +39,9 @@
 #define KBL_FW_MAJOR 9
 #define KBL_FW_MINOR 39
 
+#define GLK_FW_MAJOR 11
+#define GLK_FW_MINOR 98
+
 #define GUC_FW_PATH(platform, major, minor) \
        "i915/" __stringify(platform) "_guc_ver" __stringify(major) "_" __stringify(minor) ".bin"
 
@@ -51,6 +54,9 @@ MODULE_FIRMWARE(I915_BXT_GUC_UCODE);
 #define I915_KBL_GUC_UCODE GUC_FW_PATH(kbl, KBL_FW_MAJOR, KBL_FW_MINOR)
 MODULE_FIRMWARE(I915_KBL_GUC_UCODE);
 
+#define I915_GLK_GUC_UCODE GUC_FW_PATH(glk, GLK_FW_MAJOR, GLK_FW_MINOR)
+MODULE_FIRMWARE(I915_GLK_GUC_UCODE);
+
 static void guc_fw_select(struct intel_uc_fw *guc_fw)
 {
 	struct intel_guc *guc = container_of(guc_fw, struct intel_guc, fw);
@@ -77,6 +83,10 @@ static void guc_fw_select(struct intel_uc_fw *guc_fw)
 		guc_fw->path = I915_KBL_GUC_UCODE;
 		guc_fw->major_ver_wanted = KBL_FW_MAJOR;
 		guc_fw->minor_ver_wanted = KBL_FW_MINOR;
+	} else if (IS_GEMINILAKE(dev_priv)) {
+		guc_fw->path = I915_GLK_GUC_UCODE;
+		guc_fw->major_ver_wanted = GLK_FW_MAJOR;
+		guc_fw->minor_ver_wanted = GLK_FW_MINOR;
 	} else {
 		dev_info(dev_priv->drm.dev,
 			 "%s: No firmware known for this platform!\n",
-- 
2.19.1

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

  parent reply	other threads:[~2018-11-30  0:50 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-11-30  0:43 [PATCH 0/6] HuC Updates [BXT,SKL,KBL,GLK] GuC [GLK] Anusha
2018-11-30  0:43 ` [PATCH 1/6] firmware/huc/BXT: Update the HuC version Anusha
2018-11-30  0:43 ` [PATCH 2/6] firmware/huc/SKL: Update HuC versiom for SKL Anusha
2018-11-30  0:43 ` [PATCH 3/6] firmware/huc/KBL: Update HuC for KBL Anusha
2018-11-30  0:43 ` [PATCH 4/6] firmware/huc/GLK: Load HuC for GLK Anusha
2018-11-30  0:43 ` Anusha [this message]
2018-11-30  0:43 ` [PATCH 6/6] HAX enable HuC for CI Anusha
2018-11-30  1:02 ` ✗ Fi.CI.CHECKPATCH: warning for HuC Updates [BXT,SKL,KBL,GLK] GuC [GLK] (rev3) Patchwork
2018-11-30  1:25 ` ✗ Fi.CI.BAT: failure " Patchwork
  -- strict thread matches above, loose matches on Subject: below --
2018-11-28 21:34 [PATCH 0/6] HuC Updates [BXT,SKL,KBL,GLK] GuC [GLK] Anusha
2018-11-28 21:34 ` [PATCH 5/6] firmware/guc/glk: Load GuC v11.98 for Geminilake Anusha

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20181130004318.16371-6-anusha.srivatsa@intel.com \
    --to=anusha.srivatsa@intel.com \
    --cc=intel-gfx@lists.freedesktop.org \
    --cc=tomi.p.sarvela@intel.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox