Skip to contentSkip to conversation

drm/i915/guc: GuC firmware loading updates

PATCH Applied Nick Hoath 4 participants 8 messages May 6, 2016 – May 12, 2016

Subsystems (2)
lore
Share & tools
lore

Nick Hoath

author
#0 lore raw

cover drm/i915/guc: GuC firmware loading updates

Updates to Skylake firmware filename & support for loading Broxton firmware.

Nick Hoath (1):
drm/i915/guc: Add Broxton GuC firmware loading support

Tom O'Rourke (1):
drm/i915/guc: Use major_minor version for filename

 drivers/gpu/drm/i915/intel_guc_loader.c | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)
Signature · 6 lines
1.9.1

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

PATCH 1/2 drm/i915/guc: Use major_minor version for filename

From: Tom O'Rourke <Tom.O'[email protected]>

Load guc firmware from file with major_minor number in filename instead of using symolic link with only major number.

This change is so that new firmwares can only be used with a kernel change. This in case there is a regression with a new firmware, it won't be used by default without some testing.

Issue: VIZ-7713

---
 drivers/gpu/drm/i915/intel_guc_loader.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/i915/intel_guc_loader.c +1 -1
index 58dbe30..46b01d7 100644
@@ -59,7 +59,7 @@
  *
  */
 
-#define I915_SKL_GUC_UCODE "i915/skl_guc_ver6.bin"
+#define I915_SKL_GUC_UCODE "i915/skl_guc_ver6_1.bin"
 MODULE_FIRMWARE(I915_SKL_GUC_UCODE);
 
 /* User-friendly representation of an enum */
Signature · 6 lines
1.9.1

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Reviewed-by Acked-by Jani Nikula on v1 1/2
#2 lore raw

Re: [PATCH 1/2] drm/i915/guc: Use major_minor version for filename

Reviewed-by [email protected]

-----Original Message-----
From: Intel-gfx [mailto:[email protected]] On Behalf Of Nick Hoath
Sent: Friday, May 6, 2016 11:43 AM
To: [email protected]
Cc: O'Rourke, Tom <[email protected]>
Subject: [Intel-gfx] [PATCH 1/2] drm/i915/guc: Use major_minor version for filename

From: Tom O'Rourke <Tom.O'[email protected]>

Load guc firmware from file with major_minor number in filename instead of using symolic link with only major number.

This change is so that new firmwares can only be used with a kernel change. This in case there is a regression with a new firmware, it won't be used by default without some testing.

Issue: VIZ-7713

---
 drivers/gpu/drm/i915/intel_guc_loader.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/i915/intel_guc_loader.c +1 -1
index 58dbe30..46b01d7 100644
@@ -59,7 +59,7 @@
  *
  */
 
-#define I915_SKL_GUC_UCODE "i915/skl_guc_ver6.bin"
+#define I915_SKL_GUC_UCODE "i915/skl_guc_ver6_1.bin"
 MODULE_FIRMWARE(I915_SKL_GUC_UCODE);
 
 /* User-friendly representation of an enum */

--
1.9.1

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

author
#3 lore raw

PATCH 2/2 drm/i915/guc: Add Broxton GuC firmware loading support

In reply to Nick Hoath

Issue: VIZ-7772

---
 drivers/gpu/drm/i915/intel_guc_loader.c | 7 +++++++
 1 file changed, 7 insertions(+)
drivers/gpu/drm/i915/intel_guc_loader.c +7 -0
index 46b01d7..d122e74 100644
@@ -62,6 +62,9 @@
 #define I915_SKL_GUC_UCODE "i915/skl_guc_ver6_1.bin"
 MODULE_FIRMWARE(I915_SKL_GUC_UCODE);
 
+#define I915_BXT_GUC_UCODE "i915/bxt_guc_ver8_7.bin"
+MODULE_FIRMWARE(I915_BXT_GUC_UCODE);
+
 /* User-friendly representation of an enum */
 const char *intel_guc_fw_status_repr(enum intel_guc_fw_status status)
 {
@@ -644,6 +647,10 @@ void intel_guc_ucode_init(struct drm_device *dev)
 		fw_path = I915_SKL_GUC_UCODE;
 		guc_fw->guc_fw_major_wanted = 6;
 		guc_fw->guc_fw_minor_wanted = 1;
+	} else if (IS_BROXTON(dev)) {
+		fw_path = I915_BXT_GUC_UCODE;
+		guc_fw->guc_fw_major_wanted = 8;
+		guc_fw->guc_fw_minor_wanted = 7;
 	} else {
 		i915.enable_guc_submission = false;
 		fw_path = "";	/* unknown device */
Signature · 6 lines
1.9.1

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Reviewed-by on v1 2/2
#4 lore raw

Re: [PATCH 2/2] drm/i915/guc: Add Broxton GuC firmware loading support

Reviewed-by [email protected]

-----Original Message-----
From: Intel-gfx [mailto:[email protected]] On Behalf Of Nick Hoath
Sent: Friday, May 6, 2016 11:43 AM
To: [email protected]
Subject: [Intel-gfx] [PATCH 2/2] drm/i915/guc: Add Broxton GuC firmware loading support

Issue: VIZ-7772

---
 drivers/gpu/drm/i915/intel_guc_loader.c | 7 +++++++
 1 file changed, 7 insertions(+)
drivers/gpu/drm/i915/intel_guc_loader.c +3 -0
index 46b01d7..d122e74 100644
@@ -62,6 +62,9 @@
 #define I915_SKL_GUC_UCODE "i915/skl_guc_ver6_1.bin"
 MODULE_FIRMWARE(I915_SKL_GUC_UCODE);
 
+#define I915_BXT_GUC_UCODE "i915/bxt_guc_ver8_7.bin"
+MODULE_FIRMWARE(I915_BXT_GUC_UCODE);
+
 /* User-friendly representation of an enum */  const char *intel_guc_fw_status_repr(enum intel_guc_fw_status status)  { @@ -644,6 +647,10 @@ void intel_guc_ucode_init(struct drm_device *dev)
 		fw_path = I915_SKL_GUC_UCODE;
 		guc_fw->guc_fw_major_wanted = 6;

guc_fw->guc_fw_minor_wanted = 1;
+ } else if (IS_BROXTON(dev)) {
+ fw_path = I915_BXT_GUC_UCODE;
+ guc_fw->guc_fw_major_wanted = 8;
+ guc_fw->guc_fw_minor_wanted = 7;
} else {
i915.enable_guc_submission = false;
fw_path = ""; /* unknown device */
--
1.9.1

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

#5 lore raw

✗ Fi.CI.BAT: warning for drm/i915/guc: GuC firmware loading updates

In reply to Nick Hoath
== Series Details ==

== Series Details ==

Series: drm/i915/guc: GuC firmware loading updates
URL : https://patchwork.freedesktop.org/series/6818/
State : warning

== Summary ==

Series 6818v1 drm/i915/guc: GuC firmware loading updates
http://patchwork.freedesktop.org/api/1.0/series/6818/revisions/1/mbox/

Test core_auth:

        Subgroup basic-auth:
                pass       -> DMESG-WARN (bdw-ultra)
Test pm_rpm:
        Subgroup basic-pci-d3-state:
                pass       -> SKIP       (hsw-brixbox)
bdw-nuci7-2      total:219  pass:206  dwarn:0   dfail:0   fail:0   skip:13 
bdw-ultra        total:219  pass:192  dwarn:1   dfail:0   fail:0   skip:26 
bsw-nuc-2        total:218  pass:174  dwarn:0   dfail:0   fail:2   skip:42 
byt-nuc          total:218  pass:174  dwarn:0   dfail:0   fail:3   skip:41 
hsw-brixbox      total:219  pass:192  dwarn:0   dfail:0   fail:0   skip:27 
hsw-gt2          total:219  pass:197  dwarn:0   dfail:0   fail:1   skip:21 
ivb-t430s        total:219  pass:188  dwarn:0   dfail:0   fail:0   skip:31 
skl-i7k-2        total:219  pass:191  dwarn:0   dfail:0   fail:0   skip:28 
skl-nuci5        total:219  pass:207  dwarn:0   dfail:0   fail:0   skip:12 
snb-dellxps      total:37   pass:27   dwarn:0   dfail:0   fail:0   skip:9  
snb-x220t        total:219  pass:176  dwarn:0   dfail:0   fail:1   skip:42 

Results at /archive/results/CI_IGT_test/Patchwork_2146/

447f2438e5ee3e9bb7d5cbe88fc44cdff74cc165 drm-intel-nightly: 2016y-05m-08d-16h-21m-00s UTC integration manifest b8d1e93 drm/i915/guc: Add Broxton GuC firmware loading support
9b4a018 drm/i915/guc: Use major_minor version for filename

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

author
#6 lore raw

Re: ✗ Fi.CI.BAT: warning for drm/i915/guc: GuC firmware loading updates

Quoted 6 lines · Patchwork

== Series Details ==

Series: drm/i915/guc: GuC firmware loading updates
URL : https://patchwork.freedesktop.org/series/6818/
State : warning

Quoted 8 lines

== Summary ==

Series 6818v1 drm/i915/guc: GuC firmware loading updates
http://patchwork.freedesktop.org/api/1.0/series/6818/revisions/1/mbox/

Test core_auth:

         Subgroup basic-auth:
                 pass       -> DMESG-WARN (bdw-ultra)

Already captured in:
https://bugs.freedesktop.org/show_bug.cgi?id=92235

Quoted 4 lines

Test pm_rpm:

         Subgroup basic-pci-d3-state:
                 pass       -> SKIP       (hsw-brixbox)

Looks like a HW failure:
Test requirement not met in function enable_one_screen, file pm_rpm.c:329:
Test requirement: enable_one_screen_with_type(data, SCREEN_TYPE_ANY)

Quoted 12 lines
bdw-nuci7-2      total:219  pass:206  dwarn:0   dfail:0   fail:0   skip:13
bdw-ultra        total:219  pass:192  dwarn:1   dfail:0   fail:0   skip:26
bsw-nuc-2        total:218  pass:174  dwarn:0   dfail:0   fail:2   skip:42
byt-nuc          total:218  pass:174  dwarn:0   dfail:0   fail:3   skip:41
hsw-brixbox      total:219  pass:192  dwarn:0   dfail:0   fail:0   skip:27
hsw-gt2          total:219  pass:197  dwarn:0   dfail:0   fail:1   skip:21
ivb-t430s        total:219  pass:188  dwarn:0   dfail:0   fail:0   skip:31
skl-i7k-2        total:219  pass:191  dwarn:0   dfail:0   fail:0   skip:28
skl-nuci5        total:219  pass:207  dwarn:0   dfail:0   fail:0   skip:12
snb-dellxps      total:37   pass:27   dwarn:0   dfail:0   fail:0   skip:9
snb-x220t        total:219  pass:176  dwarn:0   dfail:0   fail:1   skip:42
Quoted 6 lines

Results at /archive/results/CI_IGT_test/Patchwork_2146/

447f2438e5ee3e9bb7d5cbe88fc44cdff74cc165 drm-intel-nightly: 2016y-05m-08d-16h-21m-00s UTC integration manifest b8d1e93 drm/i915/guc: Add Broxton GuC firmware loading support
9b4a018 drm/i915/guc: Use major_minor version for filename

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

#7 lore raw

Re: ✗ Fi.CI.BAT: warning for drm/i915/guc: GuC firmware loading updates

Quoted 18 lines · Nick Hoath
Quoted 6 lines · Patchwork

== Series Details ==

Series: drm/i915/guc: GuC firmware loading updates
URL : https://patchwork.freedesktop.org/series/6818/
State : warning

Quoted 8 lines

== Summary ==

Series 6818v1 drm/i915/guc: GuC firmware loading updates
http://patchwork.freedesktop.org/api/1.0/series/6818/revisions/1/mbox/

Test core_auth:

         Subgroup basic-auth:
                 pass       -> DMESG-WARN (bdw-ultra)

Already captured in:
https://bugs.freedesktop.org/show_bug.cgi?id=92235

Quoted 36 lines
Quoted 4 lines

Test pm_rpm:

         Subgroup basic-pci-d3-state:
                 pass       -> SKIP       (hsw-brixbox)

Looks like a HW failure:
Test requirement not met in function enable_one_screen, file pm_rpm.c:329:
Test requirement: enable_one_screen_with_type(data, SCREEN_TYPE_ANY)

Quoted 28 lines

bdw-nuci7-2 total:219 pass:206 dwarn:0 dfail:0 fail:0
skip:13
bdw-ultra total:219 pass:192 dwarn:1 dfail:0 fail:0
skip:26
bsw-nuc-2 total:218 pass:174 dwarn:0 dfail:0 fail:2
skip:42
byt-nuc total:218 pass:174 dwarn:0 dfail:0 fail:3
skip:41
hsw-brixbox total:219 pass:192 dwarn:0 dfail:0 fail:0
skip:27
hsw-gt2 total:219 pass:197 dwarn:0 dfail:0 fail:1
skip:21
ivb-t430s total:219 pass:188 dwarn:0 dfail:0 fail:0
skip:31
skl-i7k-2 total:219 pass:191 dwarn:0 dfail:0 fail:0
skip:28
skl-nuci5 total:219 pass:207 dwarn:0 dfail:0 fail:0
skip:12

snb-dellxps      total:37   pass:27   dwarn:0   dfail:0   fail:0   skip:9
snb-x220t        total:219  pass:176  dwarn:0   dfail:0   fail:1

skip:42

Results at /archive/results/CI_IGT_test/Patchwork_2146/

447f2438e5ee3e9bb7d5cbe88fc44cdff74cc165 drm-intel-nightly:
2016y-05m-08d-16h-21m-00s UTC integration manifest b8d1e93 drm/i915/guc: Add Broxton GuC firmware loading support 9b4a018 drm/i915/guc: Use major_minor version for filename

Merged, thanks for the patches and review.

Regards,

Tvrtko

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