* [Intel-gfx] [PATCH] drm/i915: Remove i915_drm_suspend_mode
@ 2023-01-10 10:59 Maarten Lankhorst
2023-01-10 13:00 ` [Intel-gfx] ✓ Fi.CI.BAT: success for " Patchwork
` (2 more replies)
0 siblings, 3 replies; 5+ messages in thread
From: Maarten Lankhorst @ 2023-01-10 10:59 UTC (permalink / raw)
To: intel-gfx
enum i915_drm_suspend_mode suspend_mode is only used in
intel_display_power, while we only care about whether we perform a
s2idle. Remove it and use a simple bool.
Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
---
.../gpu/drm/i915/display/intel_display_power.c | 8 +++-----
.../gpu/drm/i915/display/intel_display_power.h | 3 +--
drivers/gpu/drm/i915/i915_driver.c | 16 ++--------------
drivers/gpu/drm/i915/intel_runtime_pm.h | 6 ------
4 files changed, 6 insertions(+), 27 deletions(-)
diff --git a/drivers/gpu/drm/i915/display/intel_display_power.c b/drivers/gpu/drm/i915/display/intel_display_power.c
index 060e0a2770f7..6ef937afe48e 100644
--- a/drivers/gpu/drm/i915/display/intel_display_power.c
+++ b/drivers/gpu/drm/i915/display/intel_display_power.c
@@ -2029,7 +2029,7 @@ void intel_power_domains_disable(struct drm_i915_private *i915)
/**
* intel_power_domains_suspend - suspend power domain state
* @i915: i915 device instance
- * @suspend_mode: specifies the target suspend state (idle, mem, hibernation)
+ * @s2idle: specifies whether we go to idle, or deeper sleep
*
* This function prepares the hardware power domain state before entering
* system suspend.
@@ -2037,8 +2037,7 @@ void intel_power_domains_disable(struct drm_i915_private *i915)
* It must be called with power domains already disabled (after a call to
* intel_power_domains_disable()) and paired with intel_power_domains_resume().
*/
-void intel_power_domains_suspend(struct drm_i915_private *i915,
- enum i915_drm_suspend_mode suspend_mode)
+void intel_power_domains_suspend(struct drm_i915_private *i915, bool s2idle)
{
struct i915_power_domains *power_domains = &i915->display.power.domains;
intel_wakeref_t wakeref __maybe_unused =
@@ -2054,8 +2053,7 @@ void intel_power_domains_suspend(struct drm_i915_private *i915,
* that would be blocked if the firmware was inactive.
*/
if (!(i915->display.dmc.allowed_dc_mask & DC_STATE_EN_DC9) &&
- suspend_mode == I915_DRM_SUSPEND_IDLE &&
- intel_dmc_has_payload(i915)) {
+ s2idle && intel_dmc_has_payload(i915)) {
intel_display_power_flush_work(i915);
intel_power_domains_verify_state(i915);
return;
diff --git a/drivers/gpu/drm/i915/display/intel_display_power.h b/drivers/gpu/drm/i915/display/intel_display_power.h
index 6480afcfe0d8..04216be1d6fe 100644
--- a/drivers/gpu/drm/i915/display/intel_display_power.h
+++ b/drivers/gpu/drm/i915/display/intel_display_power.h
@@ -164,8 +164,7 @@ void intel_power_domains_init_hw(struct drm_i915_private *dev_priv, bool resume)
void intel_power_domains_driver_remove(struct drm_i915_private *dev_priv);
void intel_power_domains_enable(struct drm_i915_private *dev_priv);
void intel_power_domains_disable(struct drm_i915_private *dev_priv);
-void intel_power_domains_suspend(struct drm_i915_private *dev_priv,
- enum i915_drm_suspend_mode);
+void intel_power_domains_suspend(struct drm_i915_private *dev_priv, bool s2idle);
void intel_power_domains_resume(struct drm_i915_private *dev_priv);
void intel_power_domains_sanitize_state(struct drm_i915_private *dev_priv);
diff --git a/drivers/gpu/drm/i915/i915_driver.c b/drivers/gpu/drm/i915/i915_driver.c
index 9c49cc7a246d..a02dd8e38f2a 100644
--- a/drivers/gpu/drm/i915/i915_driver.c
+++ b/drivers/gpu/drm/i915/i915_driver.c
@@ -1232,18 +1232,6 @@ static int i915_drm_suspend(struct drm_device *dev)
return 0;
}
-static enum i915_drm_suspend_mode
-get_suspend_mode(struct drm_i915_private *dev_priv, bool hibernate)
-{
- if (hibernate)
- return I915_DRM_SUSPEND_HIBERNATE;
-
- if (suspend_to_idle(dev_priv))
- return I915_DRM_SUSPEND_IDLE;
-
- return I915_DRM_SUSPEND_MEM;
-}
-
static int i915_drm_suspend_late(struct drm_device *dev, bool hibernation)
{
struct drm_i915_private *dev_priv = to_i915(dev);
@@ -1251,6 +1239,7 @@ static int i915_drm_suspend_late(struct drm_device *dev, bool hibernation)
struct intel_runtime_pm *rpm = &dev_priv->runtime_pm;
struct intel_gt *gt;
int ret, i;
+ bool s2idle = !hibernation && suspend_to_idle(dev_priv);
disable_rpm_wakeref_asserts(rpm);
@@ -1259,8 +1248,7 @@ static int i915_drm_suspend_late(struct drm_device *dev, bool hibernation)
for_each_gt(gt, dev_priv, i)
intel_uncore_suspend(gt->uncore);
- intel_power_domains_suspend(dev_priv,
- get_suspend_mode(dev_priv, hibernation));
+ intel_power_domains_suspend(dev_priv, s2idle);
intel_display_power_suspend_late(dev_priv);
diff --git a/drivers/gpu/drm/i915/intel_runtime_pm.h b/drivers/gpu/drm/i915/intel_runtime_pm.h
index d9160e3ff4af..c87ae95bfd18 100644
--- a/drivers/gpu/drm/i915/intel_runtime_pm.h
+++ b/drivers/gpu/drm/i915/intel_runtime_pm.h
@@ -16,12 +16,6 @@ struct device;
struct drm_i915_private;
struct drm_printer;
-enum i915_drm_suspend_mode {
- I915_DRM_SUSPEND_IDLE,
- I915_DRM_SUSPEND_MEM,
- I915_DRM_SUSPEND_HIBERNATE,
-};
-
/*
* This struct helps tracking the state needed for runtime PM, which puts the
* device in PCI D3 state. Notice that when this happens, nothing on the
--
2.34.1
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [Intel-gfx] ✓ Fi.CI.BAT: success for drm/i915: Remove i915_drm_suspend_mode
2023-01-10 10:59 [Intel-gfx] [PATCH] drm/i915: Remove i915_drm_suspend_mode Maarten Lankhorst
@ 2023-01-10 13:00 ` Patchwork
2023-01-10 17:02 ` [Intel-gfx] ✓ Fi.CI.IGT: " Patchwork
2023-01-10 17:26 ` [Intel-gfx] [PATCH] " Rodrigo Vivi
2 siblings, 0 replies; 5+ messages in thread
From: Patchwork @ 2023-01-10 13:00 UTC (permalink / raw)
To: Maarten Lankhorst; +Cc: intel-gfx
[-- Attachment #1: Type: text/plain, Size: 3835 bytes --]
== Series Details ==
Series: drm/i915: Remove i915_drm_suspend_mode
URL : https://patchwork.freedesktop.org/series/112607/
State : success
== Summary ==
CI Bug Log - changes from CI_DRM_12565 -> Patchwork_112607v1
====================================================
Summary
-------
**SUCCESS**
No regressions found.
External URL: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_112607v1/index.html
Participating hosts (41 -> 40)
------------------------------
Additional (1): fi-kbl-soraka
Missing (2): fi-rkl-11600 fi-snb-2520m
Known issues
------------
Here are the changes found in Patchwork_112607v1 that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@gem_exec_gttfill@basic:
- fi-kbl-soraka: NOTRUN -> [SKIP][1] ([fdo#109271]) +15 similar issues
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_112607v1/fi-kbl-soraka/igt@gem_exec_gttfill@basic.html
* igt@gem_huc_copy@huc-copy:
- fi-kbl-soraka: NOTRUN -> [SKIP][2] ([fdo#109271] / [i915#2190])
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_112607v1/fi-kbl-soraka/igt@gem_huc_copy@huc-copy.html
* igt@gem_lmem_swapping@basic:
- fi-kbl-soraka: NOTRUN -> [SKIP][3] ([fdo#109271] / [i915#4613]) +3 similar issues
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_112607v1/fi-kbl-soraka/igt@gem_lmem_swapping@basic.html
* igt@i915_selftest@live@gt_pm:
- fi-kbl-soraka: NOTRUN -> [DMESG-FAIL][4] ([i915#1886])
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_112607v1/fi-kbl-soraka/igt@i915_selftest@live@gt_pm.html
* igt@i915_selftest@live@guc_multi_lrc:
- fi-kbl-soraka: NOTRUN -> [INCOMPLETE][5] ([i915#7640])
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_112607v1/fi-kbl-soraka/igt@i915_selftest@live@guc_multi_lrc.html
#### Possible fixes ####
* igt@gem_exec_suspend@basic-s0@smem:
- {bat-adln-1}: [DMESG-WARN][6] ([i915#2867]) -> [PASS][7]
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12565/bat-adln-1/igt@gem_exec_suspend@basic-s0@smem.html
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_112607v1/bat-adln-1/igt@gem_exec_suspend@basic-s0@smem.html
* igt@i915_selftest@live@mman:
- fi-rkl-guc: [TIMEOUT][8] ([i915#6794]) -> [PASS][9]
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12565/fi-rkl-guc/igt@i915_selftest@live@mman.html
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_112607v1/fi-rkl-guc/igt@i915_selftest@live@mman.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#1886]: https://gitlab.freedesktop.org/drm/intel/issues/1886
[i915#2190]: https://gitlab.freedesktop.org/drm/intel/issues/2190
[i915#2867]: https://gitlab.freedesktop.org/drm/intel/issues/2867
[i915#4613]: https://gitlab.freedesktop.org/drm/intel/issues/4613
[i915#6367]: https://gitlab.freedesktop.org/drm/intel/issues/6367
[i915#6794]: https://gitlab.freedesktop.org/drm/intel/issues/6794
[i915#7640]: https://gitlab.freedesktop.org/drm/intel/issues/7640
Build changes
-------------
* Linux: CI_DRM_12565 -> Patchwork_112607v1
CI-20190529: 20190529
CI_DRM_12565: 1617f7f4ff6b95ef03d4228bf9f757a6c6488c91 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_7114: 2fd839599a200c089a5c9dbf5048609faf9b8104 @ https://gitlab.freedesktop.org/drm/igt-gpu-tools.git
Patchwork_112607v1: 1617f7f4ff6b95ef03d4228bf9f757a6c6488c91 @ git://anongit.freedesktop.org/gfx-ci/linux
### Linux commits
76c3d69af607 drm/i915: Remove i915_drm_suspend_mode
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_112607v1/index.html
[-- Attachment #2: Type: text/html, Size: 4689 bytes --]
^ permalink raw reply [flat|nested] 5+ messages in thread
* [Intel-gfx] ✓ Fi.CI.IGT: success for drm/i915: Remove i915_drm_suspend_mode
2023-01-10 10:59 [Intel-gfx] [PATCH] drm/i915: Remove i915_drm_suspend_mode Maarten Lankhorst
2023-01-10 13:00 ` [Intel-gfx] ✓ Fi.CI.BAT: success for " Patchwork
@ 2023-01-10 17:02 ` Patchwork
2023-01-10 17:26 ` [Intel-gfx] [PATCH] " Rodrigo Vivi
2 siblings, 0 replies; 5+ messages in thread
From: Patchwork @ 2023-01-10 17:02 UTC (permalink / raw)
To: Maarten Lankhorst; +Cc: intel-gfx
[-- Attachment #1: Type: text/plain, Size: 17446 bytes --]
== Series Details ==
Series: drm/i915: Remove i915_drm_suspend_mode
URL : https://patchwork.freedesktop.org/series/112607/
State : success
== Summary ==
CI Bug Log - changes from CI_DRM_12565_full -> Patchwork_112607v1_full
====================================================
Summary
-------
**SUCCESS**
No regressions found.
External URL: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_112607v1/index.html
Participating hosts (13 -> 10)
------------------------------
Missing (3): pig-skl-6260u pig-kbl-iris pig-glk-j5005
Known issues
------------
Here are the changes found in Patchwork_112607v1_full that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@gem_exec_fair@basic-deadline:
- shard-glk: [PASS][1] -> [FAIL][2] ([i915#2846])
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12565/shard-glk2/igt@gem_exec_fair@basic-deadline.html
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_112607v1/shard-glk3/igt@gem_exec_fair@basic-deadline.html
* igt@gem_exec_fair@basic-pace-share@rcs0:
- shard-glk: [PASS][3] -> [FAIL][4] ([i915#2842]) +1 similar issue
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12565/shard-glk5/igt@gem_exec_fair@basic-pace-share@rcs0.html
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_112607v1/shard-glk4/igt@gem_exec_fair@basic-pace-share@rcs0.html
* igt@gem_lmem_swapping@heavy-verify-random-ccs:
- shard-glk: NOTRUN -> [SKIP][5] ([fdo#109271] / [i915#4613])
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_112607v1/shard-glk9/igt@gem_lmem_swapping@heavy-verify-random-ccs.html
* igt@kms_ccs@pipe-c-random-ccs-data-y_tiled_gen12_mc_ccs:
- shard-glk: NOTRUN -> [SKIP][6] ([fdo#109271] / [i915#3886]) +2 similar issues
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_112607v1/shard-glk9/igt@kms_ccs@pipe-c-random-ccs-data-y_tiled_gen12_mc_ccs.html
* igt@kms_plane_scaling@planes-upscale-factor-0-25-downscale-factor-0-5@pipe-c-hdmi-a-1:
- shard-glk: NOTRUN -> [SKIP][7] ([fdo#109271]) +23 similar issues
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_112607v1/shard-glk9/igt@kms_plane_scaling@planes-upscale-factor-0-25-downscale-factor-0-5@pipe-c-hdmi-a-1.html
* igt@sysfs_clients@fair-3:
- shard-glk: NOTRUN -> [SKIP][8] ([fdo#109271] / [i915#2994])
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_112607v1/shard-glk9/igt@sysfs_clients@fair-3.html
#### Possible fixes ####
* igt@drm_fdinfo@virtual-idle:
- {shard-rkl}: [FAIL][9] ([i915#7742]) -> [PASS][10] +1 similar issue
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12565/shard-rkl-1/igt@drm_fdinfo@virtual-idle.html
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_112607v1/shard-rkl-1/igt@drm_fdinfo@virtual-idle.html
* igt@fbdev@unaligned-write:
- {shard-rkl}: [SKIP][11] ([i915#2582]) -> [PASS][12]
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12565/shard-rkl-3/igt@fbdev@unaligned-write.html
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_112607v1/shard-rkl-6/igt@fbdev@unaligned-write.html
* igt@gem_ctx_exec@basic-nohangcheck:
- {shard-rkl}: [FAIL][13] ([i915#6268]) -> [PASS][14]
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12565/shard-rkl-2/igt@gem_ctx_exec@basic-nohangcheck.html
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_112607v1/shard-rkl-4/igt@gem_ctx_exec@basic-nohangcheck.html
* igt@gem_ctx_persistence@hang:
- {shard-rkl}: [SKIP][15] ([i915#6252]) -> [PASS][16]
[15]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12565/shard-rkl-5/igt@gem_ctx_persistence@hang.html
[16]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_112607v1/shard-rkl-2/igt@gem_ctx_persistence@hang.html
* igt@gem_eio@kms:
- {shard-dg1}: [FAIL][17] ([i915#5784]) -> [PASS][18]
[17]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12565/shard-dg1-18/igt@gem_eio@kms.html
[18]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_112607v1/shard-dg1-14/igt@gem_eio@kms.html
* igt@gem_exec_fair@basic-pace@rcs0:
- {shard-rkl}: [FAIL][19] ([i915#2842]) -> [PASS][20] +5 similar issues
[19]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12565/shard-rkl-3/igt@gem_exec_fair@basic-pace@rcs0.html
[20]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_112607v1/shard-rkl-5/igt@gem_exec_fair@basic-pace@rcs0.html
* igt@gem_exec_reloc@basic-write-read-noreloc:
- {shard-rkl}: [SKIP][21] ([i915#3281]) -> [PASS][22] +9 similar issues
[21]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12565/shard-rkl-1/igt@gem_exec_reloc@basic-write-read-noreloc.html
[22]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_112607v1/shard-rkl-5/igt@gem_exec_reloc@basic-write-read-noreloc.html
* igt@gem_mmap_gtt@coherency:
- {shard-rkl}: [SKIP][23] ([fdo#111656]) -> [PASS][24]
[23]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12565/shard-rkl-2/igt@gem_mmap_gtt@coherency.html
[24]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_112607v1/shard-rkl-5/igt@gem_mmap_gtt@coherency.html
* igt@gem_userptr_blits@forbidden-operations:
- {shard-rkl}: [SKIP][25] ([i915#3282]) -> [PASS][26] +4 similar issues
[25]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12565/shard-rkl-3/igt@gem_userptr_blits@forbidden-operations.html
[26]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_112607v1/shard-rkl-5/igt@gem_userptr_blits@forbidden-operations.html
* igt@gen9_exec_parse@bb-chained:
- {shard-rkl}: [SKIP][27] ([i915#2527]) -> [PASS][28] +1 similar issue
[27]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12565/shard-rkl-2/igt@gen9_exec_parse@bb-chained.html
[28]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_112607v1/shard-rkl-5/igt@gen9_exec_parse@bb-chained.html
* igt@i915_pm_dc@dc9-dpms:
- {shard-rkl}: [SKIP][29] ([i915#3361]) -> [PASS][30]
[29]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12565/shard-rkl-5/igt@i915_pm_dc@dc9-dpms.html
[30]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_112607v1/shard-rkl-3/igt@i915_pm_dc@dc9-dpms.html
* igt@i915_pm_rc6_residency@rc6-idle@bcs0:
- {shard-dg1}: [FAIL][31] ([i915#3591]) -> [PASS][32]
[31]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12565/shard-dg1-14/igt@i915_pm_rc6_residency@rc6-idle@bcs0.html
[32]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_112607v1/shard-dg1-17/igt@i915_pm_rc6_residency@rc6-idle@bcs0.html
* igt@i915_pm_rpm@modeset-non-lpsp-stress-no-wait:
- {shard-dg1}: [SKIP][33] ([i915#1397]) -> [PASS][34]
[33]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12565/shard-dg1-14/igt@i915_pm_rpm@modeset-non-lpsp-stress-no-wait.html
[34]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_112607v1/shard-dg1-17/igt@i915_pm_rpm@modeset-non-lpsp-stress-no-wait.html
* igt@i915_pm_rpm@pm-tiling:
- {shard-rkl}: [SKIP][35] ([fdo#109308]) -> [PASS][36]
[35]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12565/shard-rkl-3/igt@i915_pm_rpm@pm-tiling.html
[36]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_112607v1/shard-rkl-6/igt@i915_pm_rpm@pm-tiling.html
* igt@kms_ccs@pipe-b-ccs-on-another-bo-y_tiled_gen12_rc_ccs_cc:
- {shard-rkl}: [SKIP][37] ([i915#1845] / [i915#4098]) -> [PASS][38] +7 similar issues
[37]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12565/shard-rkl-3/igt@kms_ccs@pipe-b-ccs-on-another-bo-y_tiled_gen12_rc_ccs_cc.html
[38]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_112607v1/shard-rkl-6/igt@kms_ccs@pipe-b-ccs-on-another-bo-y_tiled_gen12_rc_ccs_cc.html
* igt@kms_ccs@pipe-c-crc-primary-rotation-180-y_tiled_gen12_rc_ccs:
- {shard-tglu}: [SKIP][39] ([i915#7651]) -> [PASS][40] +11 similar issues
[39]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12565/shard-tglu-6/igt@kms_ccs@pipe-c-crc-primary-rotation-180-y_tiled_gen12_rc_ccs.html
[40]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_112607v1/shard-tglu-7/igt@kms_ccs@pipe-c-crc-primary-rotation-180-y_tiled_gen12_rc_ccs.html
* igt@kms_frontbuffer_tracking@fbc-1p-offscren-pri-indfb-draw-mmap-wc:
- {shard-rkl}: [SKIP][41] ([i915#1849] / [i915#4098]) -> [PASS][42] +4 similar issues
[41]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12565/shard-rkl-3/igt@kms_frontbuffer_tracking@fbc-1p-offscren-pri-indfb-draw-mmap-wc.html
[42]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_112607v1/shard-rkl-6/igt@kms_frontbuffer_tracking@fbc-1p-offscren-pri-indfb-draw-mmap-wc.html
* igt@kms_frontbuffer_tracking@fbc-1p-primscrn-pri-indfb-draw-mmap-gtt:
- {shard-tglu}: [SKIP][43] ([i915#1849]) -> [PASS][44] +5 similar issues
[43]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12565/shard-tglu-6/igt@kms_frontbuffer_tracking@fbc-1p-primscrn-pri-indfb-draw-mmap-gtt.html
[44]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_112607v1/shard-tglu-7/igt@kms_frontbuffer_tracking@fbc-1p-primscrn-pri-indfb-draw-mmap-gtt.html
* igt@kms_plane@plane-panning-bottom-right-suspend@pipe-a-planes:
- {shard-rkl}: [SKIP][45] ([i915#1849]) -> [PASS][46] +1 similar issue
[45]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12565/shard-rkl-3/igt@kms_plane@plane-panning-bottom-right-suspend@pipe-a-planes.html
[46]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_112607v1/shard-rkl-6/igt@kms_plane@plane-panning-bottom-right-suspend@pipe-a-planes.html
* igt@kms_psr@suspend:
- {shard-rkl}: [SKIP][47] ([i915#1072]) -> [PASS][48]
[47]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12565/shard-rkl-3/igt@kms_psr@suspend.html
[48]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_112607v1/shard-rkl-6/igt@kms_psr@suspend.html
* igt@kms_universal_plane@universal-plane-pageflip-windowed-pipe-d:
- {shard-tglu}: [SKIP][49] ([fdo#109274]) -> [PASS][50]
[49]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12565/shard-tglu-6/igt@kms_universal_plane@universal-plane-pageflip-windowed-pipe-d.html
[50]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_112607v1/shard-tglu-7/igt@kms_universal_plane@universal-plane-pageflip-windowed-pipe-d.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
[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#109283]: https://bugs.freedesktop.org/show_bug.cgi?id=109283
[fdo#109289]: https://bugs.freedesktop.org/show_bug.cgi?id=109289
[fdo#109308]: https://bugs.freedesktop.org/show_bug.cgi?id=109308
[fdo#109315]: https://bugs.freedesktop.org/show_bug.cgi?id=109315
[fdo#110189]: https://bugs.freedesktop.org/show_bug.cgi?id=110189
[fdo#110723]: https://bugs.freedesktop.org/show_bug.cgi?id=110723
[fdo#111068]: https://bugs.freedesktop.org/show_bug.cgi?id=111068
[fdo#111614]: https://bugs.freedesktop.org/show_bug.cgi?id=111614
[fdo#111615]: https://bugs.freedesktop.org/show_bug.cgi?id=111615
[fdo#111656]: https://bugs.freedesktop.org/show_bug.cgi?id=111656
[fdo#111825]: https://bugs.freedesktop.org/show_bug.cgi?id=111825
[fdo#111827]: https://bugs.freedesktop.org/show_bug.cgi?id=111827
[i915#1072]: https://gitlab.freedesktop.org/drm/intel/issues/1072
[i915#132]: https://gitlab.freedesktop.org/drm/intel/issues/132
[i915#1397]: https://gitlab.freedesktop.org/drm/intel/issues/1397
[i915#1825]: https://gitlab.freedesktop.org/drm/intel/issues/1825
[i915#1845]: https://gitlab.freedesktop.org/drm/intel/issues/1845
[i915#1849]: https://gitlab.freedesktop.org/drm/intel/issues/1849
[i915#2190]: https://gitlab.freedesktop.org/drm/intel/issues/2190
[i915#2527]: https://gitlab.freedesktop.org/drm/intel/issues/2527
[i915#2575]: https://gitlab.freedesktop.org/drm/intel/issues/2575
[i915#2582]: https://gitlab.freedesktop.org/drm/intel/issues/2582
[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#2846]: https://gitlab.freedesktop.org/drm/intel/issues/2846
[i915#2856]: https://gitlab.freedesktop.org/drm/intel/issues/2856
[i915#2920]: https://gitlab.freedesktop.org/drm/intel/issues/2920
[i915#2994]: https://gitlab.freedesktop.org/drm/intel/issues/2994
[i915#3116]: https://gitlab.freedesktop.org/drm/intel/issues/3116
[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#3359]: https://gitlab.freedesktop.org/drm/intel/issues/3359
[i915#3361]: https://gitlab.freedesktop.org/drm/intel/issues/3361
[i915#3546]: https://gitlab.freedesktop.org/drm/intel/issues/3546
[i915#3555]: https://gitlab.freedesktop.org/drm/intel/issues/3555
[i915#3558]: https://gitlab.freedesktop.org/drm/intel/issues/3558
[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#3734]: https://gitlab.freedesktop.org/drm/intel/issues/3734
[i915#3742]: https://gitlab.freedesktop.org/drm/intel/issues/3742
[i915#3840]: https://gitlab.freedesktop.org/drm/intel/issues/3840
[i915#3886]: https://gitlab.freedesktop.org/drm/intel/issues/3886
[i915#3955]: https://gitlab.freedesktop.org/drm/intel/issues/3955
[i915#3966]: https://gitlab.freedesktop.org/drm/intel/issues/3966
[i915#3989]: https://gitlab.freedesktop.org/drm/intel/issues/3989
[i915#4070]: https://gitlab.freedesktop.org/drm/intel/issues/4070
[i915#4078]: https://gitlab.freedesktop.org/drm/intel/issues/4078
[i915#4098]: https://gitlab.freedesktop.org/drm/intel/issues/4098
[i915#4103]: https://gitlab.freedesktop.org/drm/intel/issues/4103
[i915#4258]: https://gitlab.freedesktop.org/drm/intel/issues/4258
[i915#426]: https://gitlab.freedesktop.org/drm/intel/issues/426
[i915#4270]: https://gitlab.freedesktop.org/drm/intel/issues/4270
[i915#4349]: https://gitlab.freedesktop.org/drm/intel/issues/4349
[i915#454]: https://gitlab.freedesktop.org/drm/intel/issues/454
[i915#4613]: https://gitlab.freedesktop.org/drm/intel/issues/4613
[i915#5176]: https://gitlab.freedesktop.org/drm/intel/issues/5176
[i915#5286]: https://gitlab.freedesktop.org/drm/intel/issues/5286
[i915#5289]: https://gitlab.freedesktop.org/drm/intel/issues/5289
[i915#5325]: https://gitlab.freedesktop.org/drm/intel/issues/5325
[i915#5327]: https://gitlab.freedesktop.org/drm/intel/issues/5327
[i915#533]: https://gitlab.freedesktop.org/drm/intel/issues/533
[i915#5461]: https://gitlab.freedesktop.org/drm/intel/issues/5461
[i915#5784]: https://gitlab.freedesktop.org/drm/intel/issues/5784
[i915#6095]: https://gitlab.freedesktop.org/drm/intel/issues/6095
[i915#6227]: https://gitlab.freedesktop.org/drm/intel/issues/6227
[i915#6247]: https://gitlab.freedesktop.org/drm/intel/issues/6247
[i915#6248]: https://gitlab.freedesktop.org/drm/intel/issues/6248
[i915#6252]: https://gitlab.freedesktop.org/drm/intel/issues/6252
[i915#6258]: https://gitlab.freedesktop.org/drm/intel/issues/6258
[i915#6268]: https://gitlab.freedesktop.org/drm/intel/issues/6268
[i915#6334]: https://gitlab.freedesktop.org/drm/intel/issues/6334
[i915#6355]: https://gitlab.freedesktop.org/drm/intel/issues/6355
[i915#6497]: https://gitlab.freedesktop.org/drm/intel/issues/6497
[i915#658]: https://gitlab.freedesktop.org/drm/intel/issues/658
[i915#6768]: https://gitlab.freedesktop.org/drm/intel/issues/6768
[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#7128]: https://gitlab.freedesktop.org/drm/intel/issues/7128
[i915#7456]: https://gitlab.freedesktop.org/drm/intel/issues/7456
[i915#7651]: https://gitlab.freedesktop.org/drm/intel/issues/7651
[i915#7697]: https://gitlab.freedesktop.org/drm/intel/issues/7697
[i915#7742]: https://gitlab.freedesktop.org/drm/intel/issues/7742
[i915#7828]: https://gitlab.freedesktop.org/drm/intel/issues/7828
Build changes
-------------
* Linux: CI_DRM_12565 -> Patchwork_112607v1
* Piglit: piglit_4509 -> None
CI-20190529: 20190529
CI_DRM_12565: 1617f7f4ff6b95ef03d4228bf9f757a6c6488c91 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_7114: 2fd839599a200c089a5c9dbf5048609faf9b8104 @ https://gitlab.freedesktop.org/drm/igt-gpu-tools.git
Patchwork_112607v1: 1617f7f4ff6b95ef03d4228bf9f757a6c6488c91 @ 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_112607v1/index.html
[-- Attachment #2: Type: text/html, Size: 14579 bytes --]
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [Intel-gfx] [PATCH] drm/i915: Remove i915_drm_suspend_mode
2023-01-10 10:59 [Intel-gfx] [PATCH] drm/i915: Remove i915_drm_suspend_mode Maarten Lankhorst
2023-01-10 13:00 ` [Intel-gfx] ✓ Fi.CI.BAT: success for " Patchwork
2023-01-10 17:02 ` [Intel-gfx] ✓ Fi.CI.IGT: " Patchwork
@ 2023-01-10 17:26 ` Rodrigo Vivi
2023-05-11 8:36 ` Jani Nikula
2 siblings, 1 reply; 5+ messages in thread
From: Rodrigo Vivi @ 2023-01-10 17:26 UTC (permalink / raw)
To: Maarten Lankhorst; +Cc: intel-gfx
On Tue, Jan 10, 2023 at 11:59:02AM +0100, Maarten Lankhorst wrote:
> enum i915_drm_suspend_mode suspend_mode is only used in
> intel_display_power, while we only care about whether we perform a
> s2idle. Remove it and use a simple bool.
>
> Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
> ---
> .../gpu/drm/i915/display/intel_display_power.c | 8 +++-----
> .../gpu/drm/i915/display/intel_display_power.h | 3 +--
> drivers/gpu/drm/i915/i915_driver.c | 16 ++--------------
> drivers/gpu/drm/i915/intel_runtime_pm.h | 6 ------
> 4 files changed, 6 insertions(+), 27 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/display/intel_display_power.c b/drivers/gpu/drm/i915/display/intel_display_power.c
> index 060e0a2770f7..6ef937afe48e 100644
> --- a/drivers/gpu/drm/i915/display/intel_display_power.c
> +++ b/drivers/gpu/drm/i915/display/intel_display_power.c
> @@ -2029,7 +2029,7 @@ void intel_power_domains_disable(struct drm_i915_private *i915)
> /**
> * intel_power_domains_suspend - suspend power domain state
> * @i915: i915 device instance
> - * @suspend_mode: specifies the target suspend state (idle, mem, hibernation)
> + * @s2idle: specifies whether we go to idle, or deeper sleep
> *
> * This function prepares the hardware power domain state before entering
> * system suspend.
> @@ -2037,8 +2037,7 @@ void intel_power_domains_disable(struct drm_i915_private *i915)
> * It must be called with power domains already disabled (after a call to
> * intel_power_domains_disable()) and paired with intel_power_domains_resume().
> */
> -void intel_power_domains_suspend(struct drm_i915_private *i915,
> - enum i915_drm_suspend_mode suspend_mode)
> +void intel_power_domains_suspend(struct drm_i915_private *i915, bool s2idle)
> {
> struct i915_power_domains *power_domains = &i915->display.power.domains;
> intel_wakeref_t wakeref __maybe_unused =
> @@ -2054,8 +2053,7 @@ void intel_power_domains_suspend(struct drm_i915_private *i915,
> * that would be blocked if the firmware was inactive.
> */
> if (!(i915->display.dmc.allowed_dc_mask & DC_STATE_EN_DC9) &&
> - suspend_mode == I915_DRM_SUSPEND_IDLE &&
> - intel_dmc_has_payload(i915)) {
> + s2idle && intel_dmc_has_payload(i915)) {
> intel_display_power_flush_work(i915);
> intel_power_domains_verify_state(i915);
> return;
> diff --git a/drivers/gpu/drm/i915/display/intel_display_power.h b/drivers/gpu/drm/i915/display/intel_display_power.h
> index 6480afcfe0d8..04216be1d6fe 100644
> --- a/drivers/gpu/drm/i915/display/intel_display_power.h
> +++ b/drivers/gpu/drm/i915/display/intel_display_power.h
> @@ -164,8 +164,7 @@ void intel_power_domains_init_hw(struct drm_i915_private *dev_priv, bool resume)
> void intel_power_domains_driver_remove(struct drm_i915_private *dev_priv);
> void intel_power_domains_enable(struct drm_i915_private *dev_priv);
> void intel_power_domains_disable(struct drm_i915_private *dev_priv);
> -void intel_power_domains_suspend(struct drm_i915_private *dev_priv,
> - enum i915_drm_suspend_mode);
> +void intel_power_domains_suspend(struct drm_i915_private *dev_priv, bool s2idle);
> void intel_power_domains_resume(struct drm_i915_private *dev_priv);
> void intel_power_domains_sanitize_state(struct drm_i915_private *dev_priv);
>
> diff --git a/drivers/gpu/drm/i915/i915_driver.c b/drivers/gpu/drm/i915/i915_driver.c
> index 9c49cc7a246d..a02dd8e38f2a 100644
> --- a/drivers/gpu/drm/i915/i915_driver.c
> +++ b/drivers/gpu/drm/i915/i915_driver.c
> @@ -1232,18 +1232,6 @@ static int i915_drm_suspend(struct drm_device *dev)
> return 0;
> }
>
> -static enum i915_drm_suspend_mode
> -get_suspend_mode(struct drm_i915_private *dev_priv, bool hibernate)
> -{
> - if (hibernate)
> - return I915_DRM_SUSPEND_HIBERNATE;
> -
> - if (suspend_to_idle(dev_priv))
> - return I915_DRM_SUSPEND_IDLE;
> -
> - return I915_DRM_SUSPEND_MEM;
> -}
> -
> static int i915_drm_suspend_late(struct drm_device *dev, bool hibernation)
> {
> struct drm_i915_private *dev_priv = to_i915(dev);
> @@ -1251,6 +1239,7 @@ static int i915_drm_suspend_late(struct drm_device *dev, bool hibernation)
> struct intel_runtime_pm *rpm = &dev_priv->runtime_pm;
> struct intel_gt *gt;
> int ret, i;
> + bool s2idle = !hibernation && suspend_to_idle(dev_priv);
>
> disable_rpm_wakeref_asserts(rpm);
>
> @@ -1259,8 +1248,7 @@ static int i915_drm_suspend_late(struct drm_device *dev, bool hibernation)
> for_each_gt(gt, dev_priv, i)
> intel_uncore_suspend(gt->uncore);
>
> - intel_power_domains_suspend(dev_priv,
> - get_suspend_mode(dev_priv, hibernation));
> + intel_power_domains_suspend(dev_priv, s2idle);
>
> intel_display_power_suspend_late(dev_priv);
>
> diff --git a/drivers/gpu/drm/i915/intel_runtime_pm.h b/drivers/gpu/drm/i915/intel_runtime_pm.h
> index d9160e3ff4af..c87ae95bfd18 100644
> --- a/drivers/gpu/drm/i915/intel_runtime_pm.h
> +++ b/drivers/gpu/drm/i915/intel_runtime_pm.h
> @@ -16,12 +16,6 @@ struct device;
> struct drm_i915_private;
> struct drm_printer;
>
> -enum i915_drm_suspend_mode {
> - I915_DRM_SUSPEND_IDLE,
> - I915_DRM_SUSPEND_MEM,
> - I915_DRM_SUSPEND_HIBERNATE,
> -};
> -
> /*
> * This struct helps tracking the state needed for runtime PM, which puts the
> * device in PCI D3 state. Notice that when this happens, nothing on the
> --
> 2.34.1
>
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [Intel-gfx] [PATCH] drm/i915: Remove i915_drm_suspend_mode
2023-01-10 17:26 ` [Intel-gfx] [PATCH] " Rodrigo Vivi
@ 2023-05-11 8:36 ` Jani Nikula
0 siblings, 0 replies; 5+ messages in thread
From: Jani Nikula @ 2023-05-11 8:36 UTC (permalink / raw)
To: Rodrigo Vivi, Maarten Lankhorst; +Cc: intel-gfx
On Tue, 10 Jan 2023, Rodrigo Vivi <rodrigo.vivi@intel.com> wrote:
> On Tue, Jan 10, 2023 at 11:59:02AM +0100, Maarten Lankhorst wrote:
>> enum i915_drm_suspend_mode suspend_mode is only used in
>> intel_display_power, while we only care about whether we perform a
>> s2idle. Remove it and use a simple bool.
>>
>> Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
>
> Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
I guess this patch was forgotten and never applied.
Maarten, care to rebase and resend please?
BR,
Jani.
>> ---
>> .../gpu/drm/i915/display/intel_display_power.c | 8 +++-----
>> .../gpu/drm/i915/display/intel_display_power.h | 3 +--
>> drivers/gpu/drm/i915/i915_driver.c | 16 ++--------------
>> drivers/gpu/drm/i915/intel_runtime_pm.h | 6 ------
>> 4 files changed, 6 insertions(+), 27 deletions(-)
>>
>> diff --git a/drivers/gpu/drm/i915/display/intel_display_power.c b/drivers/gpu/drm/i915/display/intel_display_power.c
>> index 060e0a2770f7..6ef937afe48e 100644
>> --- a/drivers/gpu/drm/i915/display/intel_display_power.c
>> +++ b/drivers/gpu/drm/i915/display/intel_display_power.c
>> @@ -2029,7 +2029,7 @@ void intel_power_domains_disable(struct drm_i915_private *i915)
>> /**
>> * intel_power_domains_suspend - suspend power domain state
>> * @i915: i915 device instance
>> - * @suspend_mode: specifies the target suspend state (idle, mem, hibernation)
>> + * @s2idle: specifies whether we go to idle, or deeper sleep
>> *
>> * This function prepares the hardware power domain state before entering
>> * system suspend.
>> @@ -2037,8 +2037,7 @@ void intel_power_domains_disable(struct drm_i915_private *i915)
>> * It must be called with power domains already disabled (after a call to
>> * intel_power_domains_disable()) and paired with intel_power_domains_resume().
>> */
>> -void intel_power_domains_suspend(struct drm_i915_private *i915,
>> - enum i915_drm_suspend_mode suspend_mode)
>> +void intel_power_domains_suspend(struct drm_i915_private *i915, bool s2idle)
>> {
>> struct i915_power_domains *power_domains = &i915->display.power.domains;
>> intel_wakeref_t wakeref __maybe_unused =
>> @@ -2054,8 +2053,7 @@ void intel_power_domains_suspend(struct drm_i915_private *i915,
>> * that would be blocked if the firmware was inactive.
>> */
>> if (!(i915->display.dmc.allowed_dc_mask & DC_STATE_EN_DC9) &&
>> - suspend_mode == I915_DRM_SUSPEND_IDLE &&
>> - intel_dmc_has_payload(i915)) {
>> + s2idle && intel_dmc_has_payload(i915)) {
>> intel_display_power_flush_work(i915);
>> intel_power_domains_verify_state(i915);
>> return;
>> diff --git a/drivers/gpu/drm/i915/display/intel_display_power.h b/drivers/gpu/drm/i915/display/intel_display_power.h
>> index 6480afcfe0d8..04216be1d6fe 100644
>> --- a/drivers/gpu/drm/i915/display/intel_display_power.h
>> +++ b/drivers/gpu/drm/i915/display/intel_display_power.h
>> @@ -164,8 +164,7 @@ void intel_power_domains_init_hw(struct drm_i915_private *dev_priv, bool resume)
>> void intel_power_domains_driver_remove(struct drm_i915_private *dev_priv);
>> void intel_power_domains_enable(struct drm_i915_private *dev_priv);
>> void intel_power_domains_disable(struct drm_i915_private *dev_priv);
>> -void intel_power_domains_suspend(struct drm_i915_private *dev_priv,
>> - enum i915_drm_suspend_mode);
>> +void intel_power_domains_suspend(struct drm_i915_private *dev_priv, bool s2idle);
>> void intel_power_domains_resume(struct drm_i915_private *dev_priv);
>> void intel_power_domains_sanitize_state(struct drm_i915_private *dev_priv);
>>
>> diff --git a/drivers/gpu/drm/i915/i915_driver.c b/drivers/gpu/drm/i915/i915_driver.c
>> index 9c49cc7a246d..a02dd8e38f2a 100644
>> --- a/drivers/gpu/drm/i915/i915_driver.c
>> +++ b/drivers/gpu/drm/i915/i915_driver.c
>> @@ -1232,18 +1232,6 @@ static int i915_drm_suspend(struct drm_device *dev)
>> return 0;
>> }
>>
>> -static enum i915_drm_suspend_mode
>> -get_suspend_mode(struct drm_i915_private *dev_priv, bool hibernate)
>> -{
>> - if (hibernate)
>> - return I915_DRM_SUSPEND_HIBERNATE;
>> -
>> - if (suspend_to_idle(dev_priv))
>> - return I915_DRM_SUSPEND_IDLE;
>> -
>> - return I915_DRM_SUSPEND_MEM;
>> -}
>> -
>> static int i915_drm_suspend_late(struct drm_device *dev, bool hibernation)
>> {
>> struct drm_i915_private *dev_priv = to_i915(dev);
>> @@ -1251,6 +1239,7 @@ static int i915_drm_suspend_late(struct drm_device *dev, bool hibernation)
>> struct intel_runtime_pm *rpm = &dev_priv->runtime_pm;
>> struct intel_gt *gt;
>> int ret, i;
>> + bool s2idle = !hibernation && suspend_to_idle(dev_priv);
>>
>> disable_rpm_wakeref_asserts(rpm);
>>
>> @@ -1259,8 +1248,7 @@ static int i915_drm_suspend_late(struct drm_device *dev, bool hibernation)
>> for_each_gt(gt, dev_priv, i)
>> intel_uncore_suspend(gt->uncore);
>>
>> - intel_power_domains_suspend(dev_priv,
>> - get_suspend_mode(dev_priv, hibernation));
>> + intel_power_domains_suspend(dev_priv, s2idle);
>>
>> intel_display_power_suspend_late(dev_priv);
>>
>> diff --git a/drivers/gpu/drm/i915/intel_runtime_pm.h b/drivers/gpu/drm/i915/intel_runtime_pm.h
>> index d9160e3ff4af..c87ae95bfd18 100644
>> --- a/drivers/gpu/drm/i915/intel_runtime_pm.h
>> +++ b/drivers/gpu/drm/i915/intel_runtime_pm.h
>> @@ -16,12 +16,6 @@ struct device;
>> struct drm_i915_private;
>> struct drm_printer;
>>
>> -enum i915_drm_suspend_mode {
>> - I915_DRM_SUSPEND_IDLE,
>> - I915_DRM_SUSPEND_MEM,
>> - I915_DRM_SUSPEND_HIBERNATE,
>> -};
>> -
>> /*
>> * This struct helps tracking the state needed for runtime PM, which puts the
>> * device in PCI D3 state. Notice that when this happens, nothing on the
>> --
>> 2.34.1
>>
--
Jani Nikula, Intel Open Source Graphics Center
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2023-05-11 8:37 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-01-10 10:59 [Intel-gfx] [PATCH] drm/i915: Remove i915_drm_suspend_mode Maarten Lankhorst
2023-01-10 13:00 ` [Intel-gfx] ✓ Fi.CI.BAT: success for " Patchwork
2023-01-10 17:02 ` [Intel-gfx] ✓ Fi.CI.IGT: " Patchwork
2023-01-10 17:26 ` [Intel-gfx] [PATCH] " Rodrigo Vivi
2023-05-11 8:36 ` Jani Nikula
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox