* [PATCH 0/2] Enable GuC on KBL
@ 2016-06-02 17:01 Peter Antoine
2016-06-02 17:01 ` [PATCH 1/2] Revert "drm/i915/kbl: drm/i915: Avoid GuC loading for now on Kabylake." Peter Antoine
` (2 more replies)
0 siblings, 3 replies; 10+ messages in thread
From: Peter Antoine @ 2016-06-02 17:01 UTC (permalink / raw)
To: intel-gfx
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(-)
--
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] 10+ messages in thread
* [PATCH 1/2] Revert "drm/i915/kbl: drm/i915: Avoid GuC loading for now on Kabylake."
2016-06-02 17:01 [PATCH 0/2] Enable GuC on KBL Peter Antoine
@ 2016-06-02 17:01 ` Peter Antoine
2016-06-29 15:56 ` Rodrigo Vivi
2016-06-02 17:01 ` [PATCH 2/2] i915/guc: Add Kabylake GuC Loading Peter Antoine
2016-06-03 7:17 ` ✗ Ro.CI.BAT: warning for Enable GuC on KBL Patchwork
2 siblings, 1 reply; 10+ messages in thread
From: Peter Antoine @ 2016-06-02 17:01 UTC (permalink / raw)
To: intel-gfx
This reverts commit 2b81b84471b9
Signed-off-by: Peter Antoine <peter.antoine@intel.com>
---
drivers/gpu/drm/i915/i915_drv.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
index 96d5034..fa4b96e 100644
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@ -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
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [PATCH 2/2] i915/guc: Add Kabylake GuC Loading
2016-06-02 17:01 [PATCH 0/2] Enable GuC on KBL Peter Antoine
2016-06-02 17:01 ` [PATCH 1/2] Revert "drm/i915/kbl: drm/i915: Avoid GuC loading for now on Kabylake." Peter Antoine
@ 2016-06-02 17:01 ` Peter Antoine
2016-06-03 8:43 ` Michel Thierry
2016-06-03 7:17 ` ✗ Ro.CI.BAT: warning for Enable GuC on KBL Patchwork
2 siblings, 1 reply; 10+ messages in thread
From: Peter Antoine @ 2016-06-02 17:01 UTC (permalink / raw)
To: intel-gfx
This patch added the loading of the GuC for Kabylake.
It loads a 2.4 firmware.
Signed-off-by: Peter Antoine <peter.antoine@intel.com>
Signed-off-by: Michel Thierry <michel.thierry@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 f2b88c7..413af19 100644
--- a/drivers/gpu/drm/i915/intel_guc_loader.c
+++ b/drivers/gpu/drm/i915/intel_guc_loader.c
@@ -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 */
}
--
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] 10+ messages in thread
* ✗ Ro.CI.BAT: warning for Enable GuC on KBL
2016-06-02 17:01 [PATCH 0/2] Enable GuC on KBL Peter Antoine
2016-06-02 17:01 ` [PATCH 1/2] Revert "drm/i915/kbl: drm/i915: Avoid GuC loading for now on Kabylake." Peter Antoine
2016-06-02 17:01 ` [PATCH 2/2] i915/guc: Add Kabylake GuC Loading Peter Antoine
@ 2016-06-03 7:17 ` Patchwork
2 siblings, 0 replies; 10+ messages in thread
From: Patchwork @ 2016-06-03 7:17 UTC (permalink / raw)
To: Peter Antoine; +Cc: intel-gfx
== 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
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH 2/2] i915/guc: Add Kabylake GuC Loading
2016-06-02 17:01 ` [PATCH 2/2] i915/guc: Add Kabylake GuC Loading Peter Antoine
@ 2016-06-03 8:43 ` Michel Thierry
2016-06-03 9:14 ` Antoine, Peter
0 siblings, 1 reply; 10+ messages in thread
From: Michel Thierry @ 2016-06-03 8:43 UTC (permalink / raw)
To: Peter Antoine, intel-gfx
On 6/2/2016 6:01 PM, Peter Antoine wrote:
> 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 ;)
>
> Signed-off-by: Peter Antoine <peter.antoine@intel.com>
> Signed-off-by: Michel Thierry <michel.thierry@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 f2b88c7..413af19 100644
> --- a/drivers/gpu/drm/i915/intel_guc_loader.c
> +++ b/drivers/gpu/drm/i915/intel_guc_loader.c
> @@ -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 */
> }
>
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH 2/2] i915/guc: Add Kabylake GuC Loading
2016-06-03 8:43 ` Michel Thierry
@ 2016-06-03 9:14 ` Antoine, Peter
2016-06-29 15:57 ` Rodrigo Vivi
0 siblings, 1 reply; 10+ messages in thread
From: Antoine, Peter @ 2016-06-03 9:14 UTC (permalink / raw)
To: Thierry, Michel, intel-gfx@lists.freedesktop.org
I'll remove the comment. :)
-----Original Message-----
From: Thierry, Michel
Sent: Friday, June 3, 2016 9:44 AM
To: Antoine, Peter <peter.antoine@intel.com>; intel-gfx@lists.freedesktop.org
Cc: Gordon, David S <david.s.gordon@intel.com>
Subject: Re: [PATCH 2/2] i915/guc: Add Kabylake GuC Loading
On 6/2/2016 6:01 PM, Peter Antoine wrote:
> 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 ;)
>
> Signed-off-by: Peter Antoine <peter.antoine@intel.com>
> Signed-off-by: Michel Thierry <michel.thierry@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 f2b88c7..413af19 100644
> --- a/drivers/gpu/drm/i915/intel_guc_loader.c
> +++ b/drivers/gpu/drm/i915/intel_guc_loader.c
> @@ -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 */
> }
>
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH 1/2] Revert "drm/i915/kbl: drm/i915: Avoid GuC loading for now on Kabylake."
2016-06-02 17:01 ` [PATCH 1/2] Revert "drm/i915/kbl: drm/i915: Avoid GuC loading for now on Kabylake." Peter Antoine
@ 2016-06-29 15:56 ` Rodrigo Vivi
0 siblings, 0 replies; 10+ messages in thread
From: Rodrigo Vivi @ 2016-06-29 15:56 UTC (permalink / raw)
To: Peter Antoine; +Cc: intel-gfx
Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
On Thu, Jun 2, 2016 at 10:01 AM, Peter Antoine <peter.antoine@intel.com> wrote:
> This reverts commit 2b81b84471b9
>
> Signed-off-by: Peter Antoine <peter.antoine@intel.com>
> ---
> drivers/gpu/drm/i915/i915_drv.h | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
> index 96d5034..fa4b96e 100644
> --- a/drivers/gpu/drm/i915/i915_drv.h
> +++ b/drivers/gpu/drm/i915/i915_drv.h
> @@ -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
> Intel-gfx@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx
--
Rodrigo Vivi
Blog: http://blog.vivi.eng.br
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH 2/2] i915/guc: Add Kabylake GuC Loading
2016-06-03 9:14 ` Antoine, Peter
@ 2016-06-29 15:57 ` Rodrigo Vivi
2016-06-29 16:09 ` Peter Antoine
0 siblings, 1 reply; 10+ messages in thread
From: Rodrigo Vivi @ 2016-06-29 15:57 UTC (permalink / raw)
To: Antoine, Peter; +Cc: intel-gfx@lists.freedesktop.org
With the commit message updated feel free to use
Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
On Fri, Jun 3, 2016 at 2:14 AM, Antoine, Peter <peter.antoine@intel.com> wrote:
> I'll remove the comment. :)
>
> -----Original Message-----
> From: Thierry, Michel
> Sent: Friday, June 3, 2016 9:44 AM
> To: Antoine, Peter <peter.antoine@intel.com>; intel-gfx@lists.freedesktop.org
> Cc: Gordon, David S <david.s.gordon@intel.com>
> Subject: Re: [PATCH 2/2] i915/guc: Add Kabylake GuC Loading
>
> On 6/2/2016 6:01 PM, Peter Antoine wrote:
>> 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 ;)
>
>>
>> Signed-off-by: Peter Antoine <peter.antoine@intel.com>
>> Signed-off-by: Michel Thierry <michel.thierry@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 f2b88c7..413af19 100644
>> --- a/drivers/gpu/drm/i915/intel_guc_loader.c
>> +++ b/drivers/gpu/drm/i915/intel_guc_loader.c
>> @@ -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 */
>> }
>>
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx
--
Rodrigo Vivi
Blog: http://blog.vivi.eng.br
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH 2/2] i915/guc: Add Kabylake GuC Loading
2016-06-29 15:57 ` Rodrigo Vivi
@ 2016-06-29 16:09 ` Peter Antoine
0 siblings, 0 replies; 10+ messages in thread
From: Peter Antoine @ 2016-06-29 16:09 UTC (permalink / raw)
To: Rodrigo Vivi; +Cc: intel-gfx@lists.freedesktop.org
Thanks.
Rodrigo will sin a new patch now.
Peter.
On Wed, 29 Jun 2016, Rodrigo Vivi wrote:
> With the commit message updated feel free to use
> Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
>
> On Fri, Jun 3, 2016 at 2:14 AM, Antoine, Peter <peter.antoine@intel.com> wrote:
>> I'll remove the comment. :)
>>
>> -----Original Message-----
>> From: Thierry, Michel
>> Sent: Friday, June 3, 2016 9:44 AM
>> To: Antoine, Peter <peter.antoine@intel.com>; intel-gfx@lists.freedesktop.org
>> Cc: Gordon, David S <david.s.gordon@intel.com>
>> Subject: Re: [PATCH 2/2] i915/guc: Add Kabylake GuC Loading
>>
>> On 6/2/2016 6:01 PM, Peter Antoine wrote:
>>> 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 ;)
>>
>>>
>>> Signed-off-by: Peter Antoine <peter.antoine@intel.com>
>>> Signed-off-by: Michel Thierry <michel.thierry@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 f2b88c7..413af19 100644
>>> --- a/drivers/gpu/drm/i915/intel_guc_loader.c
>>> +++ b/drivers/gpu/drm/i915/intel_guc_loader.c
>>> @@ -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 */
>>> }
>>>
>> _______________________________________________
>> Intel-gfx mailing list
>> Intel-gfx@lists.freedesktop.org
>> 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
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 10+ messages in thread
* [PATCH 1/2] Revert "drm/i915/kbl: drm/i915: Avoid GuC loading for now on Kabylake."
@ 2016-06-30 16:37 Rodrigo Vivi
0 siblings, 0 replies; 10+ messages in thread
From: Rodrigo Vivi @ 2016-06-30 16:37 UTC (permalink / raw)
To: intel-gfx; +Cc: Rodrigo Vivi
From: Peter Antoine <peter.antoine@intel.com>
This reverts commit 2b81b84471b9
Cc: Christophe Prigent <christophe.prigent@intel.com>
Signed-off-by: Peter Antoine <peter.antoine@intel.com>
Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
---
drivers/gpu/drm/i915/i915_drv.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
index 485ab11..c4f6968 100644
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@ -2848,7 +2848,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))
--
2.4.3
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 10+ messages in thread
end of thread, other threads:[~2016-06-30 16:37 UTC | newest]
Thread overview: 10+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-06-02 17:01 [PATCH 0/2] Enable GuC on KBL Peter Antoine
2016-06-02 17:01 ` [PATCH 1/2] Revert "drm/i915/kbl: drm/i915: Avoid GuC loading for now on Kabylake." Peter Antoine
2016-06-29 15:56 ` Rodrigo Vivi
2016-06-02 17:01 ` [PATCH 2/2] i915/guc: Add Kabylake GuC Loading Peter Antoine
2016-06-03 8:43 ` Michel Thierry
2016-06-03 9:14 ` Antoine, Peter
2016-06-29 15:57 ` Rodrigo Vivi
2016-06-29 16:09 ` Peter Antoine
2016-06-03 7:17 ` ✗ Ro.CI.BAT: warning for Enable GuC on KBL Patchwork
-- strict thread matches above, loose matches on Subject: below --
2016-06-30 16:37 [PATCH 1/2] Revert "drm/i915/kbl: drm/i915: Avoid GuC loading for now on Kabylake." Rodrigo Vivi
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox