Enable GuC on KBL
Subsystems (2)
cover Enable GuC on KBL
The following patches will enable GuC loading for the KBL. The version of firmware that is required 9.14.
Peter Antoine (2):
Revert "drm/i915/kbl: drm/i915: Avoid GuC loading for now on
Kabylake."
i915/guc: Add Kabylake GuC Loading
drivers/gpu/drm/i915/i915_drv.h | 2 +- drivers/gpu/drm/i915/intel_guc_loader.c | 7 +++++++ 2 files 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
PATCH 1/2 Revert "drm/i915/kbl: drm/i915: Avoid GuC loading for now on Kabylake."
This reverts commit 2b81b84471b9
--- drivers/gpu/drm/i915/i915_drv.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/i915/i915_drv.h +1 -1
@@ -2812,7 +2812,7 @@ struct drm_i915_cmd_table {* command submission once loaded. But these are logically independent * properties, so we have separate macros to test them. */ -#define HAS_GUC (dev) (IS_GEN9(dev) && !IS_KABYLAKE(dev)) +#define HAS_GUC (dev) (IS_GEN9(dev))#define HAS_GUC_UCODE (dev) (HAS_GUC(dev))#define HAS_GUC_SCHED (dev) (HAS_GUC(dev))
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 1/2] Revert "drm/i915/kbl: drm/i915: Avoid GuC loading for now on Kabylake."
Quoted 27 lines · Peter Antoine
This reverts commit
2b81b84471b9Signed-off-by Peter Antoine <[email protected]>--- drivers/gpu/drm/i915/i915_drv.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)drivers/gpu/drm/i915/i915_drv.h +1
-2@@ -2812,7 +2812,7 @@ struct drm_i915_cmd_table {* command submission once loaded. But these are logically independent * properties, so we have separate macros to test them. */ -#define HAS_GUC (dev) (IS_GEN9(dev) && !IS_KABYLAKE(dev)) +#define HAS_GUC (dev) (IS_GEN9(dev))#define HAS_GUC_UCODE (dev) (HAS_GUC(dev))#define HAS_GUC_SCHED (dev) (HAS_GUC(dev)) --1.9.1
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 6 lines
Rodrigo Vivi Blog: http://blog.vivi.eng.br _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 2/2 i915/guc: Add Kabylake GuC Loading
In reply to Peter AntoineThis patch added the loading of the GuC for Kabylake. It loads a 2.4 firmware.
--- drivers/gpu/drm/i915/intel_guc_loader.c | 7 +++++++ 1 file changed, 7 insertions(+)
drivers/gpu/drm/i915/intel_guc_loader.c +7 -0
@@ -65,6 +65,9 @@ MODULE_FIRMWARE(I915_SKL_GUC_UCODE);#define I915_BXT_GUC_UCODE "i915/bxt_guc_ver8_7.bin"MODULE_FIRMWARE (I915_BXT_GUC_UCODE ); +#define I915_KBL_GUC_UCODE "i915/kbl_guc_ver9.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) {
@@ -696,6 +699,10 @@ void intel_guc_init(struct drm_device *dev) fw_path =I915_BXT_GUC_UCODE ; guc_fw->guc_fw_major_wanted =8 ; guc_fw->guc_fw_minor_wanted =7 ; + }else if (IS_KABYLAKE (dev)) { + fw_path =I915_KBL_GUC_UCODE ; + guc_fw->guc_fw_major_wanted =9 ; + guc_fw->guc_fw_minor_wanted =14 ; }else { fw_path ="" ;/* unknown device */ }
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 2/2] i915/guc: Add Kabylake GuC Loading
Quoted 2 lines · Peter Antoine
This patch added the loading of the GuC for Kabylake. It loads a 2.4 firmware.
^^^^^^ not anymore
Either we update the commit msg to say 9.14 (and let people know how many releases we had), or just keep silent about it ;)
Quoted 23 lines
Signed-off-by Peter Antoine <[email protected]>Signed-off-by Michel Thierry <[email protected]>--- drivers/gpu/drm/i915/intel_guc_loader.c | 7 +++++++ 1 file changed, 7 insertions(+)drivers/gpu/drm/i915/intel_guc_loader.c +3
-0@@ -65,6 +65,9 @@ MODULE_FIRMWARE(I915_SKL_GUC_UCODE);#define I915_BXT_GUC_UCODE "i915/bxt_guc_ver8_7.bin"MODULE_FIRMWARE (I915_BXT_GUC_UCODE ); +#define I915_KBL_GUC_UCODE "i915/kbl_guc_ver9.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_init(struct drm_device *dev) · line 708
Quoted 10 lines
drivers/gpu/drm/i915/intel_guc_loader.c +4
-0@@ -696,6 +699,10 @@ void intel_guc_init(struct drm_device *dev) fw_path =I915_BXT_GUC_UCODE ; guc_fw->guc_fw_major_wanted =8 ; guc_fw->guc_fw_minor_wanted =7 ; + }else if (IS_KABYLAKE (dev)) { + fw_path =I915_KBL_GUC_UCODE ; + guc_fw->guc_fw_major_wanted =9 ; + guc_fw->guc_fw_minor_wanted =14 ; }else { fw_path ="" ;/* unknown device */ }
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 2/2] i915/guc: Add Kabylake GuC Loading
I'll remove the comment. :)
-----Original Message-----
From: Thierry, Michel
Sent: Friday, June 3, 2016 9:44 AM
To: Antoine, Peter <[email protected]>; [email protected]
Cc: Gordon, David S <[email protected]>
Subject: Re: [PATCH 2/2] i915/guc: Add Kabylake GuC Loading
Quoted 2 lines · Peter Antoine
This patch added the loading of the GuC for Kabylake. It loads a 2.4 firmware.
^^^^^^ not anymore
Either we update the commit msg to say 9.14 (and let people know how many releases we had), or just keep silent about it ;)
Quoted 23 lines
Signed-off-by Peter Antoine <[email protected]>Signed-off-by Michel Thierry <[email protected]>--- drivers/gpu/drm/i915/intel_guc_loader.c | 7 +++++++ 1 file changed, 7 insertions(+)drivers/gpu/drm/i915/intel_guc_loader.c +3
-1@@ -65,6 +65,9 @@ MODULE_FIRMWARE(I915_SKL_GUC_UCODE);#define I915_BXT_GUC_UCODE "i915/bxt_guc_ver8_7.bin"MODULE_FIRMWARE (I915_BXT_GUC_UCODE ); +#define I915_KBL_GUC_UCODE "i915/kbl_guc_ver9.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) { @@ -696,6 +699,10 @@ void intel_guc_init(struct drm_device *dev)
drivers/gpu/drm/i915/intel_guc_loader.c MODULE_FIRMWARE(I915_SKL_GUC_UCODE);
Quoted 10 lines
drivers/gpu/drm/i915/intel_guc_loader.c +4
-0fw_path =I915_BXT_GUC_UCODE ; guc_fw->guc_fw_major_wanted =8 ; guc_fw->guc_fw_minor_wanted =7 ; + }else if (IS_KABYLAKE (dev)) { + fw_path =I915_KBL_GUC_UCODE ; + guc_fw->guc_fw_major_wanted =9 ; + guc_fw->guc_fw_minor_wanted =14 ; }else { fw_path ="" ;/* unknown device */ }
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Rodrigo Vivi
Reviewed-byRe: [PATCH 2/2] i915/guc: Add Kabylake GuC Loading
With the commit message updated feel free to use
Quoted 52 lines · Peter
I'll remove the comment. :)
-----Original Message-----
From: Thierry, Michel
Sent: Friday, June 3, 2016 9:44 AM
To: Antoine, Peter <[email protected]>; [email protected]
Cc: Gordon, David S <[email protected]>
Subject: Re: [PATCH 2/2] i915/guc: Add Kabylake GuC LoadingQuoted 2 lines · Peter Antoine
This patch added the loading of the GuC for Kabylake. It loads a 2.4 firmware.
^^^^^^ not anymoreEither we update the commit msg to say 9.14 (and let people know how many releases we had), or just keep silent about it ;)
Quoted 23 lines
Signed-off-by Peter Antoine <[email protected]>Signed-off-by Michel Thierry <[email protected]>--- drivers/gpu/drm/i915/intel_guc_loader.c | 7 +++++++ 1 file changed, 7 insertions(+)drivers/gpu/drm/i915/intel_guc_loader.c +3
-1@@ -65,6 +65,9 @@ MODULE_FIRMWARE(I915_SKL_GUC_UCODE);#define I915_BXT_GUC_UCODE "i915/bxt_guc_ver8_7.bin"MODULE_FIRMWARE (I915_BXT_GUC_UCODE ); +#define I915_KBL_GUC_UCODE "i915/kbl_guc_ver9.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) { @@ -696,6 +699,10 @@ void intel_guc_init(struct drm_device *dev)drivers/gpu/drm/i915/intel_guc_loader.c MODULE_FIRMWARE(I915_SKL_GUC_UCODE);
Quoted 10 lines
drivers/gpu/drm/i915/intel_guc_loader.c +4
-0fw_path =I915_BXT_GUC_UCODE ; guc_fw->guc_fw_major_wanted =8 ; guc_fw->guc_fw_minor_wanted =7 ; + }else if (IS_KABYLAKE (dev)) { + fw_path =I915_KBL_GUC_UCODE ; + guc_fw->guc_fw_major_wanted =9 ; + guc_fw->guc_fw_minor_wanted =14 ; }else { fw_path ="" ;/* unknown device */ }_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 6 lines
Rodrigo Vivi Blog: http://blog.vivi.eng.br _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 2/2] i915/guc: Add Kabylake GuC Loading
Thanks.
Rodrigo will sin a new patch now.
Peter.
Quoted 60 lines · Rodrigo Vivi
With the commit message updated feel free to use
Reviewed-by Rodrigo Vivi <[email protected]>Quoted 52 lines · Peter
I'll remove the comment. :)
-----Original Message-----
From: Thierry, Michel
Sent: Friday, June 3, 2016 9:44 AM
To: Antoine, Peter <[email protected]>; [email protected]
Cc: Gordon, David S <[email protected]>
Subject: Re: [PATCH 2/2] i915/guc: Add Kabylake GuC LoadingQuoted 2 lines · Peter Antoine
This patch added the loading of the GuC for Kabylake. It loads a 2.4 firmware.
^^^^^^ not anymoreEither we update the commit msg to say 9.14 (and let people know how many releases we had), or just keep silent about it ;)
Quoted 23 lines
Signed-off-by Peter Antoine <[email protected]>Signed-off-by Michel Thierry <[email protected]>--- drivers/gpu/drm/i915/intel_guc_loader.c | 7 +++++++ 1 file changed, 7 insertions(+)drivers/gpu/drm/i915/intel_guc_loader.c +3
-1@@ -65,6 +65,9 @@ MODULE_FIRMWARE(I915_SKL_GUC_UCODE);#define I915_BXT_GUC_UCODE "i915/bxt_guc_ver8_7.bin"MODULE_FIRMWARE (I915_BXT_GUC_UCODE ); +#define I915_KBL_GUC_UCODE "i915/kbl_guc_ver9.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) { @@ -696,6 +699,10 @@ void intel_guc_init(struct drm_device *dev)drivers/gpu/drm/i915/intel_guc_loader.c MODULE_FIRMWARE(I915_SKL_GUC_UCODE);
Quoted 10 lines
drivers/gpu/drm/i915/intel_guc_loader.c +4
-0fw_path =I915_BXT_GUC_UCODE ; guc_fw->guc_fw_major_wanted =8 ; guc_fw->guc_fw_minor_wanted =7 ; + }else if (IS_KABYLAKE (dev)) { + fw_path =I915_KBL_GUC_UCODE ; + guc_fw->guc_fw_major_wanted =9 ; + guc_fw->guc_fw_minor_wanted =14 ; }else { fw_path ="" ;/* unknown device */ }_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
--
Peter Antoine (Android Graphics Driver Software Engineer)
---------------------------------------------------------------------
Intel Corporation (UK) Limited
Registered No. 1134945 (England)
Registered Office: Pipers Way, Swindon SN3 1RJ VAT No: 860 2173 47
_______________________________________________
Intel-gfx mailing list [email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✗ Ro.CI.BAT: warning for Enable GuC on KBL
In reply to Peter Antoine== Series Details ==
== Series Details ==
Series: Enable GuC on KBL
URL : https://patchwork.freedesktop.org/series/8174/
State : warning
== Summary ==
Series 8174v1 Enable GuC on KBL
http://patchwork.freedesktop.org/api/1.0/series/8174/revisions/1/mbox
Test core_auth:
Subgroup basic-auth:
pass -> DMESG-WARN (ro-skl-i7-6700hq)
Test gem_exec_flush:
Subgroup basic-batch-kernel-default-uc:
dmesg-warn -> PASS (ro-skl-i7-6700hq)
Subgroup basic-uc-prw-default:
pass -> DMESG-WARN (ro-skl-i7-6700hq)
Subgroup basic-uc-rw-default:
pass -> DMESG-WARN (ro-skl-i7-6700hq)
Subgroup basic-wb-pro-default:
dmesg-warn -> PASS (ro-skl-i7-6700hq)
Subgroup basic-wb-ro-default:
dmesg-warn -> PASS (ro-skl-i7-6700hq)
Subgroup basic-wb-set-default:
pass -> DMESG-WARN (ro-skl-i7-6700hq)
Test gem_mmap_gtt:
Subgroup basic-write-cpu-read-gtt:
dmesg-warn -> PASS (ro-skl-i7-6700hq)
Subgroup basic-write-gtt:
dmesg-warn -> PASS (ro-skl-i7-6700hq)
Subgroup basic-write-gtt-no-prefault:
pass -> DMESG-WARN (ro-skl-i7-6700hq)
Subgroup basic-write-no-prefault:
pass -> DMESG-WARN (ro-skl-i7-6700hq)
Test gem_storedw_loop:
Subgroup basic-bsd:
dmesg-warn -> PASS (ro-skl-i7-6700hq)
Subgroup basic-render:
dmesg-warn -> PASS (ro-skl-i7-6700hq)
Subgroup basic-vebox:
dmesg-warn -> PASS (ro-skl-i7-6700hq)
Test kms_addfb_basic:
Subgroup bad-pitch-0:
dmesg-warn -> PASS (ro-skl-i7-6700hq)
Subgroup bad-pitch-256:
pass -> DMESG-WARN (ro-skl-i7-6700hq)
Subgroup bad-pitch-65536:
pass -> DMESG-WARN (ro-skl-i7-6700hq)
Subgroup bo-too-small:
dmesg-warn -> PASS (ro-skl-i7-6700hq)
Subgroup bo-too-small-due-to-tiling:
pass -> DMESG-WARN (ro-skl-i7-6700hq)
Subgroup tile-pitch-mismatch:
dmesg-warn -> PASS (ro-skl-i7-6700hq)
Subgroup too-wide:
pass -> DMESG-WARN (ro-skl-i7-6700hq)
Test kms_flip:
Subgroup basic-flip-vs-wf_vblank:
pass -> DMESG-WARN (ro-skl-i7-6700hq)
Test kms_psr_sink_crc:
Subgroup psr_basic:
pass -> DMESG-WARN (ro-skl-i7-6700hq)fi-hsw-i7-4770k total:209 pass:187 dwarn:0 dfail:0 fail:3 skip:19 fi-snb-i7-2600 total:209 pass:167 dwarn:0 dfail:0 fail:3 skip:39 ro-bdw-i5-5250u total:102 pass:93 dwarn:0 dfail:0 fail:0 skip:8 ro-bdw-i7-5600u total:102 pass:75 dwarn:0 dfail:0 fail:0 skip:26 ro-byt-n2820 total:209 pass:169 dwarn:0 dfail:0 fail:3 skip:37 ro-hsw-i3-4010u total:209 pass:186 dwarn:0 dfail:0 fail:0 skip:23 ro-hsw-i7-4770r total:102 pass:82 dwarn:0 dfail:0 fail:0 skip:19 ro-ilk-i7-620lm total:1 pass:0 dwarn:0 dfail:0 fail:0 skip:0 ro-ilk1-i5-650 total:204 pass:146 dwarn:0 dfail:0 fail:1 skip:57 ro-ivb-i7-3770 total:102 pass:75 dwarn:0 dfail:0 fail:0 skip:26 ro-ivb2-i7-3770 total:102 pass:79 dwarn:0 dfail:0 fail:0 skip:22 ro-skl-i7-6700hq total:204 pass:171 dwarn:12 dfail:0 fail:0 skip:21 ro-snb-i7-2620M total:102 pass:72 dwarn:0 dfail:0 fail:0 skip:29
ro-bdw-i7-5557U failed to connect after reboot
Results at /archive/results/CI_IGT_test/RO_Patchwork_1086/
cbc3c4a drm-intel-nightly: 2016y-06m-02d-22h-03m-59s UTC integration manifest 461dd85 i915/guc: Add Kabylake GuC Loading
c4ad5ba Revert "drm/i915/kbl: drm/i915: Avoid GuC loading for now on Kabylake."
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx