* [Intel-gfx] [PATCH] drm/i915/pxp/mtl: intel_pxp_init_hw needs runtime-pm inside pm-complete
@ 2023-06-01 15:59 Alan Previn
2023-06-01 21:32 ` [Intel-gfx] ✓ Fi.CI.BAT: success for " Patchwork
` (3 more replies)
0 siblings, 4 replies; 6+ messages in thread
From: Alan Previn @ 2023-06-01 15:59 UTC (permalink / raw)
To: intel-gfx; +Cc: dri-devel, Alan Previn
In the case of failed suspend flow or cases where the kernel does not go
into full suspend but goes from suspend_prepare back to resume_complete,
we get called for a pm_complete but without runtime_pm guaranteed.
Thus, ensure we take the runtime_pm when calling intel_pxp_init_hw
from within intel_pxp_resume_complete.
Signed-off-by: Alan Previn <alan.previn.teres.alexis@intel.com>
---
drivers/gpu/drm/i915/pxp/intel_pxp_pm.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/i915/pxp/intel_pxp_pm.c b/drivers/gpu/drm/i915/pxp/intel_pxp_pm.c
index 1a04067f61fc..1d184dcd63c7 100644
--- a/drivers/gpu/drm/i915/pxp/intel_pxp_pm.c
+++ b/drivers/gpu/drm/i915/pxp/intel_pxp_pm.c
@@ -36,6 +36,8 @@ void intel_pxp_suspend(struct intel_pxp *pxp)
void intel_pxp_resume_complete(struct intel_pxp *pxp)
{
+ intel_wakeref_t wakeref;
+
if (!intel_pxp_is_enabled(pxp))
return;
@@ -48,7 +50,8 @@ void intel_pxp_resume_complete(struct intel_pxp *pxp)
if (!HAS_ENGINE(pxp->ctrl_gt, GSC0) && !pxp->pxp_component)
return;
- intel_pxp_init_hw(pxp);
+ with_intel_runtime_pm(&pxp->ctrl_gt->i915->runtime_pm, wakeref)
+ intel_pxp_init_hw(pxp);
}
void intel_pxp_runtime_suspend(struct intel_pxp *pxp)
base-commit: a66da4c33d8ede541aea9ba6d0d73b556a072d54
--
2.39.0
^ permalink raw reply related [flat|nested] 6+ messages in thread* [Intel-gfx] ✓ Fi.CI.BAT: success for drm/i915/pxp/mtl: intel_pxp_init_hw needs runtime-pm inside pm-complete 2023-06-01 15:59 [Intel-gfx] [PATCH] drm/i915/pxp/mtl: intel_pxp_init_hw needs runtime-pm inside pm-complete Alan Previn @ 2023-06-01 21:32 ` Patchwork 2023-06-03 23:48 ` [Intel-gfx] ✓ Fi.CI.IGT: " Patchwork ` (2 subsequent siblings) 3 siblings, 0 replies; 6+ messages in thread From: Patchwork @ 2023-06-01 21:32 UTC (permalink / raw) To: Alan Previn; +Cc: intel-gfx [-- Attachment #1: Type: text/plain, Size: 7178 bytes --] == Series Details == Series: drm/i915/pxp/mtl: intel_pxp_init_hw needs runtime-pm inside pm-complete URL : https://patchwork.freedesktop.org/series/118714/ State : success == Summary == CI Bug Log - changes from CI_DRM_13217 -> Patchwork_118714v1 ==================================================== Summary ------- **SUCCESS** No regressions found. External URL: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_118714v1/index.html Participating hosts (38 -> 37) ------------------------------ Missing (1): fi-kbl-soraka Known issues ------------ Here are the changes found in Patchwork_118714v1 that come from known issues: ### CI changes ### #### Possible fixes #### * boot: - fi-kbl-8809g: [FAIL][1] ([i915#8293] / [i915#8298]) -> [PASS][2] [1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13217/fi-kbl-8809g/boot.html [2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_118714v1/fi-kbl-8809g/boot.html ### IGT changes ### #### Issues hit #### * igt@core_hotunplug@unbind-rebind: - fi-kbl-8809g: NOTRUN -> [ABORT][3] ([i915#8298] / [i915#8299] / [i915#8397]) [3]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_118714v1/fi-kbl-8809g/igt@core_hotunplug@unbind-rebind.html * igt@gem_huc_copy@huc-copy: - fi-kbl-8809g: NOTRUN -> [SKIP][4] ([fdo#109271] / [i915#2190]) [4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_118714v1/fi-kbl-8809g/igt@gem_huc_copy@huc-copy.html * igt@i915_selftest@live@guc: - bat-rpls-2: [PASS][5] -> [DMESG-WARN][6] ([i915#7852]) [5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13217/bat-rpls-2/igt@i915_selftest@live@guc.html [6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_118714v1/bat-rpls-2/igt@i915_selftest@live@guc.html * igt@i915_selftest@live@hangcheck: - bat-dg2-11: NOTRUN -> [INCOMPLETE][7] ([i915#7913]) [7]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_118714v1/bat-dg2-11/igt@i915_selftest@live@hangcheck.html * igt@kms_addfb_basic@too-high: - fi-kbl-8809g: NOTRUN -> [FAIL][8] ([i915#8296]) +2 similar issues [8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_118714v1/fi-kbl-8809g/igt@kms_addfb_basic@too-high.html * igt@kms_force_connector_basic@force-connector-state: - fi-kbl-8809g: NOTRUN -> [DMESG-FAIL][9] ([i915#8299]) [9]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_118714v1/fi-kbl-8809g/igt@kms_force_connector_basic@force-connector-state.html * igt@kms_force_connector_basic@force-edid: - fi-kbl-8809g: NOTRUN -> [CRASH][10] ([i915#8299]) [10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_118714v1/fi-kbl-8809g/igt@kms_force_connector_basic@force-edid.html * igt@kms_pipe_crc_basic@read-crc: - bat-adlp-9: NOTRUN -> [SKIP][11] ([i915#3546]) +1 similar issue [11]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_118714v1/bat-adlp-9/igt@kms_pipe_crc_basic@read-crc.html - bat-dg2-11: NOTRUN -> [SKIP][12] ([i915#1845] / [i915#5354]) +1 similar issue [12]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_118714v1/bat-dg2-11/igt@kms_pipe_crc_basic@read-crc.html * igt@kms_psr@cursor_plane_move: - fi-kbl-8809g: NOTRUN -> [SKIP][13] ([fdo#109271]) +59 similar issues [13]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_118714v1/fi-kbl-8809g/igt@kms_psr@cursor_plane_move.html * igt@kms_setmode@basic-clone-single-crtc: - fi-kbl-8809g: NOTRUN -> [SKIP][14] ([fdo#109271] / [i915#4579]) [14]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_118714v1/fi-kbl-8809g/igt@kms_setmode@basic-clone-single-crtc.html #### Possible fixes #### * igt@i915_selftest@live@gt_mocs: - {bat-mtlp-8}: [DMESG-FAIL][15] ([i915#7059]) -> [PASS][16] [15]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13217/bat-mtlp-8/igt@i915_selftest@live@gt_mocs.html [16]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_118714v1/bat-mtlp-8/igt@i915_selftest@live@gt_mocs.html * igt@i915_selftest@live@reset: - bat-dg2-11: [INCOMPLETE][17] ([i915#7913]) -> [PASS][18] [17]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13217/bat-dg2-11/igt@i915_selftest@live@reset.html [18]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_118714v1/bat-dg2-11/igt@i915_selftest@live@reset.html * igt@kms_pipe_crc_basic@nonblocking-crc@pipe-d-dp-1: - bat-dg2-8: [FAIL][19] ([i915#7932]) -> [PASS][20] [19]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13217/bat-dg2-8/igt@kms_pipe_crc_basic@nonblocking-crc@pipe-d-dp-1.html [20]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_118714v1/bat-dg2-8/igt@kms_pipe_crc_basic@nonblocking-crc@pipe-d-dp-1.html #### Warnings #### * igt@kms_setmode@basic-clone-single-crtc: - bat-rplp-1: [SKIP][21] ([i915#3555] / [i915#4579]) -> [ABORT][22] ([i915#4579] / [i915#8260]) [21]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13217/bat-rplp-1/igt@kms_setmode@basic-clone-single-crtc.html [22]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_118714v1/bat-rplp-1/igt@kms_setmode@basic-clone-single-crtc.html {name}: This element is suppressed. This means it is ignored when computing the status of the difference (SUCCESS, WARNING, or FAILURE). [fdo#109271]: https://bugs.freedesktop.org/show_bug.cgi?id=109271 [i915#1845]: https://gitlab.freedesktop.org/drm/intel/issues/1845 [i915#2190]: https://gitlab.freedesktop.org/drm/intel/issues/2190 [i915#3546]: https://gitlab.freedesktop.org/drm/intel/issues/3546 [i915#3555]: https://gitlab.freedesktop.org/drm/intel/issues/3555 [i915#4579]: https://gitlab.freedesktop.org/drm/intel/issues/4579 [i915#5354]: https://gitlab.freedesktop.org/drm/intel/issues/5354 [i915#7059]: https://gitlab.freedesktop.org/drm/intel/issues/7059 [i915#7699]: https://gitlab.freedesktop.org/drm/intel/issues/7699 [i915#7852]: https://gitlab.freedesktop.org/drm/intel/issues/7852 [i915#7913]: https://gitlab.freedesktop.org/drm/intel/issues/7913 [i915#7932]: https://gitlab.freedesktop.org/drm/intel/issues/7932 [i915#8260]: https://gitlab.freedesktop.org/drm/intel/issues/8260 [i915#8293]: https://gitlab.freedesktop.org/drm/intel/issues/8293 [i915#8296]: https://gitlab.freedesktop.org/drm/intel/issues/8296 [i915#8298]: https://gitlab.freedesktop.org/drm/intel/issues/8298 [i915#8299]: https://gitlab.freedesktop.org/drm/intel/issues/8299 [i915#8397]: https://gitlab.freedesktop.org/drm/intel/issues/8397 Build changes ------------- * Linux: CI_DRM_13217 -> Patchwork_118714v1 CI-20190529: 20190529 CI_DRM_13217: 37b9b6d05f2421323eb83d005d8863f59855b003 @ git://anongit.freedesktop.org/gfx-ci/linux IGT_7317: c902b72df45aa49faa38205bc5be3c748d33a3e0 @ https://gitlab.freedesktop.org/drm/igt-gpu-tools.git Patchwork_118714v1: 37b9b6d05f2421323eb83d005d8863f59855b003 @ git://anongit.freedesktop.org/gfx-ci/linux ### Linux commits 8359f7546523 drm/i915/pxp/mtl: intel_pxp_init_hw needs runtime-pm inside pm-complete == Logs == For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_118714v1/index.html [-- Attachment #2: Type: text/html, Size: 8630 bytes --] ^ permalink raw reply [flat|nested] 6+ messages in thread
* [Intel-gfx] ✓ Fi.CI.IGT: success for drm/i915/pxp/mtl: intel_pxp_init_hw needs runtime-pm inside pm-complete 2023-06-01 15:59 [Intel-gfx] [PATCH] drm/i915/pxp/mtl: intel_pxp_init_hw needs runtime-pm inside pm-complete Alan Previn 2023-06-01 21:32 ` [Intel-gfx] ✓ Fi.CI.BAT: success for " Patchwork @ 2023-06-03 23:48 ` Patchwork 2023-06-13 15:34 ` [Intel-gfx] [PATCH] " Belgaumkar, Vinay 2023-07-27 21:04 ` Ceraolo Spurio, Daniele 3 siblings, 0 replies; 6+ messages in thread From: Patchwork @ 2023-06-03 23:48 UTC (permalink / raw) To: Alan Previn; +Cc: intel-gfx [-- Attachment #1: Type: text/plain, Size: 11751 bytes --] == Series Details == Series: drm/i915/pxp/mtl: intel_pxp_init_hw needs runtime-pm inside pm-complete URL : https://patchwork.freedesktop.org/series/118714/ State : success == Summary == CI Bug Log - changes from CI_DRM_13217_full -> Patchwork_118714v1_full ==================================================== Summary ------- **SUCCESS** No regressions found. Participating hosts (7 -> 7) ------------------------------ No changes in participating hosts Known issues ------------ Here are the changes found in Patchwork_118714v1_full that come from known issues: ### IGT changes ### #### Issues hit #### * igt@gem_exec_fair@basic-pace-share@rcs0: - shard-apl: [PASS][1] -> [FAIL][2] ([i915#2842]) [1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13217/shard-apl6/igt@gem_exec_fair@basic-pace-share@rcs0.html [2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_118714v1/shard-apl1/igt@gem_exec_fair@basic-pace-share@rcs0.html * igt@gen9_exec_parse@allowed-single: - shard-glk: [PASS][3] -> [ABORT][4] ([i915#5566]) [3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13217/shard-glk6/igt@gen9_exec_parse@allowed-single.html [4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_118714v1/shard-glk1/igt@gen9_exec_parse@allowed-single.html * igt@kms_plane_scaling@plane-upscale-with-modifiers-20x20@pipe-b-vga-1: - shard-snb: NOTRUN -> [SKIP][5] ([fdo#109271] / [i915#4579]) +7 similar issues [5]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_118714v1/shard-snb2/igt@kms_plane_scaling@plane-upscale-with-modifiers-20x20@pipe-b-vga-1.html * igt@kms_plane_scaling@planes-downscale-factor-0-25-unity-scaling@pipe-a-hdmi-a-1: - shard-snb: NOTRUN -> [SKIP][6] ([fdo#109271]) +6 similar issues [6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_118714v1/shard-snb1/igt@kms_plane_scaling@planes-downscale-factor-0-25-unity-scaling@pipe-a-hdmi-a-1.html #### Possible fixes #### * igt@drm_fdinfo@most-busy-idle-check-all@rcs0: - {shard-rkl}: [FAIL][7] ([i915#7742]) -> [PASS][8] [7]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13217/shard-rkl-2/igt@drm_fdinfo@most-busy-idle-check-all@rcs0.html [8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_118714v1/shard-rkl-3/igt@drm_fdinfo@most-busy-idle-check-all@rcs0.html * igt@gem_eio@reset-stress: - {shard-dg1}: [FAIL][9] ([i915#5784]) -> [PASS][10] [9]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13217/shard-dg1-14/igt@gem_eio@reset-stress.html [10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_118714v1/shard-dg1-18/igt@gem_eio@reset-stress.html * igt@gem_exec_fair@basic-pace-share@rcs0: - {shard-tglu}: [FAIL][11] ([i915#2842]) -> [PASS][12] [11]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13217/shard-tglu-5/igt@gem_exec_fair@basic-pace-share@rcs0.html [12]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_118714v1/shard-tglu-5/igt@gem_exec_fair@basic-pace-share@rcs0.html * igt@gem_exec_fair@basic-pace@rcs0: - {shard-rkl}: [FAIL][13] ([i915#2842]) -> [PASS][14] [13]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13217/shard-rkl-2/igt@gem_exec_fair@basic-pace@rcs0.html [14]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_118714v1/shard-rkl-3/igt@gem_exec_fair@basic-pace@rcs0.html * igt@gem_exec_suspend@basic-s4-devices@lmem0: - {shard-dg1}: [ABORT][15] ([i915#7975] / [i915#8213]) -> [PASS][16] [15]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13217/shard-dg1-14/igt@gem_exec_suspend@basic-s4-devices@lmem0.html [16]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_118714v1/shard-dg1-17/igt@gem_exec_suspend@basic-s4-devices@lmem0.html * igt@gem_exec_suspend@basic-s4-devices@smem: - {shard-tglu}: [ABORT][17] ([i915#7975] / [i915#8213]) -> [PASS][18] [17]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13217/shard-tglu-10/igt@gem_exec_suspend@basic-s4-devices@smem.html [18]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_118714v1/shard-tglu-3/igt@gem_exec_suspend@basic-s4-devices@smem.html * igt@i915_pm_rpm@modeset-lpsp: - {shard-rkl}: [SKIP][19] ([i915#1397]) -> [PASS][20] [19]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13217/shard-rkl-4/igt@i915_pm_rpm@modeset-lpsp.html [20]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_118714v1/shard-rkl-7/igt@i915_pm_rpm@modeset-lpsp.html * igt@i915_pm_rpm@modeset-lpsp-stress-no-wait: - {shard-dg1}: [SKIP][21] ([i915#1397]) -> [PASS][22] [21]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13217/shard-dg1-18/igt@i915_pm_rpm@modeset-lpsp-stress-no-wait.html [22]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_118714v1/shard-dg1-19/igt@i915_pm_rpm@modeset-lpsp-stress-no-wait.html * igt@kms_cursor_legacy@flip-vs-cursor-atomic-transitions: - shard-apl: [FAIL][23] ([i915#2346]) -> [PASS][24] [23]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13217/shard-apl6/igt@kms_cursor_legacy@flip-vs-cursor-atomic-transitions.html [24]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_118714v1/shard-apl2/igt@kms_cursor_legacy@flip-vs-cursor-atomic-transitions.html * igt@kms_cursor_legacy@forked-bo@pipe-b: - {shard-rkl}: [INCOMPLETE][25] ([i915#8011]) -> [PASS][26] [25]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13217/shard-rkl-7/igt@kms_cursor_legacy@forked-bo@pipe-b.html [26]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_118714v1/shard-rkl-4/igt@kms_cursor_legacy@forked-bo@pipe-b.html {name}: This element is suppressed. This means it is ignored when computing the status of the difference (SUCCESS, WARNING, or FAILURE). [IGT#2]: https://gitlab.freedesktop.org/drm/igt-gpu-tools/issues/2 [fdo#109271]: https://bugs.freedesktop.org/show_bug.cgi?id=109271 [fdo#109274]: https://bugs.freedesktop.org/show_bug.cgi?id=109274 [fdo#109279]: https://bugs.freedesktop.org/show_bug.cgi?id=109279 [fdo#109280]: https://bugs.freedesktop.org/show_bug.cgi?id=109280 [fdo#109289]: https://bugs.freedesktop.org/show_bug.cgi?id=109289 [fdo#109315]: https://bugs.freedesktop.org/show_bug.cgi?id=109315 [fdo#110189]: https://bugs.freedesktop.org/show_bug.cgi?id=110189 [fdo#111614]: https://bugs.freedesktop.org/show_bug.cgi?id=111614 [fdo#111615]: https://bugs.freedesktop.org/show_bug.cgi?id=111615 [fdo#111644]: https://bugs.freedesktop.org/show_bug.cgi?id=111644 [fdo#111825]: https://bugs.freedesktop.org/show_bug.cgi?id=111825 [i915#1072]: https://gitlab.freedesktop.org/drm/intel/issues/1072 [i915#1397]: https://gitlab.freedesktop.org/drm/intel/issues/1397 [i915#2346]: https://gitlab.freedesktop.org/drm/intel/issues/2346 [i915#2527]: https://gitlab.freedesktop.org/drm/intel/issues/2527 [i915#2575]: https://gitlab.freedesktop.org/drm/intel/issues/2575 [i915#2587]: https://gitlab.freedesktop.org/drm/intel/issues/2587 [i915#2672]: https://gitlab.freedesktop.org/drm/intel/issues/2672 [i915#2842]: https://gitlab.freedesktop.org/drm/intel/issues/2842 [i915#2856]: https://gitlab.freedesktop.org/drm/intel/issues/2856 [i915#3281]: https://gitlab.freedesktop.org/drm/intel/issues/3281 [i915#3282]: https://gitlab.freedesktop.org/drm/intel/issues/3282 [i915#3297]: https://gitlab.freedesktop.org/drm/intel/issues/3297 [i915#3299]: https://gitlab.freedesktop.org/drm/intel/issues/3299 [i915#3359]: https://gitlab.freedesktop.org/drm/intel/issues/3359 [i915#3458]: https://gitlab.freedesktop.org/drm/intel/issues/3458 [i915#3539]: https://gitlab.freedesktop.org/drm/intel/issues/3539 [i915#3555]: https://gitlab.freedesktop.org/drm/intel/issues/3555 [i915#3591]: https://gitlab.freedesktop.org/drm/intel/issues/3591 [i915#3637]: https://gitlab.freedesktop.org/drm/intel/issues/3637 [i915#3638]: https://gitlab.freedesktop.org/drm/intel/issues/3638 [i915#3689]: https://gitlab.freedesktop.org/drm/intel/issues/3689 [i915#3743]: https://gitlab.freedesktop.org/drm/intel/issues/3743 [i915#3804]: https://gitlab.freedesktop.org/drm/intel/issues/3804 [i915#3886]: https://gitlab.freedesktop.org/drm/intel/issues/3886 [i915#3955]: https://gitlab.freedesktop.org/drm/intel/issues/3955 [i915#4077]: https://gitlab.freedesktop.org/drm/intel/issues/4077 [i915#4078]: https://gitlab.freedesktop.org/drm/intel/issues/4078 [i915#4103]: https://gitlab.freedesktop.org/drm/intel/issues/4103 [i915#4212]: https://gitlab.freedesktop.org/drm/intel/issues/4212 [i915#4213]: https://gitlab.freedesktop.org/drm/intel/issues/4213 [i915#426]: https://gitlab.freedesktop.org/drm/intel/issues/426 [i915#4270]: https://gitlab.freedesktop.org/drm/intel/issues/4270 [i915#4538]: https://gitlab.freedesktop.org/drm/intel/issues/4538 [i915#4565]: https://gitlab.freedesktop.org/drm/intel/issues/4565 [i915#4579]: https://gitlab.freedesktop.org/drm/intel/issues/4579 [i915#4613]: https://gitlab.freedesktop.org/drm/intel/issues/4613 [i915#4833]: https://gitlab.freedesktop.org/drm/intel/issues/4833 [i915#4852]: https://gitlab.freedesktop.org/drm/intel/issues/4852 [i915#4854]: https://gitlab.freedesktop.org/drm/intel/issues/4854 [i915#4958]: https://gitlab.freedesktop.org/drm/intel/issues/4958 [i915#5176]: https://gitlab.freedesktop.org/drm/intel/issues/5176 [i915#5235]: https://gitlab.freedesktop.org/drm/intel/issues/5235 [i915#5286]: https://gitlab.freedesktop.org/drm/intel/issues/5286 [i915#5354]: https://gitlab.freedesktop.org/drm/intel/issues/5354 [i915#5566]: https://gitlab.freedesktop.org/drm/intel/issues/5566 [i915#5784]: https://gitlab.freedesktop.org/drm/intel/issues/5784 [i915#6095]: https://gitlab.freedesktop.org/drm/intel/issues/6095 [i915#6268]: https://gitlab.freedesktop.org/drm/intel/issues/6268 [i915#6493]: https://gitlab.freedesktop.org/drm/intel/issues/6493 [i915#658]: https://gitlab.freedesktop.org/drm/intel/issues/658 [i915#6944]: https://gitlab.freedesktop.org/drm/intel/issues/6944 [i915#6953]: https://gitlab.freedesktop.org/drm/intel/issues/6953 [i915#7116]: https://gitlab.freedesktop.org/drm/intel/issues/7116 [i915#7118]: https://gitlab.freedesktop.org/drm/intel/issues/7118 [i915#7561]: https://gitlab.freedesktop.org/drm/intel/issues/7561 [i915#7711]: https://gitlab.freedesktop.org/drm/intel/issues/7711 [i915#7742]: https://gitlab.freedesktop.org/drm/intel/issues/7742 [i915#7828]: https://gitlab.freedesktop.org/drm/intel/issues/7828 [i915#7975]: https://gitlab.freedesktop.org/drm/intel/issues/7975 [i915#8011]: https://gitlab.freedesktop.org/drm/intel/issues/8011 [i915#8213]: https://gitlab.freedesktop.org/drm/intel/issues/8213 [i915#8228]: https://gitlab.freedesktop.org/drm/intel/issues/8228 [i915#8292]: https://gitlab.freedesktop.org/drm/intel/issues/8292 [i915#8311]: https://gitlab.freedesktop.org/drm/intel/issues/8311 [i915#8411]: https://gitlab.freedesktop.org/drm/intel/issues/8411 [i915#8414]: https://gitlab.freedesktop.org/drm/intel/issues/8414 [i915#8555]: https://gitlab.freedesktop.org/drm/intel/issues/8555 Build changes ------------- * Linux: CI_DRM_13217 -> Patchwork_118714v1 CI-20190529: 20190529 CI_DRM_13217: 37b9b6d05f2421323eb83d005d8863f59855b003 @ git://anongit.freedesktop.org/gfx-ci/linux IGT_7317: c902b72df45aa49faa38205bc5be3c748d33a3e0 @ https://gitlab.freedesktop.org/drm/igt-gpu-tools.git Patchwork_118714v1: 37b9b6d05f2421323eb83d005d8863f59855b003 @ git://anongit.freedesktop.org/gfx-ci/linux piglit_4509: fdc5a4ca11124ab8413c7988896eec4c97336694 @ git://anongit.freedesktop.org/piglit == Logs == For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_118714v1/index.html [-- Attachment #2: Type: text/html, Size: 8477 bytes --] ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [Intel-gfx] [PATCH] drm/i915/pxp/mtl: intel_pxp_init_hw needs runtime-pm inside pm-complete 2023-06-01 15:59 [Intel-gfx] [PATCH] drm/i915/pxp/mtl: intel_pxp_init_hw needs runtime-pm inside pm-complete Alan Previn 2023-06-01 21:32 ` [Intel-gfx] ✓ Fi.CI.BAT: success for " Patchwork 2023-06-03 23:48 ` [Intel-gfx] ✓ Fi.CI.IGT: " Patchwork @ 2023-06-13 15:34 ` Belgaumkar, Vinay 2023-07-27 21:04 ` Ceraolo Spurio, Daniele 3 siblings, 0 replies; 6+ messages in thread From: Belgaumkar, Vinay @ 2023-06-13 15:34 UTC (permalink / raw) To: Alan Previn, intel-gfx; +Cc: dri-devel On 6/1/2023 8:59 AM, Alan Previn wrote: > In the case of failed suspend flow or cases where the kernel does not go > into full suspend but goes from suspend_prepare back to resume_complete, > we get called for a pm_complete but without runtime_pm guaranteed. > > Thus, ensure we take the runtime_pm when calling intel_pxp_init_hw > from within intel_pxp_resume_complete. LGTM, Reviewed-by: Vinay Belgaumkar <vinay.belgaumkar@intel.com> > > Signed-off-by: Alan Previn <alan.previn.teres.alexis@intel.com> > --- > drivers/gpu/drm/i915/pxp/intel_pxp_pm.c | 5 ++++- > 1 file changed, 4 insertions(+), 1 deletion(-) > > diff --git a/drivers/gpu/drm/i915/pxp/intel_pxp_pm.c b/drivers/gpu/drm/i915/pxp/intel_pxp_pm.c > index 1a04067f61fc..1d184dcd63c7 100644 > --- a/drivers/gpu/drm/i915/pxp/intel_pxp_pm.c > +++ b/drivers/gpu/drm/i915/pxp/intel_pxp_pm.c > @@ -36,6 +36,8 @@ void intel_pxp_suspend(struct intel_pxp *pxp) > > void intel_pxp_resume_complete(struct intel_pxp *pxp) > { > + intel_wakeref_t wakeref; > + > if (!intel_pxp_is_enabled(pxp)) > return; > > @@ -48,7 +50,8 @@ void intel_pxp_resume_complete(struct intel_pxp *pxp) > if (!HAS_ENGINE(pxp->ctrl_gt, GSC0) && !pxp->pxp_component) > return; > > - intel_pxp_init_hw(pxp); > + with_intel_runtime_pm(&pxp->ctrl_gt->i915->runtime_pm, wakeref) > + intel_pxp_init_hw(pxp); > } > > void intel_pxp_runtime_suspend(struct intel_pxp *pxp) > > base-commit: a66da4c33d8ede541aea9ba6d0d73b556a072d54 ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [Intel-gfx] [PATCH] drm/i915/pxp/mtl: intel_pxp_init_hw needs runtime-pm inside pm-complete 2023-06-01 15:59 [Intel-gfx] [PATCH] drm/i915/pxp/mtl: intel_pxp_init_hw needs runtime-pm inside pm-complete Alan Previn ` (2 preceding siblings ...) 2023-06-13 15:34 ` [Intel-gfx] [PATCH] " Belgaumkar, Vinay @ 2023-07-27 21:04 ` Ceraolo Spurio, Daniele 2023-08-02 18:35 ` Teres Alexis, Alan Previn 3 siblings, 1 reply; 6+ messages in thread From: Ceraolo Spurio, Daniele @ 2023-07-27 21:04 UTC (permalink / raw) To: Alan Previn, intel-gfx; +Cc: dri-devel On 6/1/2023 8:59 AM, Alan Previn wrote: > In the case of failed suspend flow or cases where the kernel does not go > into full suspend but goes from suspend_prepare back to resume_complete, > we get called for a pm_complete but without runtime_pm guaranteed. > > Thus, ensure we take the runtime_pm when calling intel_pxp_init_hw > from within intel_pxp_resume_complete. > > Signed-off-by: Alan Previn <alan.previn.teres.alexis@intel.com> > --- > drivers/gpu/drm/i915/pxp/intel_pxp_pm.c | 5 ++++- > 1 file changed, 4 insertions(+), 1 deletion(-) > > diff --git a/drivers/gpu/drm/i915/pxp/intel_pxp_pm.c b/drivers/gpu/drm/i915/pxp/intel_pxp_pm.c > index 1a04067f61fc..1d184dcd63c7 100644 > --- a/drivers/gpu/drm/i915/pxp/intel_pxp_pm.c > +++ b/drivers/gpu/drm/i915/pxp/intel_pxp_pm.c > @@ -36,6 +36,8 @@ void intel_pxp_suspend(struct intel_pxp *pxp) > > void intel_pxp_resume_complete(struct intel_pxp *pxp) > { > + intel_wakeref_t wakeref; > + > if (!intel_pxp_is_enabled(pxp)) > return; > > @@ -48,7 +50,8 @@ void intel_pxp_resume_complete() > if (!HAS_ENGINE(pxp->ctrl_gt, GSC0) && !pxp->pxp_component) > return; > > - intel_pxp_init_hw(pxp); > + with_intel_runtime_pm(&pxp->ctrl_gt->i915->runtime_pm, wakeref) This is called from within the rpm resume path, so you can't do an rpm get or it will deadlock. Maybe have: __pxp_resume_complete(struct intel_pxp *pxp, bool needs_rpm); intel_pxp_resume_complete(..) { return __pxp_resume_complete(pxp, true); } intel_pxp_runtime_resume(..) { return __pxp_resume_complete(pxp, false); } or something like that. Daniele > + intel_pxp_init_hw(pxp); > } > > void intel_pxp_runtime_suspend(struct intel_pxp *pxp) > > base-commit: a66da4c33d8ede541aea9ba6d0d73b556a072d54 ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [Intel-gfx] [PATCH] drm/i915/pxp/mtl: intel_pxp_init_hw needs runtime-pm inside pm-complete 2023-07-27 21:04 ` Ceraolo Spurio, Daniele @ 2023-08-02 18:35 ` Teres Alexis, Alan Previn 0 siblings, 0 replies; 6+ messages in thread From: Teres Alexis, Alan Previn @ 2023-08-02 18:35 UTC (permalink / raw) To: Ceraolo Spurio, Daniele, intel-gfx@lists.freedesktop.org Cc: dri-devel@lists.freedesktop.org > > > > alan:snip Thanks Vinay and Daniele - i'll respin with below fix. > > @@ -48,7 +50,8 @@ void intel_pxp_resume_complete() > > if (!HAS_ENGINE(pxp->ctrl_gt, GSC0) && !pxp->pxp_component) > > return; > > > > - intel_pxp_init_hw(pxp); > > + with_intel_runtime_pm(&pxp->ctrl_gt->i915->runtime_pm, wakeref) > > This is called from within the rpm resume path, so you can't do an rpm > get or it will deadlock. Maybe have: > > __pxp_resume_complete(struct intel_pxp *pxp, bool needs_rpm); > > intel_pxp_resume_complete(..) > { > return __pxp_resume_complete(pxp, true); > } > > intel_pxp_runtime_resume(..) > { > return __pxp_resume_complete(pxp, false); > } > > > or something like that. > Daniele ^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2023-08-02 18:35 UTC | newest] Thread overview: 6+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2023-06-01 15:59 [Intel-gfx] [PATCH] drm/i915/pxp/mtl: intel_pxp_init_hw needs runtime-pm inside pm-complete Alan Previn 2023-06-01 21:32 ` [Intel-gfx] ✓ Fi.CI.BAT: success for " Patchwork 2023-06-03 23:48 ` [Intel-gfx] ✓ Fi.CI.IGT: " Patchwork 2023-06-13 15:34 ` [Intel-gfx] [PATCH] " Belgaumkar, Vinay 2023-07-27 21:04 ` Ceraolo Spurio, Daniele 2023-08-02 18:35 ` Teres Alexis, Alan Previn
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox