Skip to contentSkip to conversation

Enable GuC Loading on Kabylake

PATCH New Peter Antoine 2 participants 4 messages Jan 19, 2016 – Jan 20, 2016

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

v2 cover Enable GuC Loading on Kabylake

This patchset reverts the disabling of the GuC loading for Kabylake and then adds then specifically enables Kabylake GuC loading and specifies the Kabylake firmware filename.

v2: Change order of the patchset. (D.Vetter)

Peter Antoine (2):
i915/guc: Add Kabylake GuC Loading
Revert "FROM_UPSTREAM [VPG]: drm/i915/kbl: drm/i915: Avoid GuC loading
for now on Kabylake."

 drivers/gpu/drm/i915/i915_drv.h         | 4 ++--
 drivers/gpu/drm/i915/intel_guc_loader.c | 6 ++++++
 2 files changed, 8 insertions(+), 2 deletions(-)
Signature · 6 lines
1.9.1

_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
#1 lore raw

PATCH v2 1/2 i915/guc: Add Kabylake GuC Loading

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

---
 drivers/gpu/drm/i915/intel_guc_loader.c | 6 ++++++
 1 file changed, 6 insertions(+)
drivers/gpu/drm/i915/intel_guc_loader.c +6 -0
index 3accd91..bbfa8f3 100644
@@ -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 */
Signature · 6 lines
1.9.1

_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
#2 lore raw

PATCH v2 2/2 Revert "FROM_UPSTREAM [VPG]: drm/i915/kbl: drm/i915: Avoid GuC loading for now on Kabylake."

In reply to Peter Antoine

Enabling Kabylake GuC loading as fw now available.

This reverts commit a92d3f32eafc57cca55e654ecfd916f283100365.

---
 drivers/gpu/drm/i915/i915_drv.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/i915/i915_drv.h +2 -2
index af30148..f99a988 100644
@@ -2635,8 +2635,8 @@ struct drm_i915_cmd_table {
 
 #define HAS_CSR(dev)	(IS_GEN9(dev))
 
-#define HAS_GUC_UCODE(dev)	(IS_GEN9(dev) && !IS_KABYLAKE(dev))
-#define HAS_GUC_SCHED(dev)	(IS_GEN9(dev) && !IS_KABYLAKE(dev))
+#define HAS_GUC_UCODE(dev)	(IS_GEN9(dev))
+#define HAS_GUC_SCHED(dev)	(IS_GEN9(dev))
 
 #define HAS_RESOURCE_STREAMER(dev) (IS_HASWELL(dev) || \
 				    INTEL_INFO(dev)->gen >= 8)
Signature · 6 lines
1.9.1

_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
#3 lore raw

✗ Fi.CI.BAT: failure for Enable GuC Loading on Kabylake (rev2)

In reply to Peter Antoine
== Summary ==

== Summary ==

Built on c783b5011894af49992f2095cb2848b6cf8ebc57 drm-intel-nightly: 2016y-01m-20d-10h-12m-03s UTC integration manifest

Test gem_sync:

        Subgroup basic-render:
                pass       -> DMESG-FAIL (bdw-nuci7)
Test kms_flip:
        Subgroup basic-flip-vs-modeset:
                pass       -> DMESG-WARN (skl-i5k-2)
                pass       -> DMESG-WARN (ilk-hp8440p)
Test kms_force_connector_basic:
        Subgroup force-connector-state:
                skip       -> PASS       (snb-dellxps)
bdw-nuci7        total:143  pass:133  dwarn:0   dfail:1   fail:0   skip:9  
bsw-nuc-2        total:143  pass:117  dwarn:2   dfail:0   fail:0   skip:24 
byt-nuc          total:143  pass:125  dwarn:3   dfail:0   fail:0   skip:15 
hsw-brixbox      total:143  pass:136  dwarn:0   dfail:0   fail:0   skip:7  
ilk-hp8440p      total:143  pass:102  dwarn:3   dfail:0   fail:0   skip:38 
ivb-t430s        total:143  pass:137  dwarn:0   dfail:0   fail:0   skip:6  
skl-i5k-2        total:143  pass:133  dwarn:2   dfail:0   fail:0   skip:8  
skl-i7k-2        total:143  pass:134  dwarn:1   dfail:0   fail:0   skip:8  
snb-dellxps      total:143  pass:129  dwarn:0   dfail:0   fail:0   skip:14 
snb-x220t        total:143  pass:129  dwarn:0   dfail:0   fail:1   skip:13 

HANGED hsw-gt2 in igt@kms_flip@basic-flip-vs-dpms

Results at /archive/results/CI_IGT_test/Patchwork_1229/

_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx