diff mbox

[1/2] Revert "drm/i915/kbl: drm/i915: Avoid GuC loading for now on Kabylake."

Message ID 1467304672-2106-1-git-send-email-rodrigo.vivi@intel.com (mailing list archive)
State New, archived
Headers show

Commit Message

Rodrigo Vivi June 30, 2016, 4:37 p.m. UTC 
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(-)

Comments

Tvrtko Ursulin July 1, 2016, 8:52 a.m. UTC | #1 
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
>
Chris Wilson July 1, 2016, 8:56 a.m. UTC | #2 
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
Tvrtko Ursulin July 1, 2016, 8:57 a.m. UTC | #3 
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
Tvrtko Ursulin July 4, 2016, 10:23 a.m. UTC | #4 
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
diff mbox

Patch

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))