Skip to contentSkip to conversation

i915/guc: Add Kabylake GuC Loading

PATCH Superseded Peter Antoine 3 participants 5 messages Jan 18, 2016 – Jan 19, 2016

Subsystems (2)

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 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
#1 lore raw

✓ Fi.CI.BAT: success for i915/guc: Add Kabylake GuC Loading

== Summary ==

== Summary ==

Built on 98ee62c2326e0b6881eb0f427895aab745febf6f drm-intel-nightly: 2016y-01m-18d-14h-18m-27s UTC integration manifest

Test gem_storedw_loop:

        Subgroup basic-render:
                pass       -> DMESG-WARN (skl-i5k-2) UNSTABLE
                dmesg-warn -> PASS       (bdw-ultra) UNSTABLE
                pass       -> DMESG-WARN (skl-i7k-2) UNSTABLE
Test kms_pipe_crc_basic:
        Subgroup suspend-read-crc-pipe-a:
                dmesg-warn -> PASS       (snb-x220t)
bdw-nuci7        total:140  pass:131  dwarn:0   dfail:0   fail:0   skip:9  
bdw-ultra        total:140  pass:133  dwarn:0   dfail:1   fail:0   skip:6  
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  
hsw-gt2          total:143  pass:139  dwarn:0   dfail:0   fail:0   skip:4  
ilk-hp8440p      total:143  pass:102  dwarn:3   dfail:0   fail:0   skip:38 
ivb-t430s        total:137  pass:124  dwarn:3   dfail:4   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:133  dwarn:2   dfail:0   fail:0   skip:8  
snb-dellxps      total:143  pass:124  dwarn:5   dfail:0   fail:0   skip:14 
snb-x220t        total:143  pass:124  dwarn:5   dfail:0   fail:1   skip:13 

Results at /archive/results/CI_IGT_test/Patchwork_1212/

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

#2 lore raw
In reply to Peter Antoine

I am OK with change here. However, in i915_drv.h, please check definition of HAS_GUC_UCODE() and HAS_GUC_SCHED(). I believe they are disabled for KBL.

Thanks,
Alex

Quoted 23 lines · Peter Antoine

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 +2 -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)

drivers/gpu/drm/i915/intel_guc_loader.c void intel_guc_ucode_init(struct drm_device *dev) · line 608

Quoted 10 lines
drivers/gpu/drm/i915/intel_guc_loader.c +4 -0
@@ -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 */

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

#3 lore raw

Yup, I missed a patch.
Just sent a new sequence.

Peter.

-----Original Message-----
From: Dai, Yu
Sent: Tuesday, January 19, 2016 6:18 PM
To: Antoine, Peter; [email protected]
Cc: [email protected]; Gordon, Dave; Thierry, Michel
Subject: Re: [PATCH] i915/guc: Add Kabylake GuC Loading

I am OK with change here. However, in i915_drv.h, please check definition of HAS_GUC_UCODE() and HAS_GUC_SCHED(). I believe they are disabled for KBL.

Thanks,
Alex

Quoted 27 lines · Peter Antoine

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 +2 -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;

drivers/gpu/drm/i915/intel_guc_loader.c void intel_guc_ucode_init(struct drm_device *dev) · line 608

Quoted 7 lines
drivers/gpu/drm/i915/intel_guc_loader.c +4 -0
+	} 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 */

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

#4 lore raw
In reply to Yu Dai

Please look at v2, had to change the order of the patches.

-----Original Message-----
From: Antoine, Peter
Sent: Tuesday, January 19, 2016 9:20 PM
To: Dai, Yu; [email protected]
Cc: [email protected]; Gordon, Dave; Thierry, Michel
Subject: RE: [PATCH] i915/guc: Add Kabylake GuC Loading

Yup, I missed a patch.
Just sent a new sequence.

Peter.

-----Original Message-----
From: Dai, Yu
Sent: Tuesday, January 19, 2016 6:18 PM
To: Antoine, Peter; [email protected]
Cc: [email protected]; Gordon, Dave; Thierry, Michel
Subject: Re: [PATCH] i915/guc: Add Kabylake GuC Loading

I am OK with change here. However, in i915_drv.h, please check definition of HAS_GUC_UCODE() and HAS_GUC_SCHED(). I believe they are disabled for KBL.

Thanks,
Alex

Quoted 27 lines · Peter Antoine

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 +2 -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;

drivers/gpu/drm/i915/intel_guc_loader.c void intel_guc_ucode_init(struct drm_device *dev) · line 608

Quoted 7 lines
drivers/gpu/drm/i915/intel_guc_loader.c +4 -0
+	} 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 */

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