public inbox for intel-gfx@lists.freedesktop.org
 help / color / mirror / Atom feed
From: Peter Antoine <peter.antoine@intel.com>
To: intel-gfx@lists.freedesktop.org
Subject: [PATCH 2/2] i915/guc: Add Kabylake GuC Loading
Date: Thu,  2 Jun 2016 18:01:17 +0100	[thread overview]
Message-ID: <1464886877-3610-3-git-send-email-peter.antoine@intel.com> (raw)
In-Reply-To: <1464886877-3610-1-git-send-email-peter.antoine@intel.com>

This patch added the loading of the GuC for Kabylake.
It loads a 2.4 firmware.

Signed-off-by: Peter Antoine <peter.antoine@intel.com>
Signed-off-by: Michel Thierry <michel.thierry@intel.com>
---
 drivers/gpu/drm/i915/intel_guc_loader.c | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/drivers/gpu/drm/i915/intel_guc_loader.c b/drivers/gpu/drm/i915/intel_guc_loader.c
index f2b88c7..413af19 100644
--- a/drivers/gpu/drm/i915/intel_guc_loader.c
+++ b/drivers/gpu/drm/i915/intel_guc_loader.c
@@ -65,6 +65,9 @@ MODULE_FIRMWARE(I915_SKL_GUC_UCODE);
 #define I915_BXT_GUC_UCODE "i915/bxt_guc_ver8_7.bin"
 MODULE_FIRMWARE(I915_BXT_GUC_UCODE);
 
+#define I915_KBL_GUC_UCODE "i915/kbl_guc_ver9.bin"
+MODULE_FIRMWARE(I915_KBL_GUC_UCODE);
+
 /* User-friendly representation of an enum */
 const char *intel_guc_fw_status_repr(enum intel_guc_fw_status status)
 {
@@ -696,6 +699,10 @@ void intel_guc_init(struct drm_device *dev)
 		fw_path = I915_BXT_GUC_UCODE;
 		guc_fw->guc_fw_major_wanted = 8;
 		guc_fw->guc_fw_minor_wanted = 7;
+	} else if (IS_KABYLAKE(dev)) {
+		fw_path = I915_KBL_GUC_UCODE;
+		guc_fw->guc_fw_major_wanted = 9;
+		guc_fw->guc_fw_minor_wanted = 14;
 	} else {
 		fw_path = "";	/* unknown device */
 	}
-- 
1.9.1

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

  parent reply	other threads:[~2016-06-02 17:01 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-06-02 17:01 [PATCH 0/2] Enable GuC on KBL Peter Antoine
2016-06-02 17:01 ` [PATCH 1/2] Revert "drm/i915/kbl: drm/i915: Avoid GuC loading for now on Kabylake." Peter Antoine
2016-06-29 15:56   ` Rodrigo Vivi
2016-06-02 17:01 ` Peter Antoine [this message]
2016-06-03  8:43   ` [PATCH 2/2] i915/guc: Add Kabylake GuC Loading Michel Thierry
2016-06-03  9:14     ` Antoine, Peter
2016-06-29 15:57       ` Rodrigo Vivi
2016-06-29 16:09         ` Peter Antoine
2016-06-03  7:17 ` ✗ Ro.CI.BAT: warning for Enable GuC on KBL Patchwork
  -- strict thread matches above, loose matches on Subject: below --
2016-06-30 16:37 [PATCH 1/2] Revert "drm/i915/kbl: drm/i915: Avoid GuC loading for now on Kabylake." Rodrigo Vivi
2016-06-30 16:37 ` [PATCH 2/2] i915/guc: Add Kabylake GuC Loading Rodrigo Vivi
2016-07-01 13:06   ` Michel Thierry
2016-01-19 21:18 [PATCH 0/2] Enable GuC Loading on Kabylake Peter Antoine
2016-01-19 21:18 ` [PATCH 2/2] i915/guc: Add Kabylake GuC Loading Peter Antoine

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=1464886877-3610-3-git-send-email-peter.antoine@intel.com \
    --to=peter.antoine@intel.com \
    --cc=intel-gfx@lists.freedesktop.org \
    /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