* [Intel-gfx] [PATCH] drm/i915/dg2: make GuC FW a requirement for Gen12 and beyond devices @ 2021-12-07 17:53 ` Adrian Larumbe 0 siblings, 0 replies; 10+ messages in thread From: Adrian Larumbe @ 2021-12-07 17:53 UTC (permalink / raw) To: daniel, ramalingam.c, intel-gfx, dri-devel; +Cc: adrian.larumbe, daniels Beginning with DG2, all successive devices will require GuC FW to be present and loaded at probe() time. This change alters error handling in the FW init and load functions so that the driver's probe() function will fail if GuC could not be loaded. Signed-off-by: Adrian Larumbe <adrian.larumbe@collabora.com> --- drivers/gpu/drm/i915/gt/uc/intel_uc.c | 20 ++++++++++++++++---- drivers/gpu/drm/i915/gt/uc/intel_uc.h | 4 ++-- drivers/gpu/drm/i915/i915_gem.c | 7 ++++++- 3 files changed, 24 insertions(+), 7 deletions(-) diff --git a/drivers/gpu/drm/i915/gt/uc/intel_uc.c b/drivers/gpu/drm/i915/gt/uc/intel_uc.c index 7660eba893fa..8b0778b6d9ab 100644 --- a/drivers/gpu/drm/i915/gt/uc/intel_uc.c +++ b/drivers/gpu/drm/i915/gt/uc/intel_uc.c @@ -277,14 +277,19 @@ static void guc_disable_communication(struct intel_guc *guc) drm_dbg(&i915->drm, "GuC communication disabled\n"); } -static void __uc_fetch_firmwares(struct intel_uc *uc) +static int __uc_fetch_firmwares(struct intel_uc *uc) { + struct drm_i915_private *i915 = uc_to_gt(uc)->i915; int err; GEM_BUG_ON(!intel_uc_wants_guc(uc)); err = intel_uc_fw_fetch(&uc->guc.fw); if (err) { + /* GuC is mandatory on Gen12 and beyond */ + if (GRAPHICS_VER(i915) >= 12) + return err; + /* Make sure we transition out of transient "SELECTED" state */ if (intel_uc_wants_huc(uc)) { drm_dbg(&uc_to_gt(uc)->i915->drm, @@ -293,11 +298,13 @@ static void __uc_fetch_firmwares(struct intel_uc *uc) INTEL_UC_FIRMWARE_ERROR); } - return; + return 0; } if (intel_uc_wants_huc(uc)) intel_uc_fw_fetch(&uc->huc.fw); + + return 0; } static void __uc_cleanup_firmwares(struct intel_uc *uc) @@ -308,14 +315,19 @@ static void __uc_cleanup_firmwares(struct intel_uc *uc) static int __uc_init(struct intel_uc *uc) { + struct drm_i915_private *i915 = uc_to_gt(uc)->i915; struct intel_guc *guc = &uc->guc; struct intel_huc *huc = &uc->huc; int ret; GEM_BUG_ON(!intel_uc_wants_guc(uc)); - if (!intel_uc_uses_guc(uc)) - return 0; + if (!intel_uc_uses_guc(uc)) { + if (GRAPHICS_VER(i915) >= 12) + return -EINVAL; + else + return 0; + } if (i915_inject_probe_failure(uc_to_gt(uc)->i915)) return -ENOMEM; diff --git a/drivers/gpu/drm/i915/gt/uc/intel_uc.h b/drivers/gpu/drm/i915/gt/uc/intel_uc.h index 866b462821c0..3bcd781447bc 100644 --- a/drivers/gpu/drm/i915/gt/uc/intel_uc.h +++ b/drivers/gpu/drm/i915/gt/uc/intel_uc.h @@ -17,7 +17,7 @@ struct intel_uc; struct intel_uc_ops { int (*sanitize)(struct intel_uc *uc); - void (*init_fw)(struct intel_uc *uc); + int (*init_fw)(struct intel_uc *uc); void (*fini_fw)(struct intel_uc *uc); int (*init)(struct intel_uc *uc); void (*fini)(struct intel_uc *uc); @@ -104,7 +104,7 @@ static inline _TYPE intel_uc_##_NAME(struct intel_uc *uc) \ return _RET; \ } intel_uc_ops_function(sanitize, sanitize, int, 0); -intel_uc_ops_function(fetch_firmwares, init_fw, void, ); +intel_uc_ops_function(fetch_firmwares, init_fw, int, 0); intel_uc_ops_function(cleanup_firmwares, fini_fw, void, ); intel_uc_ops_function(init, init, int, 0); intel_uc_ops_function(fini, fini, void, ); diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c index 527228d4da7e..7f8204af6826 100644 --- a/drivers/gpu/drm/i915/i915_gem.c +++ b/drivers/gpu/drm/i915/i915_gem.c @@ -1049,7 +1049,12 @@ int i915_gem_init(struct drm_i915_private *dev_priv) if (ret) return ret; - intel_uc_fetch_firmwares(&dev_priv->gt.uc); + ret = intel_uc_fetch_firmwares(&dev_priv->gt.uc); + if (ret) { + i915_probe_error(dev_priv, "Failed to fetch firmware\n"); + return ret; + } + intel_wopcm_init(&dev_priv->wopcm); ret = i915_init_ggtt(dev_priv); -- 2.34.1 ^ permalink raw reply related [flat|nested] 10+ messages in thread
* [PATCH] drm/i915/dg2: make GuC FW a requirement for Gen12 and beyond devices @ 2021-12-07 17:53 ` Adrian Larumbe 0 siblings, 0 replies; 10+ messages in thread From: Adrian Larumbe @ 2021-12-07 17:53 UTC (permalink / raw) To: daniel, ramalingam.c, intel-gfx, dri-devel Cc: bob.beckett, adrian.larumbe, daniels Beginning with DG2, all successive devices will require GuC FW to be present and loaded at probe() time. This change alters error handling in the FW init and load functions so that the driver's probe() function will fail if GuC could not be loaded. Signed-off-by: Adrian Larumbe <adrian.larumbe@collabora.com> --- drivers/gpu/drm/i915/gt/uc/intel_uc.c | 20 ++++++++++++++++---- drivers/gpu/drm/i915/gt/uc/intel_uc.h | 4 ++-- drivers/gpu/drm/i915/i915_gem.c | 7 ++++++- 3 files changed, 24 insertions(+), 7 deletions(-) diff --git a/drivers/gpu/drm/i915/gt/uc/intel_uc.c b/drivers/gpu/drm/i915/gt/uc/intel_uc.c index 7660eba893fa..8b0778b6d9ab 100644 --- a/drivers/gpu/drm/i915/gt/uc/intel_uc.c +++ b/drivers/gpu/drm/i915/gt/uc/intel_uc.c @@ -277,14 +277,19 @@ static void guc_disable_communication(struct intel_guc *guc) drm_dbg(&i915->drm, "GuC communication disabled\n"); } -static void __uc_fetch_firmwares(struct intel_uc *uc) +static int __uc_fetch_firmwares(struct intel_uc *uc) { + struct drm_i915_private *i915 = uc_to_gt(uc)->i915; int err; GEM_BUG_ON(!intel_uc_wants_guc(uc)); err = intel_uc_fw_fetch(&uc->guc.fw); if (err) { + /* GuC is mandatory on Gen12 and beyond */ + if (GRAPHICS_VER(i915) >= 12) + return err; + /* Make sure we transition out of transient "SELECTED" state */ if (intel_uc_wants_huc(uc)) { drm_dbg(&uc_to_gt(uc)->i915->drm, @@ -293,11 +298,13 @@ static void __uc_fetch_firmwares(struct intel_uc *uc) INTEL_UC_FIRMWARE_ERROR); } - return; + return 0; } if (intel_uc_wants_huc(uc)) intel_uc_fw_fetch(&uc->huc.fw); + + return 0; } static void __uc_cleanup_firmwares(struct intel_uc *uc) @@ -308,14 +315,19 @@ static void __uc_cleanup_firmwares(struct intel_uc *uc) static int __uc_init(struct intel_uc *uc) { + struct drm_i915_private *i915 = uc_to_gt(uc)->i915; struct intel_guc *guc = &uc->guc; struct intel_huc *huc = &uc->huc; int ret; GEM_BUG_ON(!intel_uc_wants_guc(uc)); - if (!intel_uc_uses_guc(uc)) - return 0; + if (!intel_uc_uses_guc(uc)) { + if (GRAPHICS_VER(i915) >= 12) + return -EINVAL; + else + return 0; + } if (i915_inject_probe_failure(uc_to_gt(uc)->i915)) return -ENOMEM; diff --git a/drivers/gpu/drm/i915/gt/uc/intel_uc.h b/drivers/gpu/drm/i915/gt/uc/intel_uc.h index 866b462821c0..3bcd781447bc 100644 --- a/drivers/gpu/drm/i915/gt/uc/intel_uc.h +++ b/drivers/gpu/drm/i915/gt/uc/intel_uc.h @@ -17,7 +17,7 @@ struct intel_uc; struct intel_uc_ops { int (*sanitize)(struct intel_uc *uc); - void (*init_fw)(struct intel_uc *uc); + int (*init_fw)(struct intel_uc *uc); void (*fini_fw)(struct intel_uc *uc); int (*init)(struct intel_uc *uc); void (*fini)(struct intel_uc *uc); @@ -104,7 +104,7 @@ static inline _TYPE intel_uc_##_NAME(struct intel_uc *uc) \ return _RET; \ } intel_uc_ops_function(sanitize, sanitize, int, 0); -intel_uc_ops_function(fetch_firmwares, init_fw, void, ); +intel_uc_ops_function(fetch_firmwares, init_fw, int, 0); intel_uc_ops_function(cleanup_firmwares, fini_fw, void, ); intel_uc_ops_function(init, init, int, 0); intel_uc_ops_function(fini, fini, void, ); diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c index 527228d4da7e..7f8204af6826 100644 --- a/drivers/gpu/drm/i915/i915_gem.c +++ b/drivers/gpu/drm/i915/i915_gem.c @@ -1049,7 +1049,12 @@ int i915_gem_init(struct drm_i915_private *dev_priv) if (ret) return ret; - intel_uc_fetch_firmwares(&dev_priv->gt.uc); + ret = intel_uc_fetch_firmwares(&dev_priv->gt.uc); + if (ret) { + i915_probe_error(dev_priv, "Failed to fetch firmware\n"); + return ret; + } + intel_wopcm_init(&dev_priv->wopcm); ret = i915_init_ggtt(dev_priv); -- 2.34.1 ^ permalink raw reply related [flat|nested] 10+ messages in thread
* [Intel-gfx] ✗ Fi.CI.SPARSE: warning for drm/i915/dg2: make GuC FW a requirement for Gen12 and beyond devices 2021-12-07 17:53 ` Adrian Larumbe (?) @ 2021-12-07 21:42 ` Patchwork -1 siblings, 0 replies; 10+ messages in thread From: Patchwork @ 2021-12-07 21:42 UTC (permalink / raw) To: Adrian Larumbe; +Cc: intel-gfx == Series Details == Series: drm/i915/dg2: make GuC FW a requirement for Gen12 and beyond devices URL : https://patchwork.freedesktop.org/series/97676/ State : warning == Summary == $ dim sparse --fast origin/drm-tip Sparse version: v0.6.2 Fast mode used, each commit won't be checked separately. ^ permalink raw reply [flat|nested] 10+ messages in thread
* [Intel-gfx] ✓ Fi.CI.BAT: success for drm/i915/dg2: make GuC FW a requirement for Gen12 and beyond devices 2021-12-07 17:53 ` Adrian Larumbe (?) (?) @ 2021-12-07 22:12 ` Patchwork -1 siblings, 0 replies; 10+ messages in thread From: Patchwork @ 2021-12-07 22:12 UTC (permalink / raw) To: Adrian Larumbe; +Cc: intel-gfx [-- Attachment #1: Type: text/plain, Size: 7984 bytes --] == Series Details == Series: drm/i915/dg2: make GuC FW a requirement for Gen12 and beyond devices URL : https://patchwork.freedesktop.org/series/97676/ State : success == Summary == CI Bug Log - changes from CI_DRM_10970 -> Patchwork_21777 ==================================================== Summary ------- **SUCCESS** No regressions found. External URL: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21777/index.html Participating hosts (42 -> 33) ------------------------------ Additional (1): fi-kbl-soraka Missing (10): bat-dg1-6 bat-dg1-5 fi-hsw-4200u fi-bsw-cyan bat-adlp-6 bat-adlp-4 fi-ctg-p8600 fi-bdw-samus bat-jsl-2 bat-jsl-1 Known issues ------------ Here are the changes found in Patchwork_21777 that come from known issues: ### IGT changes ### #### Issues hit #### * igt@gem_exec_fence@basic-busy@bcs0: - fi-kbl-soraka: NOTRUN -> [SKIP][1] ([fdo#109271]) +8 similar issues [1]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21777/fi-kbl-soraka/igt@gem_exec_fence@basic-busy@bcs0.html * igt@gem_exec_suspend@basic-s3: - fi-bdw-5557u: [PASS][2] -> [INCOMPLETE][3] ([i915#146]) [2]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10970/fi-bdw-5557u/igt@gem_exec_suspend@basic-s3.html [3]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21777/fi-bdw-5557u/igt@gem_exec_suspend@basic-s3.html * igt@gem_huc_copy@huc-copy: - fi-skl-6600u: NOTRUN -> [SKIP][4] ([fdo#109271] / [i915#2190]) [4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21777/fi-skl-6600u/igt@gem_huc_copy@huc-copy.html - fi-kbl-soraka: NOTRUN -> [SKIP][5] ([fdo#109271] / [i915#2190]) [5]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21777/fi-kbl-soraka/igt@gem_huc_copy@huc-copy.html * igt@gem_lmem_swapping@basic: - fi-kbl-soraka: NOTRUN -> [SKIP][6] ([fdo#109271] / [i915#4613]) +3 similar issues [6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21777/fi-kbl-soraka/igt@gem_lmem_swapping@basic.html * igt@gem_lmem_swapping@verify-random: - fi-skl-6600u: NOTRUN -> [SKIP][7] ([fdo#109271] / [i915#4613]) +3 similar issues [7]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21777/fi-skl-6600u/igt@gem_lmem_swapping@verify-random.html * igt@i915_selftest@live@gt_engines: - fi-rkl-guc: [PASS][8] -> [INCOMPLETE][9] ([i915#4432]) [8]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10970/fi-rkl-guc/igt@i915_selftest@live@gt_engines.html [9]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21777/fi-rkl-guc/igt@i915_selftest@live@gt_engines.html * igt@i915_selftest@live@gt_pm: - fi-kbl-soraka: NOTRUN -> [DMESG-FAIL][10] ([i915#1886] / [i915#2291]) [10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21777/fi-kbl-soraka/igt@i915_selftest@live@gt_pm.html * igt@kms_chamelium@common-hpd-after-suspend: - fi-kbl-soraka: NOTRUN -> [SKIP][11] ([fdo#109271] / [fdo#111827]) +8 similar issues [11]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21777/fi-kbl-soraka/igt@kms_chamelium@common-hpd-after-suspend.html * igt@kms_chamelium@vga-edid-read: - fi-skl-6600u: NOTRUN -> [SKIP][12] ([fdo#109271] / [fdo#111827]) +8 similar issues [12]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21777/fi-skl-6600u/igt@kms_chamelium@vga-edid-read.html * igt@kms_cursor_legacy@basic-busy-flip-before-cursor-legacy: - fi-skl-6600u: NOTRUN -> [SKIP][13] ([fdo#109271]) +2 similar issues [13]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21777/fi-skl-6600u/igt@kms_cursor_legacy@basic-busy-flip-before-cursor-legacy.html * igt@kms_frontbuffer_tracking@basic: - fi-cml-u2: [PASS][14] -> [DMESG-WARN][15] ([i915#4269]) [14]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10970/fi-cml-u2/igt@kms_frontbuffer_tracking@basic.html [15]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21777/fi-cml-u2/igt@kms_frontbuffer_tracking@basic.html * igt@kms_pipe_crc_basic@compare-crc-sanitycheck-pipe-d: - fi-skl-6600u: NOTRUN -> [SKIP][16] ([fdo#109271] / [i915#533]) [16]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21777/fi-skl-6600u/igt@kms_pipe_crc_basic@compare-crc-sanitycheck-pipe-d.html - fi-kbl-soraka: NOTRUN -> [SKIP][17] ([fdo#109271] / [i915#533]) [17]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21777/fi-kbl-soraka/igt@kms_pipe_crc_basic@compare-crc-sanitycheck-pipe-d.html * igt@kms_psr@primary_page_flip: - fi-skl-6600u: NOTRUN -> [FAIL][18] ([i915#4547]) [18]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21777/fi-skl-6600u/igt@kms_psr@primary_page_flip.html * igt@runner@aborted: - fi-rkl-guc: NOTRUN -> [FAIL][19] ([i915#3928] / [i915#4312]) [19]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21777/fi-rkl-guc/igt@runner@aborted.html #### Possible fixes #### * igt@gem_exec_suspend@basic-s3: - fi-tgl-1115g4: [FAIL][20] ([i915#1888]) -> [PASS][21] [20]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10970/fi-tgl-1115g4/igt@gem_exec_suspend@basic-s3.html [21]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21777/fi-tgl-1115g4/igt@gem_exec_suspend@basic-s3.html * igt@gem_flink_basic@bad-flink: - fi-skl-6600u: [FAIL][22] ([i915#4547]) -> [PASS][23] [22]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10970/fi-skl-6600u/igt@gem_flink_basic@bad-flink.html [23]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21777/fi-skl-6600u/igt@gem_flink_basic@bad-flink.html * igt@kms_frontbuffer_tracking@basic: - fi-cfl-8109u: [DMESG-FAIL][24] ([i915#295]) -> [PASS][25] [24]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10970/fi-cfl-8109u/igt@kms_frontbuffer_tracking@basic.html [25]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21777/fi-cfl-8109u/igt@kms_frontbuffer_tracking@basic.html * igt@kms_pipe_crc_basic@compare-crc-sanitycheck-pipe-b: - fi-cfl-8109u: [DMESG-WARN][26] ([i915#295]) -> [PASS][27] +10 similar issues [26]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10970/fi-cfl-8109u/igt@kms_pipe_crc_basic@compare-crc-sanitycheck-pipe-b.html [27]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21777/fi-cfl-8109u/igt@kms_pipe_crc_basic@compare-crc-sanitycheck-pipe-b.html [fdo#109271]: https://bugs.freedesktop.org/show_bug.cgi?id=109271 [fdo#111827]: https://bugs.freedesktop.org/show_bug.cgi?id=111827 [i915#146]: https://gitlab.freedesktop.org/drm/intel/issues/146 [i915#1886]: https://gitlab.freedesktop.org/drm/intel/issues/1886 [i915#1888]: https://gitlab.freedesktop.org/drm/intel/issues/1888 [i915#2190]: https://gitlab.freedesktop.org/drm/intel/issues/2190 [i915#2291]: https://gitlab.freedesktop.org/drm/intel/issues/2291 [i915#295]: https://gitlab.freedesktop.org/drm/intel/issues/295 [i915#3928]: https://gitlab.freedesktop.org/drm/intel/issues/3928 [i915#4269]: https://gitlab.freedesktop.org/drm/intel/issues/4269 [i915#4312]: https://gitlab.freedesktop.org/drm/intel/issues/4312 [i915#4432]: https://gitlab.freedesktop.org/drm/intel/issues/4432 [i915#4547]: https://gitlab.freedesktop.org/drm/intel/issues/4547 [i915#4613]: https://gitlab.freedesktop.org/drm/intel/issues/4613 [i915#533]: https://gitlab.freedesktop.org/drm/intel/issues/533 Build changes ------------- * Linux: CI_DRM_10970 -> Patchwork_21777 CI-20190529: 20190529 CI_DRM_10970: 9368928e088bcfb4bebd54c2ae18603988f40c26 @ git://anongit.freedesktop.org/gfx-ci/linux IGT_6301: dcf994172ae04d57adc851668c39e37945f195fb @ https://gitlab.freedesktop.org/drm/igt-gpu-tools.git Patchwork_21777: 07a183caaed8b59aece94c51d165188337d52838 @ git://anongit.freedesktop.org/gfx-ci/linux == Linux commits == 07a183caaed8 drm/i915/dg2: make GuC FW a requirement for Gen12 and beyond devices == Logs == For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21777/index.html [-- Attachment #2: Type: text/html, Size: 10067 bytes --] ^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [Intel-gfx] [PATCH] drm/i915/dg2: make GuC FW a requirement for Gen12 and beyond devices 2021-12-07 17:53 ` Adrian Larumbe ` (2 preceding siblings ...) (?) @ 2021-12-07 23:15 ` John Harrison 2021-12-08 17:58 ` Robert Beckett -1 siblings, 1 reply; 10+ messages in thread From: John Harrison @ 2021-12-07 23:15 UTC (permalink / raw) To: Adrian Larumbe, daniel, ramalingam.c, intel-gfx, dri-devel; +Cc: daniels On 12/7/2021 09:53, Adrian Larumbe wrote: > Beginning with DG2, all successive devices will require GuC FW to be > present and loaded at probe() time. This change alters error handling in > the FW init and load functions so that the driver's probe() function will > fail if GuC could not be loaded. We still need to load the i915 driver in fall back mode (display but no engines) if the GuC is missing. Otherwise you may have just bricked the user's device. Also, we do want to be able to disable the GuC via the enable_guc module parameter. John. > Signed-off-by: Adrian Larumbe <adrian.larumbe@collabora.com> > --- > drivers/gpu/drm/i915/gt/uc/intel_uc.c | 20 ++++++++++++++++---- > drivers/gpu/drm/i915/gt/uc/intel_uc.h | 4 ++-- > drivers/gpu/drm/i915/i915_gem.c | 7 ++++++- > 3 files changed, 24 insertions(+), 7 deletions(-) > > diff --git a/drivers/gpu/drm/i915/gt/uc/intel_uc.c b/drivers/gpu/drm/i915/gt/uc/intel_uc.c > index 7660eba893fa..8b0778b6d9ab 100644 > --- a/drivers/gpu/drm/i915/gt/uc/intel_uc.c > +++ b/drivers/gpu/drm/i915/gt/uc/intel_uc.c > @@ -277,14 +277,19 @@ static void guc_disable_communication(struct intel_guc *guc) > drm_dbg(&i915->drm, "GuC communication disabled\n"); > } > > -static void __uc_fetch_firmwares(struct intel_uc *uc) > +static int __uc_fetch_firmwares(struct intel_uc *uc) > { > + struct drm_i915_private *i915 = uc_to_gt(uc)->i915; > int err; > > GEM_BUG_ON(!intel_uc_wants_guc(uc)); > > err = intel_uc_fw_fetch(&uc->guc.fw); > if (err) { > + /* GuC is mandatory on Gen12 and beyond */ > + if (GRAPHICS_VER(i915) >= 12) > + return err; > + > /* Make sure we transition out of transient "SELECTED" state */ > if (intel_uc_wants_huc(uc)) { > drm_dbg(&uc_to_gt(uc)->i915->drm, > @@ -293,11 +298,13 @@ static void __uc_fetch_firmwares(struct intel_uc *uc) > INTEL_UC_FIRMWARE_ERROR); > } > > - return; > + return 0; > } > > if (intel_uc_wants_huc(uc)) > intel_uc_fw_fetch(&uc->huc.fw); > + > + return 0; > } > > static void __uc_cleanup_firmwares(struct intel_uc *uc) > @@ -308,14 +315,19 @@ static void __uc_cleanup_firmwares(struct intel_uc *uc) > > static int __uc_init(struct intel_uc *uc) > { > + struct drm_i915_private *i915 = uc_to_gt(uc)->i915; > struct intel_guc *guc = &uc->guc; > struct intel_huc *huc = &uc->huc; > int ret; > > GEM_BUG_ON(!intel_uc_wants_guc(uc)); > > - if (!intel_uc_uses_guc(uc)) > - return 0; > + if (!intel_uc_uses_guc(uc)) { > + if (GRAPHICS_VER(i915) >= 12) > + return -EINVAL; > + else > + return 0; > + } > > if (i915_inject_probe_failure(uc_to_gt(uc)->i915)) > return -ENOMEM; > diff --git a/drivers/gpu/drm/i915/gt/uc/intel_uc.h b/drivers/gpu/drm/i915/gt/uc/intel_uc.h > index 866b462821c0..3bcd781447bc 100644 > --- a/drivers/gpu/drm/i915/gt/uc/intel_uc.h > +++ b/drivers/gpu/drm/i915/gt/uc/intel_uc.h > @@ -17,7 +17,7 @@ struct intel_uc; > > struct intel_uc_ops { > int (*sanitize)(struct intel_uc *uc); > - void (*init_fw)(struct intel_uc *uc); > + int (*init_fw)(struct intel_uc *uc); > void (*fini_fw)(struct intel_uc *uc); > int (*init)(struct intel_uc *uc); > void (*fini)(struct intel_uc *uc); > @@ -104,7 +104,7 @@ static inline _TYPE intel_uc_##_NAME(struct intel_uc *uc) \ > return _RET; \ > } > intel_uc_ops_function(sanitize, sanitize, int, 0); > -intel_uc_ops_function(fetch_firmwares, init_fw, void, ); > +intel_uc_ops_function(fetch_firmwares, init_fw, int, 0); > intel_uc_ops_function(cleanup_firmwares, fini_fw, void, ); > intel_uc_ops_function(init, init, int, 0); > intel_uc_ops_function(fini, fini, void, ); > diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c > index 527228d4da7e..7f8204af6826 100644 > --- a/drivers/gpu/drm/i915/i915_gem.c > +++ b/drivers/gpu/drm/i915/i915_gem.c > @@ -1049,7 +1049,12 @@ int i915_gem_init(struct drm_i915_private *dev_priv) > if (ret) > return ret; > > - intel_uc_fetch_firmwares(&dev_priv->gt.uc); > + ret = intel_uc_fetch_firmwares(&dev_priv->gt.uc); > + if (ret) { > + i915_probe_error(dev_priv, "Failed to fetch firmware\n"); > + return ret; > + } > + > intel_wopcm_init(&dev_priv->wopcm); > > ret = i915_init_ggtt(dev_priv); ^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [Intel-gfx] [PATCH] drm/i915/dg2: make GuC FW a requirement for Gen12 and beyond devices 2021-12-07 23:15 ` [Intel-gfx] [PATCH] " John Harrison @ 2021-12-08 17:58 ` Robert Beckett [not found] ` <27c067e1-3bb3-efce-ee6f-ffce2224f5d1@intel.com> 0 siblings, 1 reply; 10+ messages in thread From: Robert Beckett @ 2021-12-08 17:58 UTC (permalink / raw) To: John Harrison, Adrian Larumbe, daniel, ramalingam.c, intel-gfx, dri-devel Cc: daniels On 07/12/2021 23:15, John Harrison wrote: > On 12/7/2021 09:53, Adrian Larumbe wrote: >> Beginning with DG2, all successive devices will require GuC FW to be >> present and loaded at probe() time. This change alters error handling in >> the FW init and load functions so that the driver's probe() function will >> fail if GuC could not be loaded. > We still need to load the i915 driver in fall back mode (display but no > engines) if the GuC is missing. Otherwise you may have just bricked the > user's device. good point, well made. though this still seems like an issue for gen12+ (excluding rkl and adl). maybe a redesign of toplevel driver probe, with i915_driver_early_probe before i915_driver_create could work. If the GuC fw is not found, it could then register a new kms only version of i915_drm_driver. or something like like that ... > > Also, we do want to be able to disable the GuC via the enable_guc module > parameter. > > John. > > >> Signed-off-by: Adrian Larumbe <adrian.larumbe@collabora.com> >> --- >> drivers/gpu/drm/i915/gt/uc/intel_uc.c | 20 ++++++++++++++++---- >> drivers/gpu/drm/i915/gt/uc/intel_uc.h | 4 ++-- >> drivers/gpu/drm/i915/i915_gem.c | 7 ++++++- >> 3 files changed, 24 insertions(+), 7 deletions(-) >> >> diff --git a/drivers/gpu/drm/i915/gt/uc/intel_uc.c >> b/drivers/gpu/drm/i915/gt/uc/intel_uc.c >> index 7660eba893fa..8b0778b6d9ab 100644 >> --- a/drivers/gpu/drm/i915/gt/uc/intel_uc.c >> +++ b/drivers/gpu/drm/i915/gt/uc/intel_uc.c >> @@ -277,14 +277,19 @@ static void guc_disable_communication(struct >> intel_guc *guc) >> drm_dbg(&i915->drm, "GuC communication disabled\n"); >> } >> -static void __uc_fetch_firmwares(struct intel_uc *uc) >> +static int __uc_fetch_firmwares(struct intel_uc *uc) >> { >> + struct drm_i915_private *i915 = uc_to_gt(uc)->i915; >> int err; >> GEM_BUG_ON(!intel_uc_wants_guc(uc)); >> err = intel_uc_fw_fetch(&uc->guc.fw); >> if (err) { >> + /* GuC is mandatory on Gen12 and beyond */ >> + if (GRAPHICS_VER(i915) >= 12) >> + return err; >> + >> /* Make sure we transition out of transient "SELECTED" state */ >> if (intel_uc_wants_huc(uc)) { >> drm_dbg(&uc_to_gt(uc)->i915->drm, >> @@ -293,11 +298,13 @@ static void __uc_fetch_firmwares(struct intel_uc >> *uc) >> INTEL_UC_FIRMWARE_ERROR); >> } >> - return; >> + return 0; >> } >> if (intel_uc_wants_huc(uc)) >> intel_uc_fw_fetch(&uc->huc.fw); >> + >> + return 0; >> } >> static void __uc_cleanup_firmwares(struct intel_uc *uc) >> @@ -308,14 +315,19 @@ static void __uc_cleanup_firmwares(struct >> intel_uc *uc) >> static int __uc_init(struct intel_uc *uc) >> { >> + struct drm_i915_private *i915 = uc_to_gt(uc)->i915; >> struct intel_guc *guc = &uc->guc; >> struct intel_huc *huc = &uc->huc; >> int ret; >> GEM_BUG_ON(!intel_uc_wants_guc(uc)); >> - if (!intel_uc_uses_guc(uc)) >> - return 0; >> + if (!intel_uc_uses_guc(uc)) { >> + if (GRAPHICS_VER(i915) >= 12) >> + return -EINVAL; >> + else >> + return 0; >> + } >> if (i915_inject_probe_failure(uc_to_gt(uc)->i915)) >> return -ENOMEM; >> diff --git a/drivers/gpu/drm/i915/gt/uc/intel_uc.h >> b/drivers/gpu/drm/i915/gt/uc/intel_uc.h >> index 866b462821c0..3bcd781447bc 100644 >> --- a/drivers/gpu/drm/i915/gt/uc/intel_uc.h >> +++ b/drivers/gpu/drm/i915/gt/uc/intel_uc.h >> @@ -17,7 +17,7 @@ struct intel_uc; >> struct intel_uc_ops { >> int (*sanitize)(struct intel_uc *uc); >> - void (*init_fw)(struct intel_uc *uc); >> + int (*init_fw)(struct intel_uc *uc); >> void (*fini_fw)(struct intel_uc *uc); >> int (*init)(struct intel_uc *uc); >> void (*fini)(struct intel_uc *uc); >> @@ -104,7 +104,7 @@ static inline _TYPE intel_uc_##_NAME(struct >> intel_uc *uc) \ >> return _RET; \ >> } >> intel_uc_ops_function(sanitize, sanitize, int, 0); >> -intel_uc_ops_function(fetch_firmwares, init_fw, void, ); >> +intel_uc_ops_function(fetch_firmwares, init_fw, int, 0); >> intel_uc_ops_function(cleanup_firmwares, fini_fw, void, ); >> intel_uc_ops_function(init, init, int, 0); >> intel_uc_ops_function(fini, fini, void, ); >> diff --git a/drivers/gpu/drm/i915/i915_gem.c >> b/drivers/gpu/drm/i915/i915_gem.c >> index 527228d4da7e..7f8204af6826 100644 >> --- a/drivers/gpu/drm/i915/i915_gem.c >> +++ b/drivers/gpu/drm/i915/i915_gem.c >> @@ -1049,7 +1049,12 @@ int i915_gem_init(struct drm_i915_private >> *dev_priv) >> if (ret) >> return ret; >> - intel_uc_fetch_firmwares(&dev_priv->gt.uc); >> + ret = intel_uc_fetch_firmwares(&dev_priv->gt.uc); >> + if (ret) { >> + i915_probe_error(dev_priv, "Failed to fetch firmware\n"); >> + return ret; >> + } >> + >> intel_wopcm_init(&dev_priv->wopcm); >> ret = i915_init_ggtt(dev_priv); > ^ permalink raw reply [flat|nested] 10+ messages in thread
[parent not found: <27c067e1-3bb3-efce-ee6f-ffce2224f5d1@intel.com>]
* Re: [Intel-gfx] [PATCH] drm/i915/dg2: make GuC FW a requirement for Gen12 and beyond devices [not found] ` <27c067e1-3bb3-efce-ee6f-ffce2224f5d1@intel.com> @ 2021-12-09 14:41 ` Robert Beckett 2021-12-09 17:06 ` John Harrison 0 siblings, 1 reply; 10+ messages in thread From: Robert Beckett @ 2021-12-09 14:41 UTC (permalink / raw) To: John Harrison, Adrian Larumbe, daniel, ramalingam.c, intel-gfx, dri-devel Cc: daniels On 09/12/2021 00:24, John Harrison wrote: > On 12/8/2021 09:58, Robert Beckett wrote: >> On 07/12/2021 23:15, John Harrison wrote: >>> On 12/7/2021 09:53, Adrian Larumbe wrote: >>>> Beginning with DG2, all successive devices will require GuC FW to be >>>> present and loaded at probe() time. This change alters error >>>> handling in >>>> the FW init and load functions so that the driver's probe() function >>>> will >>>> fail if GuC could not be loaded. >>> We still need to load the i915 driver in fall back mode (display but >>> no engines) if the GuC is missing. Otherwise you may have just >>> bricked the user's device. >> >> good point, well made. >> though this still seems like an issue for gen12+ (excluding rkl and adl). >> >> maybe a redesign of toplevel driver probe, with >> i915_driver_early_probe before i915_driver_create could work. If the >> GuC fw is not found, it could then register a new kms only version of >> i915_drm_driver. >> >> or something like like that ... > Or we could just leave it all alone? > > AFAIK, this is working just fine at the moment. If the platform default > is to use GuC submission and you have the fw then the driver loads fine. > If the platform default is to use GuC submission and you don't have the > firmware then the driver wedges but keeps loading. That means it returns > no engines to userland but the display is unaffected. Hence the user > gets a slow but safe fallback path in which they can still load their > Ubuntu desktop and try to work out what package they need to install. > > What is the problem that this patch is trying to fix? In dg2 enablement branch, when fw was unavailable, submissions could still be attempted and it would segfault the kernel due to some function pointers not being set up. From what you said, it sounds like this may just be a bug in the dg2 enablement, which we can diagnose and fix if so. Though I still think it would be a better design to only register kms capabilities if that is all that will be supported without the fw. It seems a bit messy to advertise render and create the render node for userland sw to attempt to use and have it fail, but if that is the prefered design, then we can make dg2 match that. > > John. > > >> >>> >>> Also, we do want to be able to disable the GuC via the enable_guc >>> module parameter. >>> >>> John. >>> >>> >>>> Signed-off-by: Adrian Larumbe <adrian.larumbe@collabora.com> >>>> --- >>>> drivers/gpu/drm/i915/gt/uc/intel_uc.c | 20 ++++++++++++++++---- >>>> drivers/gpu/drm/i915/gt/uc/intel_uc.h | 4 ++-- >>>> drivers/gpu/drm/i915/i915_gem.c | 7 ++++++- >>>> 3 files changed, 24 insertions(+), 7 deletions(-) >>>> >>>> diff --git a/drivers/gpu/drm/i915/gt/uc/intel_uc.c >>>> b/drivers/gpu/drm/i915/gt/uc/intel_uc.c >>>> index 7660eba893fa..8b0778b6d9ab 100644 >>>> --- a/drivers/gpu/drm/i915/gt/uc/intel_uc.c >>>> +++ b/drivers/gpu/drm/i915/gt/uc/intel_uc.c >>>> @@ -277,14 +277,19 @@ static void guc_disable_communication(struct >>>> intel_guc *guc) >>>> drm_dbg(&i915->drm, "GuC communication disabled\n"); >>>> } >>>> -static void __uc_fetch_firmwares(struct intel_uc *uc) >>>> +static int __uc_fetch_firmwares(struct intel_uc *uc) >>>> { >>>> + struct drm_i915_private *i915 = uc_to_gt(uc)->i915; >>>> int err; >>>> GEM_BUG_ON(!intel_uc_wants_guc(uc)); >>>> err = intel_uc_fw_fetch(&uc->guc.fw); >>>> if (err) { >>>> + /* GuC is mandatory on Gen12 and beyond */ >>>> + if (GRAPHICS_VER(i915) >= 12) >>>> + return err; >>>> + >>>> /* Make sure we transition out of transient "SELECTED" >>>> state */ >>>> if (intel_uc_wants_huc(uc)) { >>>> drm_dbg(&uc_to_gt(uc)->i915->drm, >>>> @@ -293,11 +298,13 @@ static void __uc_fetch_firmwares(struct >>>> intel_uc *uc) >>>> INTEL_UC_FIRMWARE_ERROR); >>>> } >>>> - return; >>>> + return 0; >>>> } >>>> if (intel_uc_wants_huc(uc)) >>>> intel_uc_fw_fetch(&uc->huc.fw); >>>> + >>>> + return 0; >>>> } >>>> static void __uc_cleanup_firmwares(struct intel_uc *uc) >>>> @@ -308,14 +315,19 @@ static void __uc_cleanup_firmwares(struct >>>> intel_uc *uc) >>>> static int __uc_init(struct intel_uc *uc) >>>> { >>>> + struct drm_i915_private *i915 = uc_to_gt(uc)->i915; >>>> struct intel_guc *guc = &uc->guc; >>>> struct intel_huc *huc = &uc->huc; >>>> int ret; >>>> GEM_BUG_ON(!intel_uc_wants_guc(uc)); >>>> - if (!intel_uc_uses_guc(uc)) >>>> - return 0; >>>> + if (!intel_uc_uses_guc(uc)) { >>>> + if (GRAPHICS_VER(i915) >= 12) >>>> + return -EINVAL; >>>> + else >>>> + return 0; >>>> + } >>>> if (i915_inject_probe_failure(uc_to_gt(uc)->i915)) >>>> return -ENOMEM; >>>> diff --git a/drivers/gpu/drm/i915/gt/uc/intel_uc.h >>>> b/drivers/gpu/drm/i915/gt/uc/intel_uc.h >>>> index 866b462821c0..3bcd781447bc 100644 >>>> --- a/drivers/gpu/drm/i915/gt/uc/intel_uc.h >>>> +++ b/drivers/gpu/drm/i915/gt/uc/intel_uc.h >>>> @@ -17,7 +17,7 @@ struct intel_uc; >>>> struct intel_uc_ops { >>>> int (*sanitize)(struct intel_uc *uc); >>>> - void (*init_fw)(struct intel_uc *uc); >>>> + int (*init_fw)(struct intel_uc *uc); >>>> void (*fini_fw)(struct intel_uc *uc); >>>> int (*init)(struct intel_uc *uc); >>>> void (*fini)(struct intel_uc *uc); >>>> @@ -104,7 +104,7 @@ static inline _TYPE intel_uc_##_NAME(struct >>>> intel_uc *uc) \ >>>> return _RET; \ >>>> } >>>> intel_uc_ops_function(sanitize, sanitize, int, 0); >>>> -intel_uc_ops_function(fetch_firmwares, init_fw, void, ); >>>> +intel_uc_ops_function(fetch_firmwares, init_fw, int, 0); >>>> intel_uc_ops_function(cleanup_firmwares, fini_fw, void, ); >>>> intel_uc_ops_function(init, init, int, 0); >>>> intel_uc_ops_function(fini, fini, void, ); >>>> diff --git a/drivers/gpu/drm/i915/i915_gem.c >>>> b/drivers/gpu/drm/i915/i915_gem.c >>>> index 527228d4da7e..7f8204af6826 100644 >>>> --- a/drivers/gpu/drm/i915/i915_gem.c >>>> +++ b/drivers/gpu/drm/i915/i915_gem.c >>>> @@ -1049,7 +1049,12 @@ int i915_gem_init(struct drm_i915_private >>>> *dev_priv) >>>> if (ret) >>>> return ret; >>>> - intel_uc_fetch_firmwares(&dev_priv->gt.uc); >>>> + ret = intel_uc_fetch_firmwares(&dev_priv->gt.uc); >>>> + if (ret) { >>>> + i915_probe_error(dev_priv, "Failed to fetch firmware\n"); >>>> + return ret; >>>> + } >>>> + >>>> intel_wopcm_init(&dev_priv->wopcm); >>>> ret = i915_init_ggtt(dev_priv); >>> > ^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [Intel-gfx] [PATCH] drm/i915/dg2: make GuC FW a requirement for Gen12 and beyond devices 2021-12-09 14:41 ` Robert Beckett @ 2021-12-09 17:06 ` John Harrison 0 siblings, 0 replies; 10+ messages in thread From: John Harrison @ 2021-12-09 17:06 UTC (permalink / raw) To: Robert Beckett, Adrian Larumbe, daniel, ramalingam.c, intel-gfx, dri-devel Cc: daniels On 12/9/2021 06:41, Robert Beckett wrote: > On 09/12/2021 00:24, John Harrison wrote: >> On 12/8/2021 09:58, Robert Beckett wrote: >>> On 07/12/2021 23:15, John Harrison wrote: >>>> On 12/7/2021 09:53, Adrian Larumbe wrote: >>>>> Beginning with DG2, all successive devices will require GuC FW to be >>>>> present and loaded at probe() time. This change alters error >>>>> handling in >>>>> the FW init and load functions so that the driver's probe() >>>>> function will >>>>> fail if GuC could not be loaded. >>>> We still need to load the i915 driver in fall back mode (display >>>> but no engines) if the GuC is missing. Otherwise you may have just >>>> bricked the user's device. >>> >>> good point, well made. >>> though this still seems like an issue for gen12+ (excluding rkl and >>> adl). >>> >>> maybe a redesign of toplevel driver probe, with >>> i915_driver_early_probe before i915_driver_create could work. If the >>> GuC fw is not found, it could then register a new kms only version >>> of i915_drm_driver. >>> >>> or something like like that ... >> Or we could just leave it all alone? >> >> AFAIK, this is working just fine at the moment. If the platform >> default is to use GuC submission and you have the fw then the driver >> loads fine. If the platform default is to use GuC submission and you >> don't have the firmware then the driver wedges but keeps loading. >> That means it returns no engines to userland but the display is >> unaffected. Hence the user gets a slow but safe fallback path in >> which they can still load their Ubuntu desktop and try to work out >> what package they need to install. >> >> What is the problem that this patch is trying to fix? > > In dg2 enablement branch, when fw was unavailable, submissions could > still be attempted and it would segfault the kernel due to some > function pointers not being set up. > > From what you said, it sounds like this may just be a bug in the dg2 > enablement, which we can diagnose and fix if so. Yeah, that is not supposed to happen. It has definitely been working correctly in the past. Maybe something is incorrectly thinking it can unwedge by a reset? That is permissible for a regular wedge but wedge-on-init is meant to be permanent. > > Though I still think it would be a better design to only register kms > capabilities if that is all that will be supported without the fw. It > seems a bit messy to advertise render and create the render node for > userland sw to attempt to use and have it fail, but if that is the > prefered design, then we can make dg2 match that. Daniel Vetter/Jon Bloomfield may have newer thoughts but last I heard was the architectural decision was to simply wedge and not return any engines to userland. Maybe on the grounds that while a cleaner design maybe possible, it's not worth the extra complexity in the driver for what is basically only an error path. John. > > >> >> John. >> >> >>> >>>> >>>> Also, we do want to be able to disable the GuC via the enable_guc >>>> module parameter. >>>> >>>> John. >>>> >>>> >>>>> Signed-off-by: Adrian Larumbe <adrian.larumbe@collabora.com> >>>>> --- >>>>> drivers/gpu/drm/i915/gt/uc/intel_uc.c | 20 ++++++++++++++++---- >>>>> drivers/gpu/drm/i915/gt/uc/intel_uc.h | 4 ++-- >>>>> drivers/gpu/drm/i915/i915_gem.c | 7 ++++++- >>>>> 3 files changed, 24 insertions(+), 7 deletions(-) >>>>> >>>>> diff --git a/drivers/gpu/drm/i915/gt/uc/intel_uc.c >>>>> b/drivers/gpu/drm/i915/gt/uc/intel_uc.c >>>>> index 7660eba893fa..8b0778b6d9ab 100644 >>>>> --- a/drivers/gpu/drm/i915/gt/uc/intel_uc.c >>>>> +++ b/drivers/gpu/drm/i915/gt/uc/intel_uc.c >>>>> @@ -277,14 +277,19 @@ static void guc_disable_communication(struct >>>>> intel_guc *guc) >>>>> drm_dbg(&i915->drm, "GuC communication disabled\n"); >>>>> } >>>>> -static void __uc_fetch_firmwares(struct intel_uc *uc) >>>>> +static int __uc_fetch_firmwares(struct intel_uc *uc) >>>>> { >>>>> + struct drm_i915_private *i915 = uc_to_gt(uc)->i915; >>>>> int err; >>>>> GEM_BUG_ON(!intel_uc_wants_guc(uc)); >>>>> err = intel_uc_fw_fetch(&uc->guc.fw); >>>>> if (err) { >>>>> + /* GuC is mandatory on Gen12 and beyond */ >>>>> + if (GRAPHICS_VER(i915) >= 12) >>>>> + return err; >>>>> + >>>>> /* Make sure we transition out of transient "SELECTED" >>>>> state */ >>>>> if (intel_uc_wants_huc(uc)) { >>>>> drm_dbg(&uc_to_gt(uc)->i915->drm, >>>>> @@ -293,11 +298,13 @@ static void __uc_fetch_firmwares(struct >>>>> intel_uc *uc) >>>>> INTEL_UC_FIRMWARE_ERROR); >>>>> } >>>>> - return; >>>>> + return 0; >>>>> } >>>>> if (intel_uc_wants_huc(uc)) >>>>> intel_uc_fw_fetch(&uc->huc.fw); >>>>> + >>>>> + return 0; >>>>> } >>>>> static void __uc_cleanup_firmwares(struct intel_uc *uc) >>>>> @@ -308,14 +315,19 @@ static void __uc_cleanup_firmwares(struct >>>>> intel_uc *uc) >>>>> static int __uc_init(struct intel_uc *uc) >>>>> { >>>>> + struct drm_i915_private *i915 = uc_to_gt(uc)->i915; >>>>> struct intel_guc *guc = &uc->guc; >>>>> struct intel_huc *huc = &uc->huc; >>>>> int ret; >>>>> GEM_BUG_ON(!intel_uc_wants_guc(uc)); >>>>> - if (!intel_uc_uses_guc(uc)) >>>>> - return 0; >>>>> + if (!intel_uc_uses_guc(uc)) { >>>>> + if (GRAPHICS_VER(i915) >= 12) >>>>> + return -EINVAL; >>>>> + else >>>>> + return 0; >>>>> + } >>>>> if (i915_inject_probe_failure(uc_to_gt(uc)->i915)) >>>>> return -ENOMEM; >>>>> diff --git a/drivers/gpu/drm/i915/gt/uc/intel_uc.h >>>>> b/drivers/gpu/drm/i915/gt/uc/intel_uc.h >>>>> index 866b462821c0..3bcd781447bc 100644 >>>>> --- a/drivers/gpu/drm/i915/gt/uc/intel_uc.h >>>>> +++ b/drivers/gpu/drm/i915/gt/uc/intel_uc.h >>>>> @@ -17,7 +17,7 @@ struct intel_uc; >>>>> struct intel_uc_ops { >>>>> int (*sanitize)(struct intel_uc *uc); >>>>> - void (*init_fw)(struct intel_uc *uc); >>>>> + int (*init_fw)(struct intel_uc *uc); >>>>> void (*fini_fw)(struct intel_uc *uc); >>>>> int (*init)(struct intel_uc *uc); >>>>> void (*fini)(struct intel_uc *uc); >>>>> @@ -104,7 +104,7 @@ static inline _TYPE intel_uc_##_NAME(struct >>>>> intel_uc *uc) \ >>>>> return _RET; \ >>>>> } >>>>> intel_uc_ops_function(sanitize, sanitize, int, 0); >>>>> -intel_uc_ops_function(fetch_firmwares, init_fw, void, ); >>>>> +intel_uc_ops_function(fetch_firmwares, init_fw, int, 0); >>>>> intel_uc_ops_function(cleanup_firmwares, fini_fw, void, ); >>>>> intel_uc_ops_function(init, init, int, 0); >>>>> intel_uc_ops_function(fini, fini, void, ); >>>>> diff --git a/drivers/gpu/drm/i915/i915_gem.c >>>>> b/drivers/gpu/drm/i915/i915_gem.c >>>>> index 527228d4da7e..7f8204af6826 100644 >>>>> --- a/drivers/gpu/drm/i915/i915_gem.c >>>>> +++ b/drivers/gpu/drm/i915/i915_gem.c >>>>> @@ -1049,7 +1049,12 @@ int i915_gem_init(struct drm_i915_private >>>>> *dev_priv) >>>>> if (ret) >>>>> return ret; >>>>> - intel_uc_fetch_firmwares(&dev_priv->gt.uc); >>>>> + ret = intel_uc_fetch_firmwares(&dev_priv->gt.uc); >>>>> + if (ret) { >>>>> + i915_probe_error(dev_priv, "Failed to fetch firmware\n"); >>>>> + return ret; >>>>> + } >>>>> + >>>>> intel_wopcm_init(&dev_priv->wopcm); >>>>> ret = i915_init_ggtt(dev_priv); >>>> >> ^ permalink raw reply [flat|nested] 10+ messages in thread
* [Intel-gfx] ✗ Fi.CI.IGT: failure for drm/i915/dg2: make GuC FW a requirement for Gen12 and beyond devices 2021-12-07 17:53 ` Adrian Larumbe ` (3 preceding siblings ...) (?) @ 2021-12-08 6:36 ` Patchwork -1 siblings, 0 replies; 10+ messages in thread From: Patchwork @ 2021-12-08 6:36 UTC (permalink / raw) To: Adrian Larumbe; +Cc: intel-gfx [-- Attachment #1: Type: text/plain, Size: 30291 bytes --] == Series Details == Series: drm/i915/dg2: make GuC FW a requirement for Gen12 and beyond devices URL : https://patchwork.freedesktop.org/series/97676/ State : failure == Summary == CI Bug Log - changes from CI_DRM_10970_full -> Patchwork_21777_full ==================================================== Summary ------- **FAILURE** Serious unknown changes coming with Patchwork_21777_full absolutely need to be verified manually. If you think the reported changes have nothing to do with the changes introduced in Patchwork_21777_full, please notify your bug team to allow them to document this new failure mode, which will reduce false positives in CI. Participating hosts (10 -> 10) ------------------------------ No changes in participating hosts Possible new issues ------------------- Here are the unknown changes that may have been introduced in Patchwork_21777_full: ### IGT changes ### #### Possible regressions #### * igt@kms_vblank@pipe-a-ts-continuation-dpms-suspend: - shard-snb: [PASS][1] -> [DMESG-WARN][2] [1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10970/shard-snb2/igt@kms_vblank@pipe-a-ts-continuation-dpms-suspend.html [2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21777/shard-snb7/igt@kms_vblank@pipe-a-ts-continuation-dpms-suspend.html Known issues ------------ Here are the changes found in Patchwork_21777_full that come from known issues: ### IGT changes ### #### Issues hit #### * igt@gem_create@create-massive: - shard-skl: NOTRUN -> [DMESG-WARN][3] ([i915#3002]) [3]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21777/shard-skl8/igt@gem_create@create-massive.html * igt@gem_exec_capture@pi@bcs0: - shard-skl: NOTRUN -> [INCOMPLETE][4] ([i915#4547]) [4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21777/shard-skl8/igt@gem_exec_capture@pi@bcs0.html * igt@gem_exec_fair@basic-none-solo@rcs0: - shard-kbl: NOTRUN -> [FAIL][5] ([i915#2842]) [5]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21777/shard-kbl6/igt@gem_exec_fair@basic-none-solo@rcs0.html * igt@gem_exec_fair@basic-pace@vcs0: - shard-iclb: [PASS][6] -> [FAIL][7] ([i915#2842]) +1 similar issue [6]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10970/shard-iclb7/igt@gem_exec_fair@basic-pace@vcs0.html [7]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21777/shard-iclb3/igt@gem_exec_fair@basic-pace@vcs0.html * igt@gem_exec_fair@basic-pace@vcs1: - shard-kbl: [PASS][8] -> [SKIP][9] ([fdo#109271]) [8]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10970/shard-kbl6/igt@gem_exec_fair@basic-pace@vcs1.html [9]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21777/shard-kbl3/igt@gem_exec_fair@basic-pace@vcs1.html - shard-tglb: [PASS][10] -> [FAIL][11] ([i915#2842]) +1 similar issue [10]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10970/shard-tglb8/igt@gem_exec_fair@basic-pace@vcs1.html [11]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21777/shard-tglb2/igt@gem_exec_fair@basic-pace@vcs1.html * igt@gem_exec_fair@basic-throttle@rcs0: - shard-iclb: [PASS][12] -> [FAIL][13] ([i915#2849]) [12]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10970/shard-iclb6/igt@gem_exec_fair@basic-throttle@rcs0.html [13]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21777/shard-iclb2/igt@gem_exec_fair@basic-throttle@rcs0.html * igt@gem_lmem_swapping@heavy-multi: - shard-skl: NOTRUN -> [SKIP][14] ([fdo#109271] / [i915#4613]) [14]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21777/shard-skl10/igt@gem_lmem_swapping@heavy-multi.html * igt@gem_lmem_swapping@heavy-random: - shard-apl: NOTRUN -> [SKIP][15] ([fdo#109271] / [i915#4613]) [15]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21777/shard-apl4/igt@gem_lmem_swapping@heavy-random.html * igt@gem_lmem_swapping@parallel-random-verify: - shard-kbl: NOTRUN -> [SKIP][16] ([fdo#109271] / [i915#4613]) [16]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21777/shard-kbl2/igt@gem_lmem_swapping@parallel-random-verify.html - shard-iclb: NOTRUN -> [SKIP][17] ([i915#4613]) [17]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21777/shard-iclb6/igt@gem_lmem_swapping@parallel-random-verify.html * igt@gem_pread@exhaustion: - shard-iclb: NOTRUN -> [WARN][18] ([i915#2658]) [18]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21777/shard-iclb6/igt@gem_pread@exhaustion.html - shard-kbl: NOTRUN -> [WARN][19] ([i915#2658]) [19]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21777/shard-kbl2/igt@gem_pread@exhaustion.html * igt@gem_userptr_blits@dmabuf-sync: - shard-skl: NOTRUN -> [SKIP][20] ([fdo#109271] / [i915#3323]) [20]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21777/shard-skl8/igt@gem_userptr_blits@dmabuf-sync.html * igt@gem_userptr_blits@invalid-mmap-offset-unsync: - shard-iclb: NOTRUN -> [SKIP][21] ([i915#3297]) [21]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21777/shard-iclb6/igt@gem_userptr_blits@invalid-mmap-offset-unsync.html * igt@gen9_exec_parse@bb-start-param: - shard-iclb: NOTRUN -> [SKIP][22] ([i915#2856]) [22]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21777/shard-iclb6/igt@gen9_exec_parse@bb-start-param.html * igt@i915_pm_rpm@modeset-non-lpsp-stress: - shard-tglb: NOTRUN -> [SKIP][23] ([fdo#111644] / [i915#1397] / [i915#2411]) [23]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21777/shard-tglb5/igt@i915_pm_rpm@modeset-non-lpsp-stress.html * igt@i915_pm_rpm@modeset-non-lpsp-stress-no-wait: - shard-iclb: NOTRUN -> [SKIP][24] ([fdo#110892]) [24]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21777/shard-iclb6/igt@i915_pm_rpm@modeset-non-lpsp-stress-no-wait.html * igt@i915_selftest@live@hangcheck: - shard-snb: [PASS][25] -> [INCOMPLETE][26] ([i915#3921]) [25]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10970/shard-snb4/igt@i915_selftest@live@hangcheck.html [26]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21777/shard-snb5/igt@i915_selftest@live@hangcheck.html * igt@i915_suspend@fence-restore-tiled2untiled: - shard-apl: [PASS][27] -> [DMESG-WARN][28] ([i915#180]) +1 similar issue [27]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10970/shard-apl7/igt@i915_suspend@fence-restore-tiled2untiled.html [28]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21777/shard-apl8/igt@i915_suspend@fence-restore-tiled2untiled.html * igt@kms_big_fb@linear-32bpp-rotate-0: - shard-glk: [PASS][29] -> [DMESG-WARN][30] ([i915#118]) [29]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10970/shard-glk5/igt@kms_big_fb@linear-32bpp-rotate-0.html [30]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21777/shard-glk3/igt@kms_big_fb@linear-32bpp-rotate-0.html * igt@kms_big_fb@x-tiled-64bpp-rotate-90: - shard-iclb: NOTRUN -> [SKIP][31] ([fdo#110725] / [fdo#111614]) +2 similar issues [31]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21777/shard-iclb6/igt@kms_big_fb@x-tiled-64bpp-rotate-90.html * igt@kms_big_fb@y-tiled-64bpp-rotate-90: - shard-tglb: NOTRUN -> [SKIP][32] ([fdo#111614]) [32]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21777/shard-tglb5/igt@kms_big_fb@y-tiled-64bpp-rotate-90.html * igt@kms_big_fb@y-tiled-max-hw-stride-32bpp-rotate-0-hflip: - shard-apl: NOTRUN -> [SKIP][33] ([fdo#109271] / [i915#3777]) +1 similar issue [33]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21777/shard-apl6/igt@kms_big_fb@y-tiled-max-hw-stride-32bpp-rotate-0-hflip.html * igt@kms_big_fb@y-tiled-max-hw-stride-64bpp-rotate-0-hflip: - shard-kbl: NOTRUN -> [SKIP][34] ([fdo#109271] / [i915#3777]) [34]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21777/shard-kbl2/igt@kms_big_fb@y-tiled-max-hw-stride-64bpp-rotate-0-hflip.html * igt@kms_big_fb@yf-tiled-64bpp-rotate-0: - shard-iclb: NOTRUN -> [SKIP][35] ([fdo#110723]) [35]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21777/shard-iclb6/igt@kms_big_fb@yf-tiled-64bpp-rotate-0.html * igt@kms_ccs@pipe-b-missing-ccs-buffer-y_tiled_gen12_rc_ccs_cc: - shard-kbl: NOTRUN -> [SKIP][36] ([fdo#109271] / [i915#3886]) +3 similar issues [36]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21777/shard-kbl7/igt@kms_ccs@pipe-b-missing-ccs-buffer-y_tiled_gen12_rc_ccs_cc.html * igt@kms_ccs@pipe-c-bad-pixel-format-y_tiled_gen12_mc_ccs: - shard-iclb: NOTRUN -> [SKIP][37] ([fdo#109278] / [i915#3886]) +2 similar issues [37]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21777/shard-iclb6/igt@kms_ccs@pipe-c-bad-pixel-format-y_tiled_gen12_mc_ccs.html * igt@kms_ccs@pipe-c-bad-rotation-90-y_tiled_gen12_mc_ccs: - shard-apl: NOTRUN -> [SKIP][38] ([fdo#109271] / [i915#3886]) +4 similar issues [38]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21777/shard-apl4/igt@kms_ccs@pipe-c-bad-rotation-90-y_tiled_gen12_mc_ccs.html * igt@kms_ccs@pipe-c-crc-primary-basic-y_tiled_gen12_rc_ccs_cc: - shard-skl: NOTRUN -> [SKIP][39] ([fdo#109271] / [i915#3886]) +1 similar issue [39]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21777/shard-skl10/igt@kms_ccs@pipe-c-crc-primary-basic-y_tiled_gen12_rc_ccs_cc.html * igt@kms_ccs@pipe-c-missing-ccs-buffer-y_tiled_gen12_mc_ccs: - shard-tglb: NOTRUN -> [SKIP][40] ([i915#3689] / [i915#3886]) [40]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21777/shard-tglb5/igt@kms_ccs@pipe-c-missing-ccs-buffer-y_tiled_gen12_mc_ccs.html * igt@kms_ccs@pipe-d-missing-ccs-buffer-y_tiled_gen12_rc_ccs_cc: - shard-kbl: NOTRUN -> [SKIP][41] ([fdo#109271]) +64 similar issues [41]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21777/shard-kbl2/igt@kms_ccs@pipe-d-missing-ccs-buffer-y_tiled_gen12_rc_ccs_cc.html * igt@kms_chamelium@common-hpd-after-suspend: - shard-skl: NOTRUN -> [SKIP][42] ([fdo#109271] / [fdo#111827]) +3 similar issues [42]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21777/shard-skl6/igt@kms_chamelium@common-hpd-after-suspend.html * igt@kms_chamelium@hdmi-edid-change-during-suspend: - shard-apl: NOTRUN -> [SKIP][43] ([fdo#109271] / [fdo#111827]) +6 similar issues [43]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21777/shard-apl4/igt@kms_chamelium@hdmi-edid-change-during-suspend.html * igt@kms_chamelium@hdmi-hpd-storm-disable: - shard-iclb: NOTRUN -> [SKIP][44] ([fdo#109284] / [fdo#111827]) +2 similar issues [44]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21777/shard-iclb6/igt@kms_chamelium@hdmi-hpd-storm-disable.html * igt@kms_chamelium@vga-hpd-for-each-pipe: - shard-kbl: NOTRUN -> [SKIP][45] ([fdo#109271] / [fdo#111827]) +9 similar issues [45]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21777/shard-kbl2/igt@kms_chamelium@vga-hpd-for-each-pipe.html * igt@kms_color@pipe-b-ctm-0-75: - shard-skl: [PASS][46] -> [DMESG-WARN][47] ([i915#1982]) [46]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10970/shard-skl3/igt@kms_color@pipe-b-ctm-0-75.html [47]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21777/shard-skl4/igt@kms_color@pipe-b-ctm-0-75.html * igt@kms_color_chamelium@pipe-d-ctm-red-to-blue: - shard-iclb: NOTRUN -> [SKIP][48] ([fdo#109278] / [fdo#109284] / [fdo#111827]) [48]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21777/shard-iclb6/igt@kms_color_chamelium@pipe-d-ctm-red-to-blue.html * igt@kms_content_protection@atomic-dpms: - shard-kbl: NOTRUN -> [TIMEOUT][49] ([i915#1319]) [49]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21777/shard-kbl2/igt@kms_content_protection@atomic-dpms.html - shard-iclb: NOTRUN -> [SKIP][50] ([fdo#109300] / [fdo#111066]) [50]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21777/shard-iclb6/igt@kms_content_protection@atomic-dpms.html * igt@kms_cursor_crc@pipe-b-cursor-32x10-offscreen: - shard-tglb: NOTRUN -> [SKIP][51] ([i915#3359]) [51]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21777/shard-tglb5/igt@kms_cursor_crc@pipe-b-cursor-32x10-offscreen.html * igt@kms_cursor_crc@pipe-c-cursor-suspend: - shard-skl: [PASS][52] -> [INCOMPLETE][53] ([i915#300]) [52]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10970/shard-skl4/igt@kms_cursor_crc@pipe-c-cursor-suspend.html [53]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21777/shard-skl4/igt@kms_cursor_crc@pipe-c-cursor-suspend.html * igt@kms_cursor_legacy@2x-cursor-vs-flip-atomic: - shard-iclb: NOTRUN -> [SKIP][54] ([fdo#109274] / [fdo#109278]) +1 similar issue [54]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21777/shard-iclb6/igt@kms_cursor_legacy@2x-cursor-vs-flip-atomic.html * igt@kms_cursor_legacy@pipe-d-torture-bo: - shard-skl: NOTRUN -> [SKIP][55] ([fdo#109271] / [i915#533]) [55]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21777/shard-skl10/igt@kms_cursor_legacy@pipe-d-torture-bo.html * igt@kms_flip@2x-absolute-wf_vblank: - shard-tglb: NOTRUN -> [SKIP][56] ([fdo#111825] / [i915#3966]) [56]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21777/shard-tglb5/igt@kms_flip@2x-absolute-wf_vblank.html * igt@kms_flip@2x-flip-vs-wf_vblank: - shard-iclb: NOTRUN -> [SKIP][57] ([fdo#109274]) +1 similar issue [57]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21777/shard-iclb6/igt@kms_flip@2x-flip-vs-wf_vblank.html * igt@kms_flip@2x-plain-flip-interruptible: - shard-tglb: NOTRUN -> [SKIP][58] ([fdo#111825]) +4 similar issues [58]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21777/shard-tglb5/igt@kms_flip@2x-plain-flip-interruptible.html * igt@kms_flip@plain-flip-fb-recreate-interruptible@b-edp1: - shard-skl: [PASS][59] -> [FAIL][60] ([i915#2122]) +1 similar issue [59]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10970/shard-skl4/igt@kms_flip@plain-flip-fb-recreate-interruptible@b-edp1.html [60]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21777/shard-skl4/igt@kms_flip@plain-flip-fb-recreate-interruptible@b-edp1.html * igt@kms_flip_scaled_crc@flip-64bpp-ytile-to-32bpp-ytilercccs: - shard-apl: NOTRUN -> [SKIP][61] ([fdo#109271] / [i915#2672]) [61]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21777/shard-apl4/igt@kms_flip_scaled_crc@flip-64bpp-ytile-to-32bpp-ytilercccs.html * igt@kms_frontbuffer_tracking@fbc-1p-shrfb-fliptrack-mmap-gtt: - shard-skl: NOTRUN -> [SKIP][62] ([fdo#109271]) +60 similar issues [62]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21777/shard-skl10/igt@kms_frontbuffer_tracking@fbc-1p-shrfb-fliptrack-mmap-gtt.html * igt@kms_frontbuffer_tracking@psr-2p-primscrn-cur-indfb-draw-pwrite: - shard-iclb: NOTRUN -> [SKIP][63] ([fdo#109280]) +5 similar issues [63]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21777/shard-iclb6/igt@kms_frontbuffer_tracking@psr-2p-primscrn-cur-indfb-draw-pwrite.html * igt@kms_hdr@bpc-switch-dpms: - shard-skl: [PASS][64] -> [FAIL][65] ([i915#1188]) [64]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10970/shard-skl4/igt@kms_hdr@bpc-switch-dpms.html [65]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21777/shard-skl4/igt@kms_hdr@bpc-switch-dpms.html * igt@kms_pipe_crc_basic@read-crc-pipe-d-frame-sequence: - shard-iclb: NOTRUN -> [SKIP][66] ([fdo#109278]) +12 similar issues [66]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21777/shard-iclb6/igt@kms_pipe_crc_basic@read-crc-pipe-d-frame-sequence.html - shard-kbl: NOTRUN -> [SKIP][67] ([fdo#109271] / [i915#533]) [67]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21777/shard-kbl2/igt@kms_pipe_crc_basic@read-crc-pipe-d-frame-sequence.html * igt@kms_plane@plane-panning-bottom-right-suspend@pipe-b-planes: - shard-kbl: [PASS][68] -> [DMESG-WARN][69] ([i915#180]) +5 similar issues [68]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10970/shard-kbl3/igt@kms_plane@plane-panning-bottom-right-suspend@pipe-b-planes.html [69]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21777/shard-kbl4/igt@kms_plane@plane-panning-bottom-right-suspend@pipe-b-planes.html * igt@kms_plane_alpha_blend@pipe-a-alpha-basic: - shard-apl: NOTRUN -> [FAIL][70] ([fdo#108145] / [i915#265]) [70]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21777/shard-apl6/igt@kms_plane_alpha_blend@pipe-a-alpha-basic.html * igt@kms_plane_alpha_blend@pipe-b-alpha-transparent-fb: - shard-apl: NOTRUN -> [FAIL][71] ([i915#265]) [71]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21777/shard-apl4/igt@kms_plane_alpha_blend@pipe-b-alpha-transparent-fb.html * igt@kms_plane_alpha_blend@pipe-c-constant-alpha-max: - shard-skl: NOTRUN -> [FAIL][72] ([fdo#108145] / [i915#265]) [72]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21777/shard-skl8/igt@kms_plane_alpha_blend@pipe-c-constant-alpha-max.html * igt@kms_plane_alpha_blend@pipe-c-coverage-7efc: - shard-skl: [PASS][73] -> [FAIL][74] ([fdo#108145] / [i915#265]) +1 similar issue [73]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10970/shard-skl4/igt@kms_plane_alpha_blend@pipe-c-coverage-7efc.html [74]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21777/shard-skl4/igt@kms_plane_alpha_blend@pipe-c-coverage-7efc.html * igt@kms_plane_lowres@pipe-a-tiling-none: - shard-iclb: NOTRUN -> [SKIP][75] ([i915#3536]) [75]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21777/shard-iclb6/igt@kms_plane_lowres@pipe-a-tiling-none.html * igt@kms_psr2_sf@overlay-plane-update-sf-dmg-area-1: - shard-iclb: NOTRUN -> [SKIP][76] ([i915#658]) +1 similar issue [76]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21777/shard-iclb6/igt@kms_psr2_sf@overlay-plane-update-sf-dmg-area-1.html * igt@kms_psr2_sf@overlay-primary-update-sf-dmg-area-2: - shard-kbl: NOTRUN -> [SKIP][77] ([fdo#109271] / [i915#658]) [77]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21777/shard-kbl6/igt@kms_psr2_sf@overlay-primary-update-sf-dmg-area-2.html * igt@kms_psr2_sf@overlay-primary-update-sf-dmg-area-5: - shard-apl: NOTRUN -> [SKIP][78] ([fdo#109271] / [i915#658]) +1 similar issue [78]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21777/shard-apl1/igt@kms_psr2_sf@overlay-primary-update-sf-dmg-area-5.html * igt@kms_psr2_su@page_flip-nv12: - shard-skl: NOTRUN -> [SKIP][79] ([fdo#109271] / [i915#658]) [79]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21777/shard-skl10/igt@kms_psr2_su@page_flip-nv12.html * igt@kms_psr@psr2_primary_mmap_cpu: - shard-iclb: [PASS][80] -> [SKIP][81] ([fdo#109441]) +1 similar issue [80]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10970/shard-iclb2/igt@kms_psr@psr2_primary_mmap_cpu.html [81]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21777/shard-iclb8/igt@kms_psr@psr2_primary_mmap_cpu.html * igt@kms_selftest@all@check_plane_state: - shard-skl: NOTRUN -> [INCOMPLETE][82] ([i915#4663]) [82]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21777/shard-skl4/igt@kms_selftest@all@check_plane_state.html * igt@kms_vblank@pipe-d-wait-forked-hang: - shard-apl: NOTRUN -> [SKIP][83] ([fdo#109271]) +72 similar issues [83]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21777/shard-apl4/igt@kms_vblank@pipe-d-wait-forked-hang.html * igt@kms_vrr@flip-dpms: - shard-iclb: NOTRUN -> [SKIP][84] ([fdo#109502]) [84]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21777/shard-iclb6/igt@kms_vrr@flip-dpms.html * igt@perf@polling-parameterized: - shard-skl: [PASS][85] -> [FAIL][86] ([i915#1542]) [85]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10970/shard-skl10/igt@perf@polling-parameterized.html [86]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21777/shard-skl7/igt@perf@polling-parameterized.html * igt@prime_nv_api@nv_self_import_to_different_fd: - shard-iclb: NOTRUN -> [SKIP][87] ([fdo#109291]) [87]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21777/shard-iclb6/igt@prime_nv_api@nv_self_import_to_different_fd.html * igt@prime_vgem@fence-write-hang: - shard-iclb: NOTRUN -> [SKIP][88] ([fdo#109295]) [88]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21777/shard-iclb6/igt@prime_vgem@fence-write-hang.html * igt@sysfs_clients@fair-0: - shard-apl: NOTRUN -> [SKIP][89] ([fdo#109271] / [i915#2994]) [89]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21777/shard-apl6/igt@sysfs_clients@fair-0.html * igt@sysfs_clients@pidname: - shard-skl: NOTRUN -> [SKIP][90] ([fdo#109271] / [i915#2994]) [90]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21777/shard-skl10/igt@sysfs_clients@pidname.html #### Possible fixes #### * igt@drm_read@short-buffer-block: - {shard-rkl}: [SKIP][91] ([i915#4098]) -> [PASS][92] [91]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10970/shard-rkl-1/igt@drm_read@short-buffer-block.html [92]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21777/shard-rkl-6/igt@drm_read@short-buffer-block.html * igt@drm_read@short-buffer-wakeup: - {shard-rkl}: [SKIP][93] ([i915#1845] / [i915#4098]) -> [PASS][94] [93]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10970/shard-rkl-1/igt@drm_read@short-buffer-wakeup.html [94]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21777/shard-rkl-6/igt@drm_read@short-buffer-wakeup.html * igt@fbdev@nullptr: - {shard-rkl}: [SKIP][95] ([i915#2582]) -> [PASS][96] +1 similar issue [95]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10970/shard-rkl-1/igt@fbdev@nullptr.html [96]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21777/shard-rkl-6/igt@fbdev@nullptr.html * igt@gem_ctx_isolation@preservation-s3@rcs0: - shard-apl: [DMESG-WARN][97] ([i915#180]) -> [PASS][98] +4 similar issues [97]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10970/shard-apl4/igt@gem_ctx_isolation@preservation-s3@rcs0.html [98]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21777/shard-apl4/igt@gem_ctx_isolation@preservation-s3@rcs0.html * igt@gem_eio@in-flight-contexts-immediate: - shard-tglb: [TIMEOUT][99] ([i915#3063]) -> [PASS][100] [99]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10970/shard-tglb1/igt@gem_eio@in-flight-contexts-immediate.html [100]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21777/shard-tglb5/igt@gem_eio@in-flight-contexts-immediate.html * igt@gem_exec_capture@pi@rcs0: - shard-skl: [INCOMPLETE][101] ([i915#4547]) -> [PASS][102] [101]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10970/shard-skl1/igt@gem_exec_capture@pi@rcs0.html [102]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21777/shard-skl8/igt@gem_exec_capture@pi@rcs0.html * igt@gem_exec_fair@basic-none@rcs0: - shard-glk: [FAIL][103] ([i915#2842]) -> [PASS][104] [103]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10970/shard-glk4/igt@gem_exec_fair@basic-none@rcs0.html [104]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21777/shard-glk5/igt@gem_exec_fair@basic-none@rcs0.html * igt@gem_exec_fair@basic-pace@vcs0: - shard-kbl: [FAIL][105] ([i915#2842]) -> [PASS][106] [105]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10970/shard-kbl6/igt@gem_exec_fair@basic-pace@vcs0.html [106]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21777/shard-kbl3/igt@gem_exec_fair@basic-pace@vcs0.html * igt@gen9_exec_parse@allowed-all: - shard-skl: [DMESG-WARN][107] ([i915#1436] / [i915#716]) -> [PASS][108] [107]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10970/shard-skl6/igt@gen9_exec_parse@allowed-all.html [108]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21777/shard-skl10/igt@gen9_exec_parse@allowed-all.html * igt@i915_pm_rpm@gem-pread: - {shard-rkl}: [SKIP][109] ([fdo#109308]) -> [PASS][110] +1 similar issue [109]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10970/shard-rkl-1/igt@i915_pm_rpm@gem-pread.html [110]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21777/shard-rkl-6/igt@i915_pm_rpm@gem-pread.html * igt@i915_suspend@forcewake: - shard-skl: [INCOMPLETE][111] ([i915#636]) -> [PASS][112] [111]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10970/shard-skl1/igt@i915_suspend@forcewake.html [112]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21777/shard-skl8/igt@i915_suspend@forcewake.html * igt@kms_big_fb@x-tiled-max-hw-stride-32bpp-rotate-180-hflip-async-flip: - {shard-rkl}: [SKIP][113] ([i915#1845]) -> [PASS][114] +17 similar issues [113]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10970/shard-rkl-1/igt@kms_big_fb@x-tiled-max-hw-stride-32bpp-rotate-180-hflip-async-flip.html [114]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21777/shard-rkl-6/igt@kms_big_fb@x-tiled-max-hw-stride-32bpp-rotate-180-hflip-async-flip.html * igt@kms_big_fb@y-tiled-64bpp-rotate-180: - {shard-rkl}: ([SKIP][115], [PASS][116]) ([i915#1845]) -> [PASS][117] [115]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10970/shard-rkl-4/igt@kms_big_fb@y-tiled-64bpp-rotate-180.html [116]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10970/shard-rkl-6/igt@kms_big_fb@y-tiled-64bpp-rotate-180.html [117]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21777/shard-rkl-6/igt@kms_big_fb@y-tiled-64bpp-rotate-180.html * igt@kms_color@pipe-a-degamma: - {shard-rkl}: [SKIP][118] ([i915#1149] / [i915#1849] / [i915#4070]) -> [PASS][119] [118]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10970/shard-rkl-1/igt@kms_color@pipe-a-degamma.html [119]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21777/shard-rkl-6/igt@kms_color@pipe-a-degamma.html * igt@kms_color@pipe-b-ctm-0-25: - {shard-rkl}: ([SKIP][120], [PASS][121]) ([i915#1149] / [i915#4098]) -> [PASS][122] [120]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10970/shard-rkl-4/igt@kms_color@pipe-b-ctm-0-25.html [121]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10970/shard-rkl-6/igt@kms_color@pipe-b-ctm-0-25.html [122]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21777/shard-rkl-6/igt@kms_color@pipe-b-ctm-0-25.html * igt@kms_color@pipe-c-ctm-0-25: - shard-skl: [DMESG-WARN][123] ([i915#1982]) -> [PASS][124] +1 similar issue [123]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10970/shard-skl3/igt@kms_color@pipe-c-ctm-0-25.html [124]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21777/shard-skl4/igt@kms_color@pipe-c-ctm-0-25.html * igt@kms_cursor_crc@pipe-a-cursor-alpha-transparent: - {shard-rkl}: ([SKIP][125], [SKIP][126]) ([fdo#112022] / [i915#4070]) -> [PASS][127] [125]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10970/shard-rkl-1/igt@kms_cursor_crc@pipe-a-cursor-alpha-transparent.html [126]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10970/shard-rkl-4/igt@kms_cursor_crc@pipe-a-cursor-alpha-transparent.html [127]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21777/shard-rkl-6/igt@kms_cursor_crc@pipe-a-cursor-alpha-transparent.html * igt@kms_cursor_crc@pipe-b-cursor-128x42-rapid-movement: - {shard-rkl}: [SKIP][128] ([fdo#112022] / [i915#4070]) -> [PASS][129] +1 similar issue [128]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10970/shard-rkl-1/igt@kms_cursor_crc@pipe-b-cursor-128x42-rapid-movement.html [129]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21777/shard-rkl-6/igt@kms_cursor_crc@pipe-b-cursor-128x42-rapid-movement.html * igt@kms_cursor_legacy@cursora-vs-flipa-varying-size: - {shard-rkl}: [SKIP][130] ([fdo#111825] / [i915#4070]) -> [PASS][131] +3 similar issues [130]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10970/shard-rkl-1/igt@kms_cursor_legacy@cursora-vs-flipa-varying-size.html [131]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21777/shard-rkl-6/igt@kms_cursor_legacy@cursora-vs-flipa-varying-size.html * igt@kms_cursor_legacy@flip-vs-cursor-busy-crc-atomic: - shard-skl: [FAIL][132] ([i915#2346]) -> [PASS][133] [132]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10970/shard-skl9/igt@kms_cursor_legacy@flip-vs-cursor-busy-crc-atomic.html [133]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21777/shard-skl10/igt@kms_cursor_legacy@flip-vs-cursor-busy-crc-atomic.html * igt@kms_draw_crc@draw-method-xrgb2101010-mmap-gtt-xtiled: - {shard-rkl}: [SKIP][134] ([fdo#111314]) -> [PASS][135] +1 similar issue [134]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10970/shard-rkl-1/igt@kms_draw_crc@draw-method-xrgb2101010-mmap-gtt-xtiled.html [135]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21777/shard-rkl-6/igt@kms_draw_crc@draw-method-xrgb2101010-mmap-gtt-xtiled.html * igt@kms_flip@flip-vs-expired-vblank@a-edp1: - shard-skl: [FAIL][136] ([i915#79]) -> [PASS][137] +1 similar issue [136]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10970/shard-skl10/igt@kms_flip@flip-vs-expired-vblank@a-edp1.html [137]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21777/shard-skl7/igt@kms_flip@flip-vs-expired-vblank@a-edp1.html * igt@kms_flip@plain-flip-fb-recreate@b-edp1: - shard-skl: [FAIL][138] ([i915#2122]) -> [PASS][139] +3 similar issues [138]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10970/shard-skl3/igt@kms_flip@plain-flip-fb-recreate@b-edp1.html [139]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21777/shard-sk == Logs == For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21777/index.html [-- Attachment #2: Type: text/html, Size: 33510 bytes --] ^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [Intel-gfx] [PATCH] drm/i915/dg2: make GuC FW a requirement for Gen12 and beyond devices 2021-12-07 17:53 ` Adrian Larumbe ` (4 preceding siblings ...) (?) @ 2021-12-08 8:25 ` Tvrtko Ursulin -1 siblings, 0 replies; 10+ messages in thread From: Tvrtko Ursulin @ 2021-12-08 8:25 UTC (permalink / raw) To: Adrian Larumbe, daniel, ramalingam.c, intel-gfx, dri-devel; +Cc: daniels On 07/12/2021 17:53, Adrian Larumbe wrote: > Beginning with DG2, all successive devices will require GuC FW to be > present and loaded at probe() time. This change alters error handling in > the FW init and load functions so that the driver's probe() function will > fail if GuC could not be loaded. > > Signed-off-by: Adrian Larumbe <adrian.larumbe@collabora.com> > --- > drivers/gpu/drm/i915/gt/uc/intel_uc.c | 20 ++++++++++++++++---- > drivers/gpu/drm/i915/gt/uc/intel_uc.h | 4 ++-- > drivers/gpu/drm/i915/i915_gem.c | 7 ++++++- > 3 files changed, 24 insertions(+), 7 deletions(-) > > diff --git a/drivers/gpu/drm/i915/gt/uc/intel_uc.c b/drivers/gpu/drm/i915/gt/uc/intel_uc.c > index 7660eba893fa..8b0778b6d9ab 100644 > --- a/drivers/gpu/drm/i915/gt/uc/intel_uc.c > +++ b/drivers/gpu/drm/i915/gt/uc/intel_uc.c > @@ -277,14 +277,19 @@ static void guc_disable_communication(struct intel_guc *guc) > drm_dbg(&i915->drm, "GuC communication disabled\n"); > } > > -static void __uc_fetch_firmwares(struct intel_uc *uc) > +static int __uc_fetch_firmwares(struct intel_uc *uc) > { > + struct drm_i915_private *i915 = uc_to_gt(uc)->i915; > int err; > > GEM_BUG_ON(!intel_uc_wants_guc(uc)); > > err = intel_uc_fw_fetch(&uc->guc.fw); > if (err) { > + /* GuC is mandatory on Gen12 and beyond */ > + if (GRAPHICS_VER(i915) >= 12) > + return err; > + Is it DG2 or Gen12, latter starts from Tigerlake? Regards, Tvrtko > /* Make sure we transition out of transient "SELECTED" state */ > if (intel_uc_wants_huc(uc)) { > drm_dbg(&uc_to_gt(uc)->i915->drm, > @@ -293,11 +298,13 @@ static void __uc_fetch_firmwares(struct intel_uc *uc) > INTEL_UC_FIRMWARE_ERROR); > } > > - return; > + return 0; > } > > if (intel_uc_wants_huc(uc)) > intel_uc_fw_fetch(&uc->huc.fw); > + > + return 0; > } > > static void __uc_cleanup_firmwares(struct intel_uc *uc) > @@ -308,14 +315,19 @@ static void __uc_cleanup_firmwares(struct intel_uc *uc) > > static int __uc_init(struct intel_uc *uc) > { > + struct drm_i915_private *i915 = uc_to_gt(uc)->i915; > struct intel_guc *guc = &uc->guc; > struct intel_huc *huc = &uc->huc; > int ret; > > GEM_BUG_ON(!intel_uc_wants_guc(uc)); > > - if (!intel_uc_uses_guc(uc)) > - return 0; > + if (!intel_uc_uses_guc(uc)) { > + if (GRAPHICS_VER(i915) >= 12) > + return -EINVAL; > + else > + return 0; > + } > > if (i915_inject_probe_failure(uc_to_gt(uc)->i915)) > return -ENOMEM; > diff --git a/drivers/gpu/drm/i915/gt/uc/intel_uc.h b/drivers/gpu/drm/i915/gt/uc/intel_uc.h > index 866b462821c0..3bcd781447bc 100644 > --- a/drivers/gpu/drm/i915/gt/uc/intel_uc.h > +++ b/drivers/gpu/drm/i915/gt/uc/intel_uc.h > @@ -17,7 +17,7 @@ struct intel_uc; > > struct intel_uc_ops { > int (*sanitize)(struct intel_uc *uc); > - void (*init_fw)(struct intel_uc *uc); > + int (*init_fw)(struct intel_uc *uc); > void (*fini_fw)(struct intel_uc *uc); > int (*init)(struct intel_uc *uc); > void (*fini)(struct intel_uc *uc); > @@ -104,7 +104,7 @@ static inline _TYPE intel_uc_##_NAME(struct intel_uc *uc) \ > return _RET; \ > } > intel_uc_ops_function(sanitize, sanitize, int, 0); > -intel_uc_ops_function(fetch_firmwares, init_fw, void, ); > +intel_uc_ops_function(fetch_firmwares, init_fw, int, 0); > intel_uc_ops_function(cleanup_firmwares, fini_fw, void, ); > intel_uc_ops_function(init, init, int, 0); > intel_uc_ops_function(fini, fini, void, ); > diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c > index 527228d4da7e..7f8204af6826 100644 > --- a/drivers/gpu/drm/i915/i915_gem.c > +++ b/drivers/gpu/drm/i915/i915_gem.c > @@ -1049,7 +1049,12 @@ int i915_gem_init(struct drm_i915_private *dev_priv) > if (ret) > return ret; > > - intel_uc_fetch_firmwares(&dev_priv->gt.uc); > + ret = intel_uc_fetch_firmwares(&dev_priv->gt.uc); > + if (ret) { > + i915_probe_error(dev_priv, "Failed to fetch firmware\n"); > + return ret; > + } > + > intel_wopcm_init(&dev_priv->wopcm); > > ret = i915_init_ggtt(dev_priv); > ^ permalink raw reply [flat|nested] 10+ messages in thread
end of thread, other threads:[~2021-12-09 17:13 UTC | newest]
Thread overview: 10+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-12-07 17:53 [Intel-gfx] [PATCH] drm/i915/dg2: make GuC FW a requirement for Gen12 and beyond devices Adrian Larumbe
2021-12-07 17:53 ` Adrian Larumbe
2021-12-07 21:42 ` [Intel-gfx] ✗ Fi.CI.SPARSE: warning for " Patchwork
2021-12-07 22:12 ` [Intel-gfx] ✓ Fi.CI.BAT: success " Patchwork
2021-12-07 23:15 ` [Intel-gfx] [PATCH] " John Harrison
2021-12-08 17:58 ` Robert Beckett
[not found] ` <27c067e1-3bb3-efce-ee6f-ffce2224f5d1@intel.com>
2021-12-09 14:41 ` Robert Beckett
2021-12-09 17:06 ` John Harrison
2021-12-08 6:36 ` [Intel-gfx] ✗ Fi.CI.IGT: failure for " Patchwork
2021-12-08 8:25 ` [Intel-gfx] [PATCH] " Tvrtko Ursulin
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.