From: Peter Antoine <peter.antoine@intel.com>
To: intel-gfx@lists.freedesktop.org
Cc: daniel.vetter@ffwll.ch, dave.gordon@intel.com
Subject: [PATCH 2/2] i915/guc: Add Kabylake GuC Loading
Date: Tue, 19 Jan 2016 21:18:51 +0000 [thread overview]
Message-ID: <1453238331-35864-3-git-send-email-peter.antoine@intel.com> (raw)
In-Reply-To: <1453238331-35864-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 | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/drivers/gpu/drm/i915/intel_guc_loader.c b/drivers/gpu/drm/i915/intel_guc_loader.c
index 3accd91..bbfa8f3 100644
--- a/drivers/gpu/drm/i915/intel_guc_loader.c
+++ b/drivers/gpu/drm/i915/intel_guc_loader.c
@@ -61,6 +61,8 @@
#define I915_SKL_GUC_UCODE "i915/skl_guc_ver4.bin"
MODULE_FIRMWARE(I915_SKL_GUC_UCODE);
+#define I915_KBL_GUC_UCODE "i915/kbl_guc_ver2.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)
@@ -597,6 +599,10 @@ void intel_guc_ucode_init(struct drm_device *dev)
fw_path = I915_SKL_GUC_UCODE;
guc_fw->guc_fw_major_wanted = 4;
guc_fw->guc_fw_minor_wanted = 3;
+ } else if (IS_KABYLAKE(dev)) {
+ fw_path = I915_KBL_GUC_UCODE;
+ guc_fw->guc_fw_major_wanted = 2;
+ guc_fw->guc_fw_minor_wanted = 4;
} else {
i915.enable_guc_submission = false;
fw_path = ""; /* unknown device */
--
1.9.1
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
next prev parent reply other threads:[~2016-01-19 21:19 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-01-19 21:18 [PATCH 0/2] Enable GuC Loading on Kabylake Peter Antoine
2016-01-19 21:18 ` [PATCH 1/2] Revert "FROM_UPSTREAM [VPG]: drm/i915/kbl: drm/i915: Avoid GuC loading for now on Kabylake." Peter Antoine
2016-01-19 21:25 ` Daniel Vetter
2016-01-19 22:38 ` Yu Dai
2016-01-19 21:18 ` Peter Antoine [this message]
-- strict thread matches above, loose matches on Subject: below --
2016-06-02 17:01 [PATCH 0/2] Enable GuC on KBL Peter Antoine
2016-06-02 17:01 ` [PATCH 2/2] i915/guc: Add Kabylake GuC Loading Peter Antoine
2016-06-03 8:43 ` 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-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
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=1453238331-35864-3-git-send-email-peter.antoine@intel.com \
--to=peter.antoine@intel.com \
--cc=daniel.vetter@ffwll.ch \
--cc=dave.gordon@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