* [PATCH 0/2] drm/i915/guc: GuC firmware loading updates
@ 2016-05-06 10:42 Nick Hoath
2016-05-06 10:42 ` [PATCH 1/2] drm/i915/guc: Use major_minor version for filename Nick Hoath
` (2 more replies)
0 siblings, 3 replies; 8+ messages in thread
From: Nick Hoath @ 2016-05-06 10:42 UTC (permalink / raw)
To: intel-gfx
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(-)
--
1.9.1
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 8+ messages in thread* [PATCH 1/2] drm/i915/guc: Use major_minor version for filename
2016-05-06 10:42 [PATCH 0/2] drm/i915/guc: GuC firmware loading updates Nick Hoath
@ 2016-05-06 10:42 ` Nick Hoath
2016-05-10 18:58 ` Antoine, Peter
2016-05-06 10:42 ` [PATCH 2/2] drm/i915/guc: Add Broxton GuC firmware loading support Nick Hoath
2016-05-09 7:53 ` ✗ Fi.CI.BAT: warning for drm/i915/guc: GuC firmware loading updates Patchwork
2 siblings, 1 reply; 8+ messages in thread
From: Nick Hoath @ 2016-05-06 10:42 UTC (permalink / raw)
To: intel-gfx; +Cc: Tom O'Rourke
From: Tom O'Rourke <Tom.O'Rourke@intel.com>
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
Signed-off-by: Tom O'Rourke <Tom.O'Rourke@intel.com>
Signed-off-by: Nick Hoath <nicholas.hoath@intel.com>
Acked-by: Jani Nikula <jani.nikula@intel.com>
---
drivers/gpu/drm/i915/intel_guc_loader.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/i915/intel_guc_loader.c b/drivers/gpu/drm/i915/intel_guc_loader.c
index 58dbe30..46b01d7 100644
--- a/drivers/gpu/drm/i915/intel_guc_loader.c
+++ b/drivers/gpu/drm/i915/intel_guc_loader.c
@@ -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
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 8+ messages in thread
* Re: [PATCH 1/2] drm/i915/guc: Use major_minor version for filename
2016-05-06 10:42 ` [PATCH 1/2] drm/i915/guc: Use major_minor version for filename Nick Hoath
@ 2016-05-10 18:58 ` Antoine, Peter
0 siblings, 0 replies; 8+ messages in thread
From: Antoine, Peter @ 2016-05-10 18:58 UTC (permalink / raw)
To: Hoath, Nicholas, intel-gfx@lists.freedesktop.org
Reviewed-by: peter.antoine@intel.com
-----Original Message-----
From: Intel-gfx [mailto:intel-gfx-bounces@lists.freedesktop.org] On Behalf Of Nick Hoath
Sent: Friday, May 6, 2016 11:43 AM
To: intel-gfx@lists.freedesktop.org
Cc: O'Rourke, Tom <tom.orourke@intel.com>
Subject: [Intel-gfx] [PATCH 1/2] drm/i915/guc: Use major_minor version for filename
From: Tom O'Rourke <Tom.O'Rourke@intel.com>
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
Signed-off-by: Tom O'Rourke <Tom.O'Rourke@intel.com>
Signed-off-by: Nick Hoath <nicholas.hoath@intel.com>
Acked-by: Jani Nikula <jani.nikula@intel.com>
---
drivers/gpu/drm/i915/intel_guc_loader.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/i915/intel_guc_loader.c b/drivers/gpu/drm/i915/intel_guc_loader.c
index 58dbe30..46b01d7 100644
--- a/drivers/gpu/drm/i915/intel_guc_loader.c
+++ b/drivers/gpu/drm/i915/intel_guc_loader.c
@@ -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
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH 2/2] drm/i915/guc: Add Broxton GuC firmware loading support
2016-05-06 10:42 [PATCH 0/2] drm/i915/guc: GuC firmware loading updates Nick Hoath
2016-05-06 10:42 ` [PATCH 1/2] drm/i915/guc: Use major_minor version for filename Nick Hoath
@ 2016-05-06 10:42 ` Nick Hoath
2016-05-10 18:57 ` Antoine, Peter
2016-05-09 7:53 ` ✗ Fi.CI.BAT: warning for drm/i915/guc: GuC firmware loading updates Patchwork
2 siblings, 1 reply; 8+ messages in thread
From: Nick Hoath @ 2016-05-06 10:42 UTC (permalink / raw)
To: intel-gfx
Issue: VIZ-7772
Signed-off-by: Nick Hoath <nicholas.hoath@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 46b01d7..d122e74 100644
--- a/drivers/gpu/drm/i915/intel_guc_loader.c
+++ b/drivers/gpu/drm/i915/intel_guc_loader.c
@@ -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
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 8+ messages in thread* Re: [PATCH 2/2] drm/i915/guc: Add Broxton GuC firmware loading support
2016-05-06 10:42 ` [PATCH 2/2] drm/i915/guc: Add Broxton GuC firmware loading support Nick Hoath
@ 2016-05-10 18:57 ` Antoine, Peter
0 siblings, 0 replies; 8+ messages in thread
From: Antoine, Peter @ 2016-05-10 18:57 UTC (permalink / raw)
To: Hoath, Nicholas, intel-gfx@lists.freedesktop.org
Reviewed-by: peter.antoine@intel.com
-----Original Message-----
From: Intel-gfx [mailto:intel-gfx-bounces@lists.freedesktop.org] On Behalf Of Nick Hoath
Sent: Friday, May 6, 2016 11:43 AM
To: intel-gfx@lists.freedesktop.org
Subject: [Intel-gfx] [PATCH 2/2] drm/i915/guc: Add Broxton GuC firmware loading support
Issue: VIZ-7772
Signed-off-by: Nick Hoath <nicholas.hoath@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 46b01d7..d122e74 100644
--- a/drivers/gpu/drm/i915/intel_guc_loader.c
+++ b/drivers/gpu/drm/i915/intel_guc_loader.c
@@ -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
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 8+ messages in thread
* ✗ Fi.CI.BAT: warning for drm/i915/guc: GuC firmware loading updates
2016-05-06 10:42 [PATCH 0/2] drm/i915/guc: GuC firmware loading updates Nick Hoath
2016-05-06 10:42 ` [PATCH 1/2] drm/i915/guc: Use major_minor version for filename Nick Hoath
2016-05-06 10:42 ` [PATCH 2/2] drm/i915/guc: Add Broxton GuC firmware loading support Nick Hoath
@ 2016-05-09 7:53 ` Patchwork
2016-05-12 10:50 ` Nick Hoath
2 siblings, 1 reply; 8+ messages in thread
From: Patchwork @ 2016-05-09 7:53 UTC (permalink / raw)
To: Nick Hoath; +Cc: intel-gfx
== 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
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 8+ messages in thread* Re: ✗ Fi.CI.BAT: warning for drm/i915/guc: GuC firmware loading updates
2016-05-09 7:53 ` ✗ Fi.CI.BAT: warning for drm/i915/guc: GuC firmware loading updates Patchwork
@ 2016-05-12 10:50 ` Nick Hoath
2016-05-12 15:39 ` Tvrtko Ursulin
0 siblings, 1 reply; 8+ messages in thread
From: Nick Hoath @ 2016-05-12 10:50 UTC (permalink / raw)
To: intel-gfx@lists.freedesktop.org
On 09/05/2016 08:53, Patchwork wrote:
> == 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)
Already captured in:
https://bugs.freedesktop.org/show_bug.cgi?id=92235
> 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)
> 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
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: ✗ Fi.CI.BAT: warning for drm/i915/guc: GuC firmware loading updates
2016-05-12 10:50 ` Nick Hoath
@ 2016-05-12 15:39 ` Tvrtko Ursulin
0 siblings, 0 replies; 8+ messages in thread
From: Tvrtko Ursulin @ 2016-05-12 15:39 UTC (permalink / raw)
To: Nick Hoath, intel-gfx@lists.freedesktop.org
On 12/05/16 11:50, Nick Hoath wrote:
> On 09/05/2016 08:53, Patchwork wrote:
>> == 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)
> Already captured in:
> https://bugs.freedesktop.org/show_bug.cgi?id=92235
>
>> 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)
>
>> 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
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2016-05-12 15:39 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-05-06 10:42 [PATCH 0/2] drm/i915/guc: GuC firmware loading updates Nick Hoath
2016-05-06 10:42 ` [PATCH 1/2] drm/i915/guc: Use major_minor version for filename Nick Hoath
2016-05-10 18:58 ` Antoine, Peter
2016-05-06 10:42 ` [PATCH 2/2] drm/i915/guc: Add Broxton GuC firmware loading support Nick Hoath
2016-05-10 18:57 ` Antoine, Peter
2016-05-09 7:53 ` ✗ Fi.CI.BAT: warning for drm/i915/guc: GuC firmware loading updates Patchwork
2016-05-12 10:50 ` Nick Hoath
2016-05-12 15:39 ` Tvrtko Ursulin
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox