drm/i915/guc: Skip suspend/resume GuC action on platforms w/o GuC submission
Subsystems (2)
PATCH 1/1 drm/i915/guc: Skip suspend/resume GuC action on platforms w/o GuC submission
From: Don Hiatt <[email protected]>
On some platforms (e.g. KBL) that do not support GuC submission, but the user enabled the GuC communication (e.g for HuC authentication) calling the GuC EXIT_S_STATE action results in lose of ability to enter RC6. We can remove the GuC suspend/remove entirely as we do not need to save the GuC submission status.
v2: Do not suspend/resume the GuC on platforms that do not support
Guc Submission.
--- drivers/gpu/drm/i915/gt/uc/intel_uc.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+)
drivers/gpu/drm/i915/gt/uc/intel_uc.c +17 -0
@@ -572,10 +572,19 @@ void intel_uc_runtime_suspend(struct intel_uc *uc)if (!intel_guc_is_running (guc))return ; +/* +* If GuC communciation is enabled but submission is not supported, +* we do not need to suspend the GuC but we do need to disable the +* GuC communication on suspend. +*/ +if (!guc->submission_supported) + goto guc_disable_comm; + err =intel_guc_suspend (guc);if (err)DRM_DEBUG_DRIVER ("Failed to suspend GuC, err=%d" , err); +guc_disable_comm:guc_disable_communication (guc); }
@@ -605,6 +614,14 @@ static int __uc_resume(struct intel_uc *uc, bool enable_communication)if (enable_communication)guc_enable_communication (guc); +/* +* If GuC communciation is enabled but submission is not supported, +* we do not need to resume the GuC but we do need to enable the +* GuC communication on resume (above). +*/ +if (!guc->submission_supported) +return 0 ; + err =intel_guc_resume (guc);if (err) {DRM_DEBUG_DRIVER ("Failed to resume GuC, err=%d" , err);
Signature · 6 lines
2.20.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✗ Fi.CI.BAT: failure for drm/i915/guc: Skip suspend/resume GuC action on platforms w/o GuC submission
== Series Details ==
== Series Details ==
Series: drm/i915/guc: Skip suspend/resume GuC action on platforms w/o GuC submission
URL : https://patchwork.freedesktop.org/series/68685/
State : failure
== Summary ==
CI Bug Log - changes from CI_DRM_7206 -> Patchwork_15037
====================================================
Summary
-------
**FAILURE**
Serious unknown changes coming with Patchwork_15037 absolutely need to be verified manually.
If you think the reported changes have nothing to do with the changes introduced in Patchwork_15037, please notify your bug team to allow them to document this new failure mode, which will reduce false positives in CI.
External URL: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15037/index.html
Possible new issues
-------------------
Here are the unknown changes that may have been introduced in Patchwork_15037:
### IGT changes ###
#### Possible regressions ####
* igt@i915_selftest@live_blt:
- fi-kbl-8809g: [PASS][1] -> [TIMEOUT][2]
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7206/fi-kbl-8809g/igt@i915_selftest@live_blt.html
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15037/fi-kbl-8809g/igt@i915_selftest@live_blt.html
- fi-bxt-dsi: NOTRUN -> [TIMEOUT][3]
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15037/fi-bxt-dsi/igt@i915_selftest@live_blt.html
- fi-skl-lmem: [PASS][4] -> [TIMEOUT][5]
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7206/fi-skl-lmem/igt@i915_selftest@live_blt.html
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15037/fi-skl-lmem/igt@i915_selftest@live_blt.html
- fi-cfl-8700k: [PASS][6] -> [TIMEOUT][7]
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7206/fi-cfl-8700k/igt@i915_selftest@live_blt.html
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15037/fi-cfl-8700k/igt@i915_selftest@live_blt.html
- fi-skl-guc: [PASS][8] -> [TIMEOUT][9]
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7206/fi-skl-guc/igt@i915_selftest@live_blt.html
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15037/fi-skl-guc/igt@i915_selftest@live_blt.html
- fi-cfl-guc: [PASS][10] -> [TIMEOUT][11]
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7206/fi-cfl-guc/igt@i915_selftest@live_blt.html
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15037/fi-cfl-guc/igt@i915_selftest@live_blt.html
- fi-skl-iommu: [PASS][12] -> [TIMEOUT][13]
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7206/fi-skl-iommu/igt@i915_selftest@live_blt.html
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15037/fi-skl-iommu/igt@i915_selftest@live_blt.html
* igt@runner@aborted:
- fi-bxt-dsi: NOTRUN -> [FAIL][14]
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15037/fi-bxt-dsi/igt@[email protected]
- fi-cfl-8700k: NOTRUN -> [FAIL][15]
[15]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15037/fi-cfl-8700k/igt@[email protected]
- fi-kbl-8809g: NOTRUN -> [FAIL][16]
[16]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15037/fi-kbl-8809g/igt@[email protected]
Known issues
------------
Here are the changes found in Patchwork_15037 that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@gem_flink_basic@flink-lifetime:
- fi-icl-u3: [PASS][17] -> [DMESG-WARN][18] ([fdo#107724]) +1 similar issue
[17]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7206/fi-icl-u3/igt@[email protected]
[18]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15037/fi-icl-u3/igt@[email protected]
#### Possible fixes ####
* igt@gem_ctx_create@basic-files:
- {fi-icl-dsi}: [INCOMPLETE][19] ([fdo#107713] / [fdo#109100]) -> [PASS][20]
[19]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7206/fi-icl-dsi/igt@[email protected]
[20]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15037/fi-icl-dsi/igt@[email protected]
* igt@gem_ctx_switch@legacy-render:
- fi-bxt-dsi: [INCOMPLETE][21] ([fdo#103927] / [fdo#111381]) -> [PASS][22]
[21]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7206/fi-bxt-dsi/igt@[email protected]
[22]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15037/fi-bxt-dsi/igt@[email protected]
* igt@gem_mmap_gtt@basic-read-write-distinct:
- fi-icl-u3: [DMESG-WARN][23] ([fdo#107724]) -> [PASS][24] +2 similar issues
[23]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7206/fi-icl-u3/igt@[email protected]
[24]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15037/fi-icl-u3/igt@[email protected]
* igt@i915_selftest@live_blt:
- fi-kbl-r: [TIMEOUT][25] -> [PASS][26]
[25]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7206/fi-kbl-r/igt@i915_selftest@live_blt.html
[26]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15037/fi-kbl-r/igt@i915_selftest@live_blt.html
- fi-icl-u2: [TIMEOUT][27] -> [PASS][28]
[27]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7206/fi-icl-u2/igt@i915_selftest@live_blt.html
[28]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15037/fi-icl-u2/igt@i915_selftest@live_blt.html
- {fi-icl-u4}: [TIMEOUT][29] -> [PASS][30]
[29]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7206/fi-icl-u4/igt@i915_selftest@live_blt.html
[30]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15037/fi-icl-u4/igt@i915_selftest@live_blt.html
{name}: This element is suppressed. This means it is ignored when computing
the status of the difference (SUCCESS, WARNING, or FAILURE).
[fdo#103927]: https://bugs.freedesktop.org/show_bug.cgi?id=103927
[fdo#107713]: https://bugs.freedesktop.org/show_bug.cgi?id=107713
[fdo#107724]: https://bugs.freedesktop.org/show_bug.cgi?id=107724
[fdo#109100]: https://bugs.freedesktop.org/show_bug.cgi?id=109100
[fdo#110566]: https://bugs.freedesktop.org/show_bug.cgi?id=110566
[fdo#111381]: https://bugs.freedesktop.org/show_bug.cgi?id=111381
Participating hosts (50 -> 42)
------------------------------
Missing (8): fi-ilk-m540 fi-hsw-4200u fi-byt-squawks fi-bsw-cyan fi-apl-guc fi-icl-y fi-byt-clapper fi-bdw-samus
Build changes
-------------
* CI: CI-20190529 -> None
* Linux: CI_DRM_7206 -> Patchwork_15037
CI-20190529: 20190529
CI_DRM_7206: 197ff4c24c6762ac5bbd8c5364d6f840fb9929c5 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_5248: 81e55f1f97d73e48f00caa7e4fb98295023c5afa @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_15037: bacfbda2a742316927daa8d7054efce567a83b45 @ git://anongit.freedesktop.org/gfx-ci/linux
== Linux commits ==
bacfbda2a742 drm/i915/guc: Skip suspend/resume GuC action on platforms w/o GuC submission
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15037/index.html
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 21 lines · On Mon, 28 Oct 2019 22:25:27 +0100, <[email protected]> wrote:
From: Don Hiatt <[email protected]>
On some platforms (e.g. KBL) that do not support GuC submission, but the user enabled the GuC communication (e.g for HuC authentication) calling the GuC
EXIT_S_STATEaction results in lose of ability to enter RC6. We can remove the GuC suspend/remove entirely as we do not need to save the GuC submission status.v2: Do not suspend/resume the GuC on platforms that do not support
Guc Submission.Signed-off-by Don Hiatt <[email protected]>--- drivers/gpu/drm/i915/gt/uc/intel_uc.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+)drivers/gpu/drm/i915/gt/uc/intel_uc.c +0
-0
drivers/gpu/drm/i915/gt/uc/intel_uc.c void intel_uc_runtime_suspend(struct intel_uc *uc) · line 575
Quoted 4 lines
drivers/gpu/drm/i915/gt/uc/intel_uc.c +2
-0@@ -572,10 +572,19 @@ void intel_uc_runtime_suspend(struct intel_uc *uc)if (!intel_guc_is_running (guc))return ; +/* +* If GuC communciation is enabled but submission is not supported,
typo
drivers/gpu/drm/i915/gt/uc/intel_uc.c void intel_uc_runtime_suspend(struct intel_uc *uc) · line 580
Quoted 4 lines
drivers/gpu/drm/i915/gt/uc/intel_uc.c +4
-0+* we do not need to suspend the GuC but we do need to disable the +* GuC communication on suspend. +*/ +if (!guc->submission_supported)
Using submission_supported flag directly can be tricky, as today it is always set to false, but in the future it may indicate either that submission is supported by the driver/fw and/or enabled by modparam.
There is no guarantee that it will reflect actual runtime status, as even supported/unblocked guc submission may fallback to execlists.
We may need something like intel_guc_submission_is_active() that will reflect actual mode of submission currently used by the driver.
drivers/gpu/drm/i915/gt/uc/intel_uc.c void intel_uc_runtime_suspend(struct intel_uc *uc) · line 581
Quoted 1 line
drivers/gpu/drm/i915/gt/uc/intel_uc.c +1
-0+ goto guc_disable_comm;
and maybe we can move above logic to intel_guc_suspend() to do not introduce extra goto's ?
drivers/gpu/drm/i915/gt/uc/intel_uc.c static int __uc_resume(struct intel_uc *uc, bool · line 618
Quoted 13 lines
drivers/gpu/drm/i915/gt/uc/intel_uc.c +4
-0+ err =intel_guc_suspend (guc);if (err)DRM_DEBUG_DRIVER ("Failed to suspend GuC, err=%d" , err); +guc_disable_comm:guc_disable_communication (guc); }@@ -605,6 +614,14 @@ static int __uc_resume(struct intel_uc *uc, bool enable_communication)if (enable_communication)guc_enable_communication (guc); +/* +* If GuC communciation is enabled but submission is not supported,
typo
drivers/gpu/drm/i915/gt/uc/intel_uc.c static int __uc_resume(struct intel_uc *uc, bool enable_communication) · line 623
Quoted 5 lines
drivers/gpu/drm/i915/gt/uc/intel_uc.c +5
-0+* we do not need to resume the GuC but we do need to enable the +* GuC communication on resume (above). +*/ +if (!guc->submission_supported) +return 0 ;
see suspend case comment
drivers/gpu/drm/i915/gt/uc/intel_uc.c static int __uc_resume(struct intel_uc *uc, bool enable_communication) · line 627
Quoted 4 lines
drivers/gpu/drm/i915/gt/uc/intel_uc.c +1
-0+ err =intel_guc_resume (guc);if (err) {DRM_DEBUG_DRIVER ("Failed to resume GuC, err=%d" , err);
Thanks,
Michal
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 46 lines
From: Wajdeczko, Michal <[email protected]>
Sent: Tuesday, October 29, 2019 5:33 AM
To: [email protected]; Hiatt, Don <[email protected]>
Subject: Re: [Intel-gfx] [PATCH] drm/i915/guc: Skip suspend/resume GuC action on platforms w/o GuC submissionQuoted 22 lines · On Mon, 28 Oct 2019 22:25:27 +0100, <[email protected]> wrote:
From: Don Hiatt <[email protected]>
On some platforms (e.g. KBL) that do not support GuC submission, but the user enabled the GuC communication (e.g for HuC authentication) calling the GuC
EXIT_S_STATEaction results in lose of ability to enter RC6. We can remove the GuC suspend/remove entirely as we do not need to save the GuC submission status.v2: Do not suspend/resume the GuC on platforms that do not support
Guc Submission.Signed-off-by Don Hiatt <[email protected]>--- drivers/gpu/drm/i915/gt/uc/intel_uc.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+)drivers/gpu/drm/i915/gt/uc/intel_uc.c +0
-0drivers/gpu/drm/i915/gt/uc/intel_uc.c void intel_uc_runtime_suspend(struct intel_uc *uc) · line 575
Quoted 4 lines
drivers/gpu/drm/i915/gt/uc/intel_uc.c +2
-0@@ -572,10 +572,19 @@ void intel_uc_runtime_suspend(struct intel_uc *uc)if (!intel_guc_is_running (guc))return ; +/* +* If GuC communciation is enabled but submission is not supported, typo
drivers/gpu/drm/i915/gt/uc/intel_uc.c void intel_uc_runtime_suspend(struct intel_uc *uc) · line 580
Quoted 4 lines
drivers/gpu/drm/i915/gt/uc/intel_uc.c +4
-0+* we do not need to suspend the GuC but we do need to disable the +* GuC communication on suspend. +*/ +if (!guc->submission_supported)Using
submission_supportedflag directly can be tricky, as today it is always set to false, but in the future it may indicate either that submission is supported by the driver/fw and/or enabled by modparam.
Quoted 5 lines
There is no guarantee that it will reflect actual runtime status, as even supported/unblocked guc submission may fallback to execlists.
We may need something like
intel_guc_submission_is_active()that will reflect actual mode of submission currently used by the driver.
Hi Michal,
I looked at your patch wrt checking the set_default_submission vfunc but as that is for the engine, and here I only have access to the intel_guc struct. I'm not sure just where I can know what the default submission is and then flag it somewhere that I can then check here in the suspend/resume. I'll keep looking (sorry, I'm very new to this code). 😊
Thanks,
don
Quoted 30 lines
drivers/gpu/drm/i915/gt/uc/intel_uc.c void intel_uc_runtime_suspend(struct intel_uc *uc) · line 581
Quoted 2 lines
drivers/gpu/drm/i915/gt/uc/intel_uc.c +1
-0+ goto guc_disable_comm;and maybe we can move above logic to
intel_guc_suspend()to do not introduce extra goto's ?drivers/gpu/drm/i915/gt/uc/intel_uc.c static int __uc_resume(struct intel_uc *uc, bool · line 618
Quoted 13 lines
drivers/gpu/drm/i915/gt/uc/intel_uc.c +4
-0+ err =intel_guc_suspend (guc);if (err)DRM_DEBUG_DRIVER ("Failed to suspend GuC, err=%d" , err); +guc_disable_comm:guc_disable_communication (guc); }@@ -605,6 +614,14 @@ static int __uc_resume(struct intel_uc *uc, bool enable_communication)if (enable_communication)guc_enable_communication (guc); +/* +* If GuC communciation is enabled but submission is not supported, typo
drivers/gpu/drm/i915/gt/uc/intel_uc.c static int __uc_resume(struct intel_uc *uc, bool enable_communication) · line 623
Quoted 5 lines
drivers/gpu/drm/i915/gt/uc/intel_uc.c +5
-0+* we do not need to resume the GuC but we do need to enable the +* GuC communication on resume (above). +*/ +if (!guc->submission_supported) +return 0 ;see suspend case comment
Quoted 7 lines
drivers/gpu/drm/i915/gt/uc/intel_uc.c static int __uc_resume(struct intel_uc *uc, bool enable_communication) · line 627
Quoted 4 lines
drivers/gpu/drm/i915/gt/uc/intel_uc.c +1
-0+ err =intel_guc_resume (guc);if (err) {DRM_DEBUG_DRIVER ("Failed to resume GuC, err=%d" , err);Thanks,
Michal
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 10 lines · Michal Wajdeczko
Review
Quoted 4 lines · On Mon, 28 Oct 2019 22:25:27 +0100, <[email protected]> wrote:
(quoted diff) +4
-0+ * we do not need to suspend the GuC but we do need to disable the + * GuC communication on suspend. + */ + if (!guc->submission_supported)Using
submission_supportedflag directly can be tricky, as today it is always set to false, but in the future it may indicate either that submission is supported by the driver/fw and/or enabled by modparam.
Quoted 5 lines
There is no guarantee that it will reflect actual runtime status, as even supported/unblocked guc submission may fallback to execlists.
We may need something like
intel_guc_submission_is_active()that will reflect actual mode of submission currently used by the driver.
What about this:
drivers/gpu/drm/i915/intel_uc.c +17 -0
@@ -522,10 +522,19 @@ void intel_uc_runtime_suspend(struct drm_i915_private *i915)if (!intel_guc_is_loaded (guc))return ; +/* +* If GuC communication is enabled but submission is not supported, +* we do not need to suspend the GuC but we do need to disable the +* GuC communication on suspend. +*/ +if (!USES_GUC_SUBMISSION (i915)) + goto guc_disable_comm; + err =intel_guc_suspend (guc);if (err)DRM_DEBUG_DRIVER ("Failed to suspend GuC, err=%d" , err); +guc_disable_comm:guc_disable_communication (guc); }
@@ -551,6 +560,14 @@ int intel_uc_resume(struct drm_i915_private *i915)guc_enable_communication (guc); +/* +* If GuC communication is enabled but submission is not supported, +* we do not need to resume the GuC but we do need to enable the +* GuC communication on resume (above). +*/ +if (!USES_GUC_SUBMISSION (i915)) +return 0 ; + err =intel_guc_resume (guc);if (err) {DRM_DEBUG_DRIVER ("Failed to resume GuC, err=%d" , err);
This is what the backport to stable-5.3 will look like anyway as there's no submission_supported there. The name "USES_GUC_SUBMISSION" does suggest it might reflect actual runtime status... :-)
Signature · 5 lines
Tomáš Janoušek, a.k.a. Pivník, a.k.a. Liskni_si, http://work.lisk.in/ _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✗ Fi.CI.BUILD: failure for drm/i915/guc: Skip suspend/resume GuC action on platforms w/o GuC submission (rev2)
In reply to [email protected]== Series Details ==
== Series Details ==
Series: drm/i915/guc: Skip suspend/resume GuC action on platforms w/o GuC submission (rev2)
URL : https://patchwork.freedesktop.org/series/68685/
State : failure
== Summary ==
Applying: drm/i915/guc: Skip suspend/resume GuC action on platforms w/o GuC submission
Using index info to reconstruct a base tree...
A drivers/gpu/drm/i915/intel_uc.c
Falling back to patching base and 3-way merge...
CONFLICT (modify/delete): drivers/gpu/drm/i915/intel_uc.c deleted in HEAD and modified in drm/i915/guc: Skip suspend/resume GuC action on platforms w/o GuC submission. Version drm/i915/guc: Skip suspend/resume GuC action on platforms w/o GuC submission of drivers/gpu/drm/i915/intel_uc.c left in tree.
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch' to see the failed patch
Patch failed at 0001 drm/i915/guc: Skip suspend/resume GuC action on platforms w/o GuC submission
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx