Skip to content

drm/{i915, xe}: display (runtime) suspend/resume/shutdown unification

Jani Nikula intel-gfx intel-xe 1 version In review

Get series with b4
b4 am [email protected]

Versions newest first

  1. v1 Latest24 patches 25 repliesIn review

Patches in v1 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/24drm/i915: Keep display IRQs enabled for encoder suspend/shutdowndrivers/gpu/drm/i915/i915_driver.c+10 -20 replies
2/24drm/i915/xe: Enable HPD polling later during system resumedrivers/gpu/drm/xe/display/xe_display.c+1 -10 replies
3/24drm/i915: add flush_workqueue(display->wq.cleanup) on shutdowndrivers/gpu/drm/i915/i915_driver.c+3 -01 reply
4/24drm/xe/display: remove intel_display_flush_cleanup_work() calls on suspend/shutdowndrivers/gpu/drm/xe/display/xe_display.c+0 -31 reply
5/24drm/xe/display: drop duplicate intel_dp_mst_suspend() calldrivers/gpu/drm/xe/display/xe_display.c+0 -11 reply
6/24drm/i915/display: add "pm" to intel_display_driver_{suspend, resume}() namesdrivers/gpu/drm/i915/display/intel_display_driver.c drivers/gpu/drm/i915/display/intel_display_driver.h drivers/gpu/drm/i915/i915_driver.c +1 more+14 -131 reply
7/24drm/xe/display: rename xe_display_pm_shutdown*() to xe_display_shutdown*()drivers/gpu/drm/xe/display/xe_display.c drivers/gpu/drm/xe/display/xe_display.h drivers/gpu/drm/xe/xe_device.c+10 -81 reply
8/24drm/xe/display: relocate the xe_display_shutdown*() functionsdrivers/gpu/drm/xe/display/xe_display.c+45 -451 reply
9/24drm/xe/display: relocate the xe_display_pm_runtime_*() functionsdrivers/gpu/drm/xe/display/xe_display.c+80 -801 reply
10/24drm/{i915, xe}: move more calls inside intel_display_driver_pm_suspend()drivers/gpu/drm/i915/display/intel_display_driver.c drivers/gpu/drm/i915/i915_driver.c drivers/gpu/drm/xe/display/xe_display.c+13 -291 reply
11/24drm/{i915, xe}: move more calls inside intel_display_driver_pm_resume()drivers/gpu/drm/i915/display/intel_display_driver.c drivers/gpu/drm/i915/i915_driver.c drivers/gpu/drm/xe/display/xe_display.c+19 -401 reply
12/24drm/{i915, xe}: add intel_display_driver_pm_{suspend_late, resume_early}()drivers/gpu/drm/i915/display/intel_display_driver.c drivers/gpu/drm/i915/display/intel_display_driver.h drivers/gpu/drm/i915/i915_driver.c +1 more+23 -51 reply
13/24drm/{i915, xe}: move more calls inside intel_display_driver_{register, unregister}()drivers/gpu/drm/i915/display/intel_display_driver.c drivers/gpu/drm/i915/i915_driver.c drivers/gpu/drm/xe/display/xe_display.c+6 -41 reply
14/24drm/{i915, xe}: add intel_display_driver_shutdown_late()drivers/gpu/drm/i915/display/intel_display_driver.c drivers/gpu/drm/i915/display/intel_display_driver.h drivers/gpu/drm/i915/i915_driver.c +1 more+17 -111 reply
15/24drm/i915: add intel_display_driver_shutdown()drivers/gpu/drm/i915/display/intel_display_driver.c drivers/gpu/drm/i915/display/intel_display_driver.h drivers/gpu/drm/i915/i915_driver.c+30 -231 reply
16/24drm/i915/display: deduplicate suspend and shutdown a bitdrivers/gpu/drm/i915/display/intel_display_driver.c+23 -221 reply
17/24drm/xe/display: use intel_display_driver_pm_shutdown()drivers/gpu/drm/xe/display/xe_display.c+1 -101 reply
18/24drm/{i915, xe}: move more stuff to __intel_display_driver_pm_suspend()drivers/gpu/drm/i915/display/intel_display_driver.c drivers/gpu/drm/i915/i915_driver.c drivers/gpu/drm/xe/display/xe_display.c+8 -271 reply
19/24drm/{i915, xe}: make intel_dmc_suspend() part of display suspend/shutdown callsdrivers/gpu/drm/i915/display/intel_display_driver.c drivers/gpu/drm/i915/i915_driver.c drivers/gpu/drm/xe/display/xe_display.c+2 -82 replies
20/24drm/{i915, xe}: move intel_opregion_suspend() to intel_display_driver_pm_suspend_late()drivers/gpu/drm/i915/display/intel_display_driver.c drivers/gpu/drm/i915/i915_driver.c drivers/gpu/drm/xe/display/xe_display.c+2 -71 reply
21/24drm/{i915, xe}: keep moving stuff to intel_display_driver_pm_resume()drivers/gpu/drm/i915/display/intel_display_driver.c drivers/gpu/drm/i915/i915_driver.c drivers/gpu/drm/xe/display/xe_display.c+6 -151 reply
22/24drm/i915: add intel_display_driver_pm_runtime*() functionsdrivers/gpu/drm/i915/display/intel_display_driver.c drivers/gpu/drm/i915/display/intel_display_driver.h drivers/gpu/drm/i915/i915_driver.c+65 -401 reply
23/24drm/xe/display: separate d3cold handling from xe_display_pm_runtime_suspend_late()drivers/gpu/drm/xe/display/xe_display.c+4 -11 reply
24/24drm/xe/display: unify runtime suspend/resume with i915 for non-d3colddrivers/gpu/drm/xe/display/xe_display.c+4 -103 replies

Reviews trailers per patch

19 of 24 patches have a Reviewed-by or Acked-by.

PatchVille SyrjäläMichał Grzelak
1/24
2/24
3/24R-b
4/24R-b
5/24R-b
6/24R-b
7/24R-b
8/24R-b
9/24R-b
10/24R-b
11/24R-b
12/24R-b
13/24
14/24R-b
15/24R-b
16/24R-b
17/24R-b
18/24R-b
19/24
20/24
21/24R-b
22/24R-b
23/24A-b
24/24R-b

Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes.

Read the v1 thread

Cover letter [PATCH 00/24] drm/{i915, xe}: display (runtime) suspend/resume/shutdown unification

Start unifying the i915 and xe display suspend/resume/shutdown and runtime pm hooks. This completely superseeds the series [1] which was opposed by Ville. I presume this is the path of least resistance.

Patches 1-3 are functional fixes from Imre and me. They'll also help the refactoring.

Patches 4-18 are mostly non-functional refactoring, deduplication, unification, and cleanups. There are minor functional changes that shouldn't have any impact. The changes are intentionally chopped up small for ease of review and to pinpoint any regressions immediately.

Patches 19-21 are also intended to be non-functioal refactoring. However, there are bigger changes in the sequences, and might be more suspect.

Patches 22-24 refactor runtime pm, which should be non-functional changes for i915, but will be functional changes for xe.

I'm sending the entire thing for review, but I think I'll want to send smaller batches for CI before merging.

BR,
Jani.

[1] https://lore.kernel.org/r/[email protected]

Imre Deak (2):
drm/i915: Keep display IRQs enabled for encoder suspend/shutdown drm/i915/xe: Enable HPD polling later during system resume

Jani Nikula (22):
drm/i915: add flush_workqueue(display->wq.cleanup) on shutdown drm/xe/display: remove intel_display_flush_cleanup_work() calls on
suspend/shutdown
drm/xe/display: drop duplicate intel_dp_mst_suspend() call drm/i915/display: add "pm" to intel_display_driver_{suspend,resume}()
names
drm/xe/display: rename xe_display_pm_shutdown*() to
xe_display_shutdown*()
drm/xe/display: relocate the xe_display_shutdown*() functions drm/xe/display: relocate the xe_display_pm_runtime_*() functions drm/{i915,xe}: move more calls inside
intel_display_driver_pm_suspend()
drm/{i915,xe}: move more calls inside intel_display_driver_pm_resume() drm/{i915,xe}: add
intel_display_driver_pm_{suspend_late,resume_early}()
drm/{i915,xe}: move more calls inside
intel_display_driver_{register,unregister}()
drm/{i915,xe}: add intel_display_driver_shutdown_late() drm/i915: add intel_display_driver_shutdown() drm/i915/display: deduplicate suspend and shutdown a bit drm/xe/display: use intel_display_driver_pm_shutdown() drm/{i915,xe}: move more stuff to __intel_display_driver_pm_suspend() drm/{i915,xe}: make intel_dmc_suspend() part of display
suspend/shutdown calls
drm/{i915,xe}: move intel_opregion_suspend() to
intel_display_driver_pm_suspend_late()
drm/{i915,xe}: keep moving stuff to intel_display_driver_pm_resume() drm/i915: add intel_display_driver_pm_runtime*() functions drm/xe/display: separate d3cold handling from
xe_display_pm_runtime_suspend_late()
drm/xe/display: unify runtime suspend/resume with i915 for non-d3cold

 .../drm/i915/display/intel_display_driver.c   | 182 ++++++++++++++-
 .../drm/i915/display/intel_display_driver.h   |  14 +-
 drivers/gpu/drm/i915/i915_driver.c            | 138 ++----------
 drivers/gpu/drm/xe/display/xe_display.c       | 209 ++++++------------
 drivers/gpu/drm/xe/display/xe_display.h       |  10 +-
 drivers/gpu/drm/xe/xe_device.c                |   4 +-
 6 files changed, 269 insertions(+), 288 deletions(-)
Signature · 1 line
2.47.3