* [PATCH 1/2] Revert "drm/i915/kbl: drm/i915: Avoid GuC loading for now on Kabylake."
@ 2016-06-30 16:37 Rodrigo Vivi
2016-06-30 16:37 ` [PATCH 2/2] i915/guc: Add Kabylake GuC Loading Rodrigo Vivi
2016-07-01 5:20 ` ✗ Ro.CI.BAT: failure for series starting with [1/2] Revert "drm/i915/kbl: drm/i915: Avoid GuC loading for now on Kabylake." Patchwork
0 siblings, 2 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
* [PATCH 2/2] i915/guc: Add Kabylake GuC Loading
2016-06-30 16:37 [PATCH 1/2] Revert "drm/i915/kbl: drm/i915: Avoid GuC loading for now on Kabylake." Rodrigo Vivi
@ 2016-06-30 16:37 ` Rodrigo Vivi
2016-07-01 13:06 ` Michel Thierry
2016-07-01 5:20 ` ✗ Ro.CI.BAT: failure for series starting with [1/2] Revert "drm/i915/kbl: drm/i915: Avoid GuC loading for now on Kabylake." Patchwork
1 sibling, 1 reply; 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 patch added the loading of the GuC for Kabylake.
It loads a 9.14 firmware.
v2: Fix commit message
v3: Fix major/minor var names to match -nightly. (Rodrigo)
Cc: Christophe Prigent <christophe.prigent@intel.com>
Signed-off-by: Peter Antoine <peter.antoine@intel.com>
Signed-off-by: Michel Thierry <michel.thierry@intel.com>
Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@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 4f6311a..d80b617 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_14.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)
{
@@ -698,6 +701,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 */
}
--
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
* ✗ Ro.CI.BAT: failure for series starting with [1/2] Revert "drm/i915/kbl: drm/i915: Avoid GuC loading for now on Kabylake."
2016-06-30 16:37 [PATCH 1/2] Revert "drm/i915/kbl: drm/i915: Avoid GuC loading for now on Kabylake." Rodrigo Vivi
2016-06-30 16:37 ` [PATCH 2/2] i915/guc: Add Kabylake GuC Loading Rodrigo Vivi
@ 2016-07-01 5:20 ` Patchwork
2016-07-01 8:52 ` Tvrtko Ursulin
2016-07-04 10:23 ` Tvrtko Ursulin
1 sibling, 2 replies; 10+ messages in thread
From: Patchwork @ 2016-07-01 5:20 UTC (permalink / raw)
To: Rodrigo Vivi; +Cc: intel-gfx
== Series Details ==
Series: series starting with [1/2] Revert "drm/i915/kbl: drm/i915: Avoid GuC loading for now on Kabylake."
URL : https://patchwork.freedesktop.org/series/9332/
State : failure
== Summary ==
Series 9332v1 Series without cover letter
http://patchwork.freedesktop.org/api/1.0/series/9332/revisions/1/mbox
Test drv_hangman:
Subgroup error-state-basic:
pass -> FAIL (ro-skl3-i5-6260u)
Test drv_module_reload_basic:
dmesg-warn -> DMESG-FAIL (ro-skl3-i5-6260u)
Test gem_busy:
Subgroup basic-blt:
pass -> SKIP (ro-skl3-i5-6260u)
Subgroup basic-bsd:
pass -> SKIP (ro-skl3-i5-6260u)
Subgroup basic-bsd1:
pass -> SKIP (ro-skl3-i5-6260u)
Subgroup basic-bsd2:
pass -> SKIP (ro-skl3-i5-6260u)
Subgroup basic-parallel-blt:
pass -> SKIP (ro-skl3-i5-6260u)
Subgroup basic-parallel-bsd:
pass -> SKIP (ro-skl3-i5-6260u)
Subgroup basic-parallel-bsd1:
pass -> SKIP (ro-skl3-i5-6260u)
Subgroup basic-parallel-bsd2:
pass -> SKIP (ro-skl3-i5-6260u)
Subgroup basic-parallel-render:
pass -> SKIP (ro-skl3-i5-6260u)
Subgroup basic-parallel-vebox:
pass -> SKIP (ro-skl3-i5-6260u)
Subgroup basic-render:
pass -> SKIP (ro-skl3-i5-6260u)
Subgroup basic-vebox:
pass -> SKIP (ro-skl3-i5-6260u)
Test gem_cpu_reloc:
Subgroup basic:
pass -> FAIL (ro-skl3-i5-6260u)
Test gem_cs_tlb:
Subgroup basic-default:
pass -> FAIL (ro-skl3-i5-6260u)
Test gem_ctx_create:
Subgroup basic-files:
pass -> FAIL (ro-skl3-i5-6260u)
Test gem_ctx_exec:
Subgroup basic:
pass -> FAIL (ro-skl3-i5-6260u)
Test gem_ctx_switch:
Subgroup basic-default:
pass -> SKIP (ro-skl3-i5-6260u)
Test gem_exec_basic:
Subgroup basic-blt:
pass -> FAIL (ro-skl3-i5-6260u)
Subgroup basic-bsd:
pass -> FAIL (ro-skl3-i5-6260u)
Subgroup basic-bsd1:
pass -> FAIL (ro-skl3-i5-6260u)
Subgroup basic-bsd2:
pass -> FAIL (ro-skl3-i5-6260u)
Subgroup basic-default:
pass -> FAIL (ro-skl3-i5-6260u)
Subgroup basic-render:
pass -> FAIL (ro-skl3-i5-6260u)
Subgroup basic-vebox:
pass -> FAIL (ro-skl3-i5-6260u)
Subgroup gtt-blt:
pass -> FAIL (ro-skl3-i5-6260u)
Subgroup gtt-bsd:
pass -> FAIL (ro-skl3-i5-6260u)
Subgroup gtt-bsd1:
pass -> FAIL (ro-skl3-i5-6260u)
Subgroup gtt-bsd2:
pass -> FAIL (ro-skl3-i5-6260u)
Subgroup gtt-default:
pass -> FAIL (ro-skl3-i5-6260u)
Subgroup gtt-render:
pass -> FAIL (ro-skl3-i5-6260u)
Subgroup gtt-vebox:
pass -> FAIL (ro-skl3-i5-6260u)
Subgroup readonly-blt:
pass -> FAIL (ro-skl3-i5-6260u)
Subgroup readonly-bsd:
pass -> FAIL (ro-skl3-i5-6260u)
Subgroup readonly-bsd1:
pass -> FAIL (ro-skl3-i5-6260u)
Subgroup readonly-bsd2:
pass -> FAIL (ro-skl3-i5-6260u)
Subgroup readonly-default:
pass -> FAIL (ro-skl3-i5-6260u)
Subgroup readonly-render:
pass -> FAIL (ro-skl3-i5-6260u)
Subgroup readonly-vebox:
pass -> FAIL (ro-skl3-i5-6260u)
Test gem_exec_create:
Subgroup basic:
pass -> FAIL (ro-skl3-i5-6260u)
Test gem_exec_flush:
Subgroup basic-batch-kernel-default-cmd:
pass -> FAIL (ro-byt-n2820)
Subgroup basic-batch-kernel-default-uc:
pass -> FAIL (ro-skl3-i5-6260u)
Subgroup basic-batch-kernel-default-wb:
WARNING: Long output truncated
fi-hsw-i7-4770k failed to connect after reboot
ro-bdw-i7-5557U failed to connect after reboot
Results at /archive/results/CI_IGT_test/RO_Patchwork_1348/
b538380 drm-intel-nightly: 2016y-06m-30d-16h-21m-05s UTC integration manifest
1531fb6 i915/guc: Add Kabylake GuC Loading
b3f31a8 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: ✗ Ro.CI.BAT: failure for series starting with [1/2] Revert "drm/i915/kbl: drm/i915: Avoid GuC loading for now on Kabylake."
2016-07-01 5:20 ` ✗ Ro.CI.BAT: failure for series starting with [1/2] Revert "drm/i915/kbl: drm/i915: Avoid GuC loading for now on Kabylake." Patchwork
@ 2016-07-01 8:52 ` Tvrtko Ursulin
2016-07-01 8:56 ` Chris Wilson
2016-07-01 8:57 ` Tvrtko Ursulin
2016-07-04 10:23 ` Tvrtko Ursulin
1 sibling, 2 replies; 10+ messages in thread
From: Tvrtko Ursulin @ 2016-07-01 8:52 UTC (permalink / raw)
To: intel-gfx, Rodrigo Vivi
On 01/07/16 06:20, Patchwork wrote:
> == Series Details ==
>
> Series: series starting with [1/2] Revert "drm/i915/kbl: drm/i915: Avoid GuC loading for now on Kabylake."
> URL : https://patchwork.freedesktop.org/series/9332/
> State : failure
>
> == Summary ==
>
> Series 9332v1 Series without cover letter
> http://patchwork.freedesktop.org/api/1.0/series/9332/revisions/1/mbox
>
> Test drv_hangman:
> Subgroup error-state-basic:
> pass -> FAIL (ro-skl3-i5-6260u)
Looks like there is no firmware on the CI machine?
[ 8.232519] [drm:intel_guc_init] GuC firmware pending, path i915/skl_guc_ver6_1.bin
[ 8.232520] [drm:guc_fw_fetch] before requesting firmware: GuC fw fetch status PENDING
[ 8.232889] i915 0000:00:02.0: Direct firmware load for i915/skl_guc_ver6_1.bin failed with error -2
[ 8.232928] [drm:guc_fw_fetch] GuC fw fetch status FAIL; err -2, fw (null), obj (null)
[ 8.232959] [drm:intel_guc_init [i915]] *ERROR* Failed to fetch GuC firmware from i915/skl_guc_ver6_1.bin (error -2)
It used to be there I thought.
Regards,
Tvrtko
> Test drv_module_reload_basic:
> dmesg-warn -> DMESG-FAIL (ro-skl3-i5-6260u)
> Test gem_busy:
> Subgroup basic-blt:
> pass -> SKIP (ro-skl3-i5-6260u)
> Subgroup basic-bsd:
> pass -> SKIP (ro-skl3-i5-6260u)
> Subgroup basic-bsd1:
> pass -> SKIP (ro-skl3-i5-6260u)
> Subgroup basic-bsd2:
> pass -> SKIP (ro-skl3-i5-6260u)
> Subgroup basic-parallel-blt:
> pass -> SKIP (ro-skl3-i5-6260u)
> Subgroup basic-parallel-bsd:
> pass -> SKIP (ro-skl3-i5-6260u)
> Subgroup basic-parallel-bsd1:
> pass -> SKIP (ro-skl3-i5-6260u)
> Subgroup basic-parallel-bsd2:
> pass -> SKIP (ro-skl3-i5-6260u)
> Subgroup basic-parallel-render:
> pass -> SKIP (ro-skl3-i5-6260u)
> Subgroup basic-parallel-vebox:
> pass -> SKIP (ro-skl3-i5-6260u)
> Subgroup basic-render:
> pass -> SKIP (ro-skl3-i5-6260u)
> Subgroup basic-vebox:
> pass -> SKIP (ro-skl3-i5-6260u)
> Test gem_cpu_reloc:
> Subgroup basic:
> pass -> FAIL (ro-skl3-i5-6260u)
> Test gem_cs_tlb:
> Subgroup basic-default:
> pass -> FAIL (ro-skl3-i5-6260u)
> Test gem_ctx_create:
> Subgroup basic-files:
> pass -> FAIL (ro-skl3-i5-6260u)
> Test gem_ctx_exec:
> Subgroup basic:
> pass -> FAIL (ro-skl3-i5-6260u)
> Test gem_ctx_switch:
> Subgroup basic-default:
> pass -> SKIP (ro-skl3-i5-6260u)
> Test gem_exec_basic:
> Subgroup basic-blt:
> pass -> FAIL (ro-skl3-i5-6260u)
> Subgroup basic-bsd:
> pass -> FAIL (ro-skl3-i5-6260u)
> Subgroup basic-bsd1:
> pass -> FAIL (ro-skl3-i5-6260u)
> Subgroup basic-bsd2:
> pass -> FAIL (ro-skl3-i5-6260u)
> Subgroup basic-default:
> pass -> FAIL (ro-skl3-i5-6260u)
> Subgroup basic-render:
> pass -> FAIL (ro-skl3-i5-6260u)
> Subgroup basic-vebox:
> pass -> FAIL (ro-skl3-i5-6260u)
> Subgroup gtt-blt:
> pass -> FAIL (ro-skl3-i5-6260u)
> Subgroup gtt-bsd:
> pass -> FAIL (ro-skl3-i5-6260u)
> Subgroup gtt-bsd1:
> pass -> FAIL (ro-skl3-i5-6260u)
> Subgroup gtt-bsd2:
> pass -> FAIL (ro-skl3-i5-6260u)
> Subgroup gtt-default:
> pass -> FAIL (ro-skl3-i5-6260u)
> Subgroup gtt-render:
> pass -> FAIL (ro-skl3-i5-6260u)
> Subgroup gtt-vebox:
> pass -> FAIL (ro-skl3-i5-6260u)
> Subgroup readonly-blt:
> pass -> FAIL (ro-skl3-i5-6260u)
> Subgroup readonly-bsd:
> pass -> FAIL (ro-skl3-i5-6260u)
> Subgroup readonly-bsd1:
> pass -> FAIL (ro-skl3-i5-6260u)
> Subgroup readonly-bsd2:
> pass -> FAIL (ro-skl3-i5-6260u)
> Subgroup readonly-default:
> pass -> FAIL (ro-skl3-i5-6260u)
> Subgroup readonly-render:
> pass -> FAIL (ro-skl3-i5-6260u)
> Subgroup readonly-vebox:
> pass -> FAIL (ro-skl3-i5-6260u)
> Test gem_exec_create:
> Subgroup basic:
> pass -> FAIL (ro-skl3-i5-6260u)
> Test gem_exec_flush:
> Subgroup basic-batch-kernel-default-cmd:
> pass -> FAIL (ro-byt-n2820)
> Subgroup basic-batch-kernel-default-uc:
> pass -> FAIL (ro-skl3-i5-6260u)
> Subgroup basic-batch-kernel-default-wb:
> WARNING: Long output truncated
> fi-hsw-i7-4770k failed to connect after reboot
> ro-bdw-i7-5557U failed to connect after reboot
>
> Results at /archive/results/CI_IGT_test/RO_Patchwork_1348/
>
> b538380 drm-intel-nightly: 2016y-06m-30d-16h-21m-05s UTC integration manifest
> 1531fb6 i915/guc: Add Kabylake GuC Loading
> b3f31a8 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
>
_______________________________________________
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: ✗ Ro.CI.BAT: failure for series starting with [1/2] Revert "drm/i915/kbl: drm/i915: Avoid GuC loading for now on Kabylake."
2016-07-01 8:52 ` Tvrtko Ursulin
@ 2016-07-01 8:56 ` Chris Wilson
2016-07-01 8:57 ` Tvrtko Ursulin
1 sibling, 0 replies; 10+ messages in thread
From: Chris Wilson @ 2016-07-01 8:56 UTC (permalink / raw)
To: Tvrtko Ursulin; +Cc: intel-gfx, Rodrigo Vivi
On Fri, Jul 01, 2016 at 09:52:05AM +0100, Tvrtko Ursulin wrote:
>
> On 01/07/16 06:20, Patchwork wrote:
> > == Series Details ==
> >
> > Series: series starting with [1/2] Revert "drm/i915/kbl: drm/i915: Avoid GuC loading for now on Kabylake."
> > URL : https://patchwork.freedesktop.org/series/9332/
> > State : failure
> >
> > == Summary ==
> >
> > Series 9332v1 Series without cover letter
> > http://patchwork.freedesktop.org/api/1.0/series/9332/revisions/1/mbox
> >
> > Test drv_hangman:
> > Subgroup error-state-basic:
> > pass -> FAIL (ro-skl3-i5-6260u)
>
> Looks like there is no firmware on the CI machine?
>
> [ 8.232519] [drm:intel_guc_init] GuC firmware pending, path i915/skl_guc_ver6_1.bin
> [ 8.232520] [drm:guc_fw_fetch] before requesting firmware: GuC fw fetch status PENDING
> [ 8.232889] i915 0000:00:02.0: Direct firmware load for i915/skl_guc_ver6_1.bin failed with error -2
> [ 8.232928] [drm:guc_fw_fetch] GuC fw fetch status FAIL; err -2, fw (null), obj (null)
> [ 8.232959] [drm:intel_guc_init [i915]] *ERROR* Failed to fetch GuC firmware from i915/skl_guc_ver6_1.bin (error -2)
>
> It used to be there I thought.
Also, we still appear to be emitting an *ERROR* for what is handled, and
considering the volatility of the firmware, the norm.
Does the guc not yet emit the instructions on where to find the
firmware [01.org]?
-Chris
--
Chris Wilson, Intel Open Source Technology Centre
_______________________________________________
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: ✗ Ro.CI.BAT: failure for series starting with [1/2] Revert "drm/i915/kbl: drm/i915: Avoid GuC loading for now on Kabylake."
2016-07-01 8:52 ` Tvrtko Ursulin
2016-07-01 8:56 ` Chris Wilson
@ 2016-07-01 8:57 ` Tvrtko Ursulin
1 sibling, 0 replies; 10+ messages in thread
From: Tvrtko Ursulin @ 2016-07-01 8:57 UTC (permalink / raw)
To: intel-gfx, Rodrigo Vivi
On 01/07/16 09:52, Tvrtko Ursulin wrote:
>
> On 01/07/16 06:20, Patchwork wrote:
>> == Series Details ==
>>
>> Series: series starting with [1/2] Revert "drm/i915/kbl: drm/i915: Avoid GuC loading for now on Kabylake."
>> URL : https://patchwork.freedesktop.org/series/9332/
>> State : failure
>>
>> == Summary ==
>>
>> Series 9332v1 Series without cover letter
>> http://patchwork.freedesktop.org/api/1.0/series/9332/revisions/1/mbox
>>
>> Test drv_hangman:
>> Subgroup error-state-basic:
>> pass -> FAIL (ro-skl3-i5-6260u)
>
> Looks like there is no firmware on the CI machine?
>
> [ 8.232519] [drm:intel_guc_init] GuC firmware pending, path i915/skl_guc_ver6_1.bin
> [ 8.232520] [drm:guc_fw_fetch] before requesting firmware: GuC fw fetch status PENDING
> [ 8.232889] i915 0000:00:02.0: Direct firmware load for i915/skl_guc_ver6_1.bin failed with error -2
> [ 8.232928] [drm:guc_fw_fetch] GuC fw fetch status FAIL; err -2, fw (null), obj (null)
> [ 8.232959] [drm:intel_guc_init [i915]] *ERROR* Failed to fetch GuC firmware from i915/skl_guc_ver6_1.bin (error -2)
>
> It used to be there I thought.
Also because later it goes:
[ 8.235600] [drm:intel_guc_setup [i915]] *ERROR* GuC firmware load failed: -5
[ 8.235625] [drm:intel_guc_setup [i915]] *ERROR* GuC init failed: -5
[ 8.235658] [drm:i915_gem_init [i915]] *ERROR* Failed to initialize GPU, declaring it wedged
That would mean either i915.enable_guc_loading or i915.enable_guc_submission
are set to 2 on that machine. It is not in grub, maybe in module options?
Regards,
Tvrtko
_______________________________________________
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-30 16:37 ` [PATCH 2/2] i915/guc: Add Kabylake GuC Loading Rodrigo Vivi
@ 2016-07-01 13:06 ` Michel Thierry
0 siblings, 0 replies; 10+ messages in thread
From: Michel Thierry @ 2016-07-01 13:06 UTC (permalink / raw)
To: Rodrigo Vivi, intel-gfx
On 6/30/2016 5:37 PM, Rodrigo Vivi wrote:
> From: Peter Antoine <peter.antoine@intel.com>
>
> This patch added the loading of the GuC for Kabylake.
> It loads a 9.14 firmware.
Hello, in case you need a fresh r-b for v3:
>
> v2: Fix commit message
> v3: Fix major/minor var names to match -nightly. (Rodrigo)
>
> Cc: Christophe Prigent <christophe.prigent@intel.com>
> Signed-off-by: Peter Antoine <peter.antoine@intel.com>
> Signed-off-by: Michel Thierry <michel.thierry@intel.com>
> Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
> Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Reviewed-by: Michel Thierry <michel.thierry@intel.com> (v3)
> ---
> 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 4f6311a..d80b617 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_14.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)
> {
> @@ -698,6 +701,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: ✗ Ro.CI.BAT: failure for series starting with [1/2] Revert "drm/i915/kbl: drm/i915: Avoid GuC loading for now on Kabylake."
2016-07-01 5:20 ` ✗ Ro.CI.BAT: failure for series starting with [1/2] Revert "drm/i915/kbl: drm/i915: Avoid GuC loading for now on Kabylake." Patchwork
2016-07-01 8:52 ` Tvrtko Ursulin
@ 2016-07-04 10:23 ` Tvrtko Ursulin
1 sibling, 0 replies; 10+ messages in thread
From: Tvrtko Ursulin @ 2016-07-04 10:23 UTC (permalink / raw)
To: intel-gfx, Rodrigo Vivi
On 01/07/16 06:20, Patchwork wrote:
> == Series Details ==
>
> Series: series starting with [1/2] Revert "drm/i915/kbl: drm/i915: Avoid GuC loading for now on Kabylake."
> URL : https://patchwork.freedesktop.org/series/9332/
> State : failure
>
> == Summary ==
>
> Series 9332v1 Series without cover letter
> http://patchwork.freedesktop.org/api/1.0/series/9332/revisions/1/mbox
>
> Test drv_hangman:
> Subgroup error-state-basic:
> pass -> FAIL (ro-skl3-i5-6260u)
> Test drv_module_reload_basic:
> dmesg-warn -> DMESG-FAIL (ro-skl3-i5-6260u)
> Test gem_busy:
> Subgroup basic-blt:
> pass -> SKIP (ro-skl3-i5-6260u)
> Subgroup basic-bsd:
> pass -> SKIP (ro-skl3-i5-6260u)
> Subgroup basic-bsd1:
> pass -> SKIP (ro-skl3-i5-6260u)
> Subgroup basic-bsd2:
> pass -> SKIP (ro-skl3-i5-6260u)
> Subgroup basic-parallel-blt:
> pass -> SKIP (ro-skl3-i5-6260u)
> Subgroup basic-parallel-bsd:
> pass -> SKIP (ro-skl3-i5-6260u)
> Subgroup basic-parallel-bsd1:
> pass -> SKIP (ro-skl3-i5-6260u)
> Subgroup basic-parallel-bsd2:
> pass -> SKIP (ro-skl3-i5-6260u)
> Subgroup basic-parallel-render:
> pass -> SKIP (ro-skl3-i5-6260u)
> Subgroup basic-parallel-vebox:
> pass -> SKIP (ro-skl3-i5-6260u)
> Subgroup basic-render:
> pass -> SKIP (ro-skl3-i5-6260u)
> Subgroup basic-vebox:
> pass -> SKIP (ro-skl3-i5-6260u)
> Test gem_cpu_reloc:
> Subgroup basic:
> pass -> FAIL (ro-skl3-i5-6260u)
> Test gem_cs_tlb:
> Subgroup basic-default:
> pass -> FAIL (ro-skl3-i5-6260u)
> Test gem_ctx_create:
> Subgroup basic-files:
> pass -> FAIL (ro-skl3-i5-6260u)
> Test gem_ctx_exec:
> Subgroup basic:
> pass -> FAIL (ro-skl3-i5-6260u)
> Test gem_ctx_switch:
> Subgroup basic-default:
> pass -> SKIP (ro-skl3-i5-6260u)
> Test gem_exec_basic:
> Subgroup basic-blt:
> pass -> FAIL (ro-skl3-i5-6260u)
> Subgroup basic-bsd:
> pass -> FAIL (ro-skl3-i5-6260u)
> Subgroup basic-bsd1:
> pass -> FAIL (ro-skl3-i5-6260u)
> Subgroup basic-bsd2:
> pass -> FAIL (ro-skl3-i5-6260u)
> Subgroup basic-default:
> pass -> FAIL (ro-skl3-i5-6260u)
> Subgroup basic-render:
> pass -> FAIL (ro-skl3-i5-6260u)
> Subgroup basic-vebox:
> pass -> FAIL (ro-skl3-i5-6260u)
> Subgroup gtt-blt:
> pass -> FAIL (ro-skl3-i5-6260u)
> Subgroup gtt-bsd:
> pass -> FAIL (ro-skl3-i5-6260u)
> Subgroup gtt-bsd1:
> pass -> FAIL (ro-skl3-i5-6260u)
> Subgroup gtt-bsd2:
> pass -> FAIL (ro-skl3-i5-6260u)
> Subgroup gtt-default:
> pass -> FAIL (ro-skl3-i5-6260u)
> Subgroup gtt-render:
> pass -> FAIL (ro-skl3-i5-6260u)
> Subgroup gtt-vebox:
> pass -> FAIL (ro-skl3-i5-6260u)
> Subgroup readonly-blt:
> pass -> FAIL (ro-skl3-i5-6260u)
> Subgroup readonly-bsd:
> pass -> FAIL (ro-skl3-i5-6260u)
> Subgroup readonly-bsd1:
> pass -> FAIL (ro-skl3-i5-6260u)
> Subgroup readonly-bsd2:
> pass -> FAIL (ro-skl3-i5-6260u)
> Subgroup readonly-default:
> pass -> FAIL (ro-skl3-i5-6260u)
> Subgroup readonly-render:
> pass -> FAIL (ro-skl3-i5-6260u)
> Subgroup readonly-vebox:
> pass -> FAIL (ro-skl3-i5-6260u)
> Test gem_exec_create:
> Subgroup basic:
> pass -> FAIL (ro-skl3-i5-6260u)
> Test gem_exec_flush:
> Subgroup basic-batch-kernel-default-cmd:
> pass -> FAIL (ro-byt-n2820)
> Subgroup basic-batch-kernel-default-uc:
> pass -> FAIL (ro-skl3-i5-6260u)
> Subgroup basic-batch-kernel-default-wb:
> WARNING: Long output truncated
> fi-hsw-i7-4770k failed to connect after reboot
> ro-bdw-i7-5557U failed to connect after reboot
>
> Results at /archive/results/CI_IGT_test/RO_Patchwork_1348/
>
> b538380 drm-intel-nightly: 2016y-06m-30d-16h-21m-05s UTC integration manifest
> 1531fb6 i915/guc: Add Kabylake GuC Loading
> b3f31a8 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
>
I've decided to ignore the obviously irrelevant configuration failure
and have merged this to dinq.
Regards,
Tvrtko
_______________________________________________
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
* [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
0 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
end of thread, other threads:[~2016-07-04 10:23 UTC | newest]
Thread overview: 10+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-06-30 16:37 [PATCH 1/2] Revert "drm/i915/kbl: drm/i915: Avoid GuC loading for now on Kabylake." Rodrigo Vivi
2016-06-30 16:37 ` [PATCH 2/2] i915/guc: Add Kabylake GuC Loading Rodrigo Vivi
2016-07-01 13:06 ` Michel Thierry
2016-07-01 5:20 ` ✗ Ro.CI.BAT: failure for series starting with [1/2] Revert "drm/i915/kbl: drm/i915: Avoid GuC loading for now on Kabylake." Patchwork
2016-07-01 8:52 ` Tvrtko Ursulin
2016-07-01 8:56 ` Chris Wilson
2016-07-01 8:57 ` Tvrtko Ursulin
2016-07-04 10:23 ` Tvrtko Ursulin
-- strict thread matches above, loose matches on Subject: below --
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
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.