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

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

[Jani Nikula]

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/cover.1779887154.git.jani.nikula@intel.com


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(-)

-- 
2.47.3

[PATCH 01/24] drm/i915: Keep display IRQs enabled for encoder suspend/shutdown

[Jani Nikula]

From: Imre Deak <imre.deak@intel.com>

A pending hotplug work or the encoder suspend/shutdown hooks may still
require display IRQs at least for AUX accesses, so keep all display IRQs
except for hotplug IRQs enabled until after intel_hpd_cancel_work() and
the encoder suspend/shutdown hooks are called during system suspend and
shutdown.

Signed-off-by: Imre Deak <imre.deak@intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
---
 drivers/gpu/drm/i915/i915_driver.c | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/drivers/gpu/drm/i915/i915_driver.c b/drivers/gpu/drm/i915/i915_driver.c
index 58081b52461a..93940cfe91a0 100644
--- a/drivers/gpu/drm/i915/i915_driver.c
+++ b/drivers/gpu/drm/i915/i915_driver.c
@@ -1055,7 +1055,8 @@ void i915_driver_shutdown(struct drm_i915_private *i915)
 
 	intel_dp_mst_suspend(display);
 
-	intel_irq_suspend(i915);
+	intel_encoder_block_all_hpds(display);
+
 	intel_hpd_cancel_work(display);
 
 	if (intel_display_device_present(display))
@@ -1064,6 +1065,8 @@ void i915_driver_shutdown(struct drm_i915_private *i915)
 	intel_encoder_suspend_all(display);
 	intel_encoder_shutdown_all(display);
 
+	intel_irq_suspend(i915);
+
 	intel_dmc_suspend(display);
 
 	i915_gem_suspend(i915);
@@ -1135,7 +1138,8 @@ static int i915_drm_suspend(struct drm_device *dev)
 
 	intel_display_driver_suspend(display);
 
-	intel_irq_suspend(dev_priv);
+	intel_encoder_block_all_hpds(display);
+
 	intel_hpd_cancel_work(display);
 
 	if (intel_display_device_present(display))
@@ -1143,6 +1147,8 @@ static int i915_drm_suspend(struct drm_device *dev)
 
 	intel_encoder_suspend_all(display);
 
+	intel_irq_suspend(dev_priv);
+
 	/* Must be called before GGTT is suspended. */
 	intel_dpt_suspend(display);
 	i915_ggtt_suspend(to_gt(dev_priv)->ggtt);
@@ -1314,6 +1320,8 @@ static int i915_drm_resume(struct drm_device *dev)
 
 	intel_hpd_init(display);
 
+	intel_encoder_unblock_all_hpds(display);
+
 	intel_display_driver_resume(display);
 
 	if (intel_display_device_present(display)) {
-- 
2.47.3

[PATCH 02/24] drm/i915/xe: Enable HPD polling later during system resume

[Jani Nikula]

From: Imre Deak <imre.deak@intel.com>

The detect hook of connectors - called by HPD polling - will check if
user accesses are enabled and prevent the connector detection if that's
not the case. Accordingly enable user accesses during system resume by
calling intel_display_driver_enable_user_access() before enabling HPD
polling.

Signed-off-by: Imre Deak <imre.deak@intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
---
 drivers/gpu/drm/xe/display/xe_display.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/xe/display/xe_display.c b/drivers/gpu/drm/xe/display/xe_display.c
index 810d93fefcbc..c0d3e7d12823 100644
--- a/drivers/gpu/drm/xe/display/xe_display.c
+++ b/drivers/gpu/drm/xe/display/xe_display.c
@@ -452,8 +452,8 @@ void xe_display_pm_resume(struct xe_device *xe)
 
 	if (intel_display_device_present(display)) {
 		intel_display_driver_resume(display);
-		drm_kms_helper_poll_enable(&xe->drm);
 		intel_display_driver_enable_user_access(display);
+		drm_kms_helper_poll_enable(&xe->drm);
 	}
 
 	if (intel_display_device_present(display))
-- 
2.47.3

[PATCH 03/24] drm/i915: add flush_workqueue(display->wq.cleanup) on shutdown

[Jani Nikula]

We're missing the cleanup workqueue flush on the shutdown path. Add it.

Unfortunately have to briefly include intel_display_core.c here. To be
removed later.

Link: https://lore.kernel.org/r/agRp6Was9FCQbKee@intel.com
Suggested-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
---
 drivers/gpu/drm/i915/i915_driver.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/drivers/gpu/drm/i915/i915_driver.c b/drivers/gpu/drm/i915/i915_driver.c
index 93940cfe91a0..60d5e06675ab 100644
--- a/drivers/gpu/drm/i915/i915_driver.c
+++ b/drivers/gpu/drm/i915/i915_driver.c
@@ -54,6 +54,7 @@
 #include "display/intel_bw.h"
 #include "display/intel_cdclk.h"
 #include "display/intel_crtc.h"
+#include "display/intel_display_core.h"
 #include "display/intel_display_device.h"
 #include "display/intel_display_driver.h"
 #include "display/intel_display_power.h"
@@ -1053,6 +1054,8 @@ void i915_driver_shutdown(struct drm_i915_private *i915)
 		drm_atomic_helper_shutdown(&i915->drm);
 	}
 
+	flush_workqueue(display->wq.cleanup);
+
 	intel_dp_mst_suspend(display);
 
 	intel_encoder_block_all_hpds(display);
-- 
2.47.3

[PATCH 04/24] drm/xe/display: remove intel_display_flush_cleanup_work() calls on suspend/shutdown

[Jani Nikula]

intel_display_driver_suspend() already has drm_atomic_helper_suspend()
and cleanup workqueue flush. The intel_display_flush_cleanup_work()
calls on suspend/shutdown should be redundant. Remove.

Link: https://lore.kernel.org/r/agRp6Was9FCQbKee@intel.com
Suggested-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
---
 drivers/gpu/drm/xe/display/xe_display.c | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/drivers/gpu/drm/xe/display/xe_display.c b/drivers/gpu/drm/xe/display/xe_display.c
index c0d3e7d12823..6e82dc70ca89 100644
--- a/drivers/gpu/drm/xe/display/xe_display.c
+++ b/drivers/gpu/drm/xe/display/xe_display.c
@@ -312,8 +312,6 @@ void xe_display_pm_suspend(struct xe_device *xe)
 		intel_display_driver_suspend(display);
 	}
 
-	intel_display_flush_cleanup_work(display);
-
 	intel_encoder_block_all_hpds(display);
 
 	intel_hpd_cancel_work(display);
@@ -344,7 +342,6 @@ void xe_display_pm_shutdown(struct xe_device *xe)
 		intel_display_driver_suspend(display);
 	}
 
-	intel_display_flush_cleanup_work(display);
 	intel_dp_mst_suspend(display);
 	intel_encoder_block_all_hpds(display);
 	intel_hpd_cancel_work(display);
-- 
2.47.3

[PATCH 05/24] drm/xe/display: drop duplicate intel_dp_mst_suspend() call

[Jani Nikula]

intel_display_driver_suspend() already calls
intel_dp_mst_suspend(). Remove the duplicate call.

Signed-off-by: Jani Nikula <jani.nikula@intel.com>
---
 drivers/gpu/drm/xe/display/xe_display.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/drivers/gpu/drm/xe/display/xe_display.c b/drivers/gpu/drm/xe/display/xe_display.c
index 6e82dc70ca89..8d55e7a37d6d 100644
--- a/drivers/gpu/drm/xe/display/xe_display.c
+++ b/drivers/gpu/drm/xe/display/xe_display.c
@@ -342,7 +342,6 @@ void xe_display_pm_shutdown(struct xe_device *xe)
 		intel_display_driver_suspend(display);
 	}
 
-	intel_dp_mst_suspend(display);
 	intel_encoder_block_all_hpds(display);
 	intel_hpd_cancel_work(display);
 
-- 
2.47.3

[PATCH 06/24] drm/i915/display: add "pm" to intel_display_driver_{suspend, resume}() names

[Jani Nikula]

Start naming the functions that are supposed to be called from the
struct dem_pm_ops hooks with intel_display_driver_pm_*() to distinguish
them better from the rest.

Signed-off-by: Jani Nikula <jani.nikula@intel.com>
---
 drivers/gpu/drm/i915/display/intel_display_driver.c |  4 ++--
 drivers/gpu/drm/i915/display/intel_display_driver.h |  5 +++--
 drivers/gpu/drm/i915/i915_driver.c                  | 12 ++++++------
 drivers/gpu/drm/xe/display/xe_display.c             |  6 +++---
 4 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/drivers/gpu/drm/i915/display/intel_display_driver.c b/drivers/gpu/drm/i915/display/intel_display_driver.c
index d0729936f681..9be4c94740dc 100644
--- a/drivers/gpu/drm/i915/display/intel_display_driver.c
+++ b/drivers/gpu/drm/i915/display/intel_display_driver.c
@@ -678,7 +678,7 @@ void intel_display_driver_unregister(struct intel_display *display)
  * turn all crtc's off, but do not adjust state
  * This has to be paired with a call to intel_modeset_setup_hw_state.
  */
-int intel_display_driver_suspend(struct intel_display *display)
+int intel_display_driver_pm_suspend(struct intel_display *display)
 {
 	struct drm_atomic_commit *state;
 	int ret;
@@ -741,7 +741,7 @@ __intel_display_driver_resume(struct intel_display *display,
 	return ret;
 }
 
-void intel_display_driver_resume(struct intel_display *display)
+void intel_display_driver_pm_resume(struct intel_display *display)
 {
 	struct drm_atomic_commit *state = display->restore.modeset_state;
 	struct drm_modeset_acquire_ctx ctx;
diff --git a/drivers/gpu/drm/i915/display/intel_display_driver.h b/drivers/gpu/drm/i915/display/intel_display_driver.h
index 5270c26a32e0..d8a08ca68d4e 100644
--- a/drivers/gpu/drm/i915/display/intel_display_driver.h
+++ b/drivers/gpu/drm/i915/display/intel_display_driver.h
@@ -24,8 +24,9 @@ void intel_display_driver_remove(struct intel_display *display);
 void intel_display_driver_remove_noirq(struct intel_display *display);
 void intel_display_driver_remove_nogem(struct intel_display *display);
 void intel_display_driver_unregister(struct intel_display *display);
-int intel_display_driver_suspend(struct intel_display *display);
-void intel_display_driver_resume(struct intel_display *display);
+
+int intel_display_driver_pm_suspend(struct intel_display *display);
+void intel_display_driver_pm_resume(struct intel_display *display);
 
 /* interface for intel_display_reset.c */
 int __intel_display_driver_resume(struct intel_display *display,
diff --git a/drivers/gpu/drm/i915/i915_driver.c b/drivers/gpu/drm/i915/i915_driver.c
index 60d5e06675ab..bd73d64c1ccb 100644
--- a/drivers/gpu/drm/i915/i915_driver.c
+++ b/drivers/gpu/drm/i915/i915_driver.c
@@ -1114,10 +1114,10 @@ static int i915_drm_prepare(struct drm_device *dev)
 	intel_pxp_suspend_prepare(i915->pxp);
 
 	/*
-	 * NB intel_display_driver_suspend() may issue new requests after we've
-	 * ostensibly marked the GPU as ready-to-sleep here. We need to
-	 * split out that work and pull it forward so that after point,
-	 * the GPU is not woken again.
+	 * NB intel_display_driver_pm_suspend() may issue new requests after
+	 * we've ostensibly marked the GPU as ready-to-sleep here. We need to
+	 * split out that work and pull it forward so that after point, the GPU
+	 * is not woken again.
 	 */
 	return i915_gem_backup_suspend(i915);
 }
@@ -1139,7 +1139,7 @@ static int i915_drm_suspend(struct drm_device *dev)
 		intel_display_driver_disable_user_access(display);
 	}
 
-	intel_display_driver_suspend(display);
+	intel_display_driver_pm_suspend(display);
 
 	intel_encoder_block_all_hpds(display);
 
@@ -1325,7 +1325,7 @@ static int i915_drm_resume(struct drm_device *dev)
 
 	intel_encoder_unblock_all_hpds(display);
 
-	intel_display_driver_resume(display);
+	intel_display_driver_pm_resume(display);
 
 	if (intel_display_device_present(display)) {
 		intel_display_driver_enable_user_access(display);
diff --git a/drivers/gpu/drm/xe/display/xe_display.c b/drivers/gpu/drm/xe/display/xe_display.c
index 8d55e7a37d6d..d1c450a18713 100644
--- a/drivers/gpu/drm/xe/display/xe_display.c
+++ b/drivers/gpu/drm/xe/display/xe_display.c
@@ -309,7 +309,7 @@ void xe_display_pm_suspend(struct xe_device *xe)
 	if (intel_display_device_present(display)) {
 		drm_kms_helper_poll_disable(&xe->drm);
 		intel_display_driver_disable_user_access(display);
-		intel_display_driver_suspend(display);
+		intel_display_driver_pm_suspend(display);
 	}
 
 	intel_encoder_block_all_hpds(display);
@@ -339,7 +339,7 @@ void xe_display_pm_shutdown(struct xe_device *xe)
 	if (intel_display_device_present(display)) {
 		drm_kms_helper_poll_disable(&xe->drm);
 		intel_display_driver_disable_user_access(display);
-		intel_display_driver_suspend(display);
+		intel_display_driver_pm_suspend(display);
 	}
 
 	intel_encoder_block_all_hpds(display);
@@ -447,7 +447,7 @@ void xe_display_pm_resume(struct xe_device *xe)
 	intel_encoder_unblock_all_hpds(display);
 
 	if (intel_display_device_present(display)) {
-		intel_display_driver_resume(display);
+		intel_display_driver_pm_resume(display);
 		intel_display_driver_enable_user_access(display);
 		drm_kms_helper_poll_enable(&xe->drm);
 	}
-- 
2.47.3

[PATCH 07/24] drm/xe/display: rename xe_display_pm_shutdown*() to xe_display_shutdown*()

[Jani Nikula]

The shutdown functions get called from the struct pci_driver .shutdown
hook, not through the struct dev_pm_ops hooks. Name accordingly,
dropping the "pm" from the name, even if shutdown has a lot of
similarities with suspend.

Signed-off-by: Jani Nikula <jani.nikula@intel.com>
---
 drivers/gpu/drm/xe/display/xe_display.c |  4 ++--
 drivers/gpu/drm/xe/display/xe_display.h | 10 ++++++----
 drivers/gpu/drm/xe/xe_device.c          |  4 ++--
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/drivers/gpu/drm/xe/display/xe_display.c b/drivers/gpu/drm/xe/display/xe_display.c
index d1c450a18713..3567b3018083 100644
--- a/drivers/gpu/drm/xe/display/xe_display.c
+++ b/drivers/gpu/drm/xe/display/xe_display.c
@@ -326,7 +326,7 @@ void xe_display_pm_suspend(struct xe_device *xe)
 	intel_dmc_suspend(display);
 }
 
-void xe_display_pm_shutdown(struct xe_device *xe)
+void xe_display_shutdown(struct xe_device *xe)
 {
 	struct intel_display *display = xe->display;
 
@@ -400,7 +400,7 @@ void xe_display_pm_runtime_suspend_late(struct xe_device *xe)
 	intel_dmc_wl_flush_release_work(display);
 }
 
-void xe_display_pm_shutdown_late(struct xe_device *xe)
+void xe_display_shutdown_late(struct xe_device *xe)
 {
 	struct intel_display *display = xe->display;
 
diff --git a/drivers/gpu/drm/xe/display/xe_display.h b/drivers/gpu/drm/xe/display/xe_display.h
index 60291cb154df..e5f9aed93206 100644
--- a/drivers/gpu/drm/xe/display/xe_display.h
+++ b/drivers/gpu/drm/xe/display/xe_display.h
@@ -29,15 +29,16 @@ int xe_display_init(struct xe_device *xe);
 void xe_display_register(struct xe_device *xe);
 void xe_display_unregister(struct xe_device *xe);
 
+void xe_display_shutdown(struct xe_device *xe);
+void xe_display_shutdown_late(struct xe_device *xe);
+
 void xe_display_irq_handler(struct xe_device *xe, u32 master_ctl);
 void xe_display_irq_enable(struct xe_device *xe, u32 gu_misc_iir);
 void xe_display_irq_reset(struct xe_device *xe);
 void xe_display_irq_postinstall(struct xe_device *xe);
 
 void xe_display_pm_suspend(struct xe_device *xe);
-void xe_display_pm_shutdown(struct xe_device *xe);
 void xe_display_pm_suspend_late(struct xe_device *xe);
-void xe_display_pm_shutdown_late(struct xe_device *xe);
 void xe_display_pm_resume_early(struct xe_device *xe);
 void xe_display_pm_resume(struct xe_device *xe);
 void xe_display_pm_runtime_suspend(struct xe_device *xe);
@@ -65,15 +66,16 @@ static inline int xe_display_init(struct xe_device *xe) { return 0; }
 static inline void xe_display_register(struct xe_device *xe) {}
 static inline void xe_display_unregister(struct xe_device *xe) {}
 
+static inline void xe_display_shutdown(struct xe_device *xe) {}
+static inline void xe_display_shutdown_late(struct xe_device *xe) {}
+
 static inline void xe_display_irq_handler(struct xe_device *xe, u32 master_ctl) {}
 static inline void xe_display_irq_enable(struct xe_device *xe, u32 gu_misc_iir) {}
 static inline void xe_display_irq_reset(struct xe_device *xe) {}
 static inline void xe_display_irq_postinstall(struct xe_device *xe) {}
 
 static inline void xe_display_pm_suspend(struct xe_device *xe) {}
-static inline void xe_display_pm_shutdown(struct xe_device *xe) {}
 static inline void xe_display_pm_suspend_late(struct xe_device *xe) {}
-static inline void xe_display_pm_shutdown_late(struct xe_device *xe) {}
 static inline void xe_display_pm_resume_early(struct xe_device *xe) {}
 static inline void xe_display_pm_resume(struct xe_device *xe) {}
 static inline void xe_display_pm_runtime_suspend(struct xe_device *xe) {}
diff --git a/drivers/gpu/drm/xe/xe_device.c b/drivers/gpu/drm/xe/xe_device.c
index d224861b6f6f..ec065b168bb9 100644
--- a/drivers/gpu/drm/xe/xe_device.c
+++ b/drivers/gpu/drm/xe/xe_device.c
@@ -1128,14 +1128,14 @@ void xe_device_shutdown(struct xe_device *xe)
 
 	drm_dbg(&xe->drm, "Shutting down device\n");
 
-	xe_display_pm_shutdown(xe);
+	xe_display_shutdown(xe);
 
 	xe_irq_suspend(xe);
 
 	for_each_gt(gt, xe, id)
 		xe_gt_shutdown(gt);
 
-	xe_display_pm_shutdown_late(xe);
+	xe_display_shutdown_late(xe);
 
 	if (!xe_driver_flr_disabled(xe)) {
 		/* BOOM! */
-- 
2.47.3

[PATCH 08/24] drm/xe/display: relocate the xe_display_shutdown*() functions

[Jani Nikula]

Group the xe_display_shutdown() and xe_display_shutdown_late() functions
together, away from the pm hooks.

Signed-off-by: Jani Nikula <jani.nikula@intel.com>
---
 drivers/gpu/drm/xe/display/xe_display.c | 90 ++++++++++++-------------
 1 file changed, 45 insertions(+), 45 deletions(-)

diff --git a/drivers/gpu/drm/xe/display/xe_display.c b/drivers/gpu/drm/xe/display/xe_display.c
index 3567b3018083..aab3ac1b70e1 100644
--- a/drivers/gpu/drm/xe/display/xe_display.c
+++ b/drivers/gpu/drm/xe/display/xe_display.c
@@ -191,6 +191,51 @@ void xe_display_unregister(struct xe_device *xe)
 	intel_display_driver_unregister(display);
 }
 
+void xe_display_shutdown(struct xe_device *xe)
+{
+	struct intel_display *display = xe->display;
+
+	if (!xe->info.probe_display)
+		return;
+
+	intel_display_power_disable(display);
+	drm_client_dev_suspend(&xe->drm);
+
+	if (intel_display_device_present(display)) {
+		drm_kms_helper_poll_disable(&xe->drm);
+		intel_display_driver_disable_user_access(display);
+		intel_display_driver_pm_suspend(display);
+	}
+
+	intel_encoder_block_all_hpds(display);
+	intel_hpd_cancel_work(display);
+
+	if (intel_display_device_present(display))
+		intel_display_driver_suspend_access(display);
+
+	intel_encoder_suspend_all(display);
+	intel_encoder_shutdown_all(display);
+
+	intel_opregion_suspend(display, PCI_D3cold);
+
+	intel_dmc_suspend(display);
+}
+
+void xe_display_shutdown_late(struct xe_device *xe)
+{
+	struct intel_display *display = xe->display;
+
+	if (!xe->info.probe_display)
+		return;
+
+	/*
+	 * The only requirement is to reboot with display DC states disabled,
+	 * for now leaving all display power wells in the INIT power domain
+	 * enabled.
+	 */
+	intel_display_power_driver_remove(display);
+}
+
 /* IRQ-related functions */
 
 void xe_display_irq_handler(struct xe_device *xe, u32 master_ctl)
@@ -326,36 +371,6 @@ void xe_display_pm_suspend(struct xe_device *xe)
 	intel_dmc_suspend(display);
 }
 
-void xe_display_shutdown(struct xe_device *xe)
-{
-	struct intel_display *display = xe->display;
-
-	if (!xe->info.probe_display)
-		return;
-
-	intel_display_power_disable(display);
-	drm_client_dev_suspend(&xe->drm);
-
-	if (intel_display_device_present(display)) {
-		drm_kms_helper_poll_disable(&xe->drm);
-		intel_display_driver_disable_user_access(display);
-		intel_display_driver_pm_suspend(display);
-	}
-
-	intel_encoder_block_all_hpds(display);
-	intel_hpd_cancel_work(display);
-
-	if (intel_display_device_present(display))
-		intel_display_driver_suspend_access(display);
-
-	intel_encoder_suspend_all(display);
-	intel_encoder_shutdown_all(display);
-
-	intel_opregion_suspend(display, PCI_D3cold);
-
-	intel_dmc_suspend(display);
-}
-
 void xe_display_pm_runtime_suspend(struct xe_device *xe)
 {
 	struct intel_display *display = xe->display;
@@ -400,21 +415,6 @@ void xe_display_pm_runtime_suspend_late(struct xe_device *xe)
 	intel_dmc_wl_flush_release_work(display);
 }
 
-void xe_display_shutdown_late(struct xe_device *xe)
-{
-	struct intel_display *display = xe->display;
-
-	if (!xe->info.probe_display)
-		return;
-
-	/*
-	 * The only requirement is to reboot with display DC states disabled,
-	 * for now leaving all display power wells in the INIT power domain
-	 * enabled.
-	 */
-	intel_display_power_driver_remove(display);
-}
-
 void xe_display_pm_resume_early(struct xe_device *xe)
 {
 	struct intel_display *display = xe->display;
-- 
2.47.3

[PATCH 09/24] drm/xe/display: relocate the xe_display_pm_runtime_*() functions

[Jani Nikula]

Keep the xe_display_pm_runtime_*() functions together, in
suspend/suspend_late/resume order. Also relocate the dependent d3cold
functions near usage in the runtime pm functions.

Signed-off-by: Jani Nikula <jani.nikula@intel.com>
---
 drivers/gpu/drm/xe/display/xe_display.c | 160 ++++++++++++------------
 1 file changed, 80 insertions(+), 80 deletions(-)

diff --git a/drivers/gpu/drm/xe/display/xe_display.c b/drivers/gpu/drm/xe/display/xe_display.c
index aab3ac1b70e1..38ebcc2b712a 100644
--- a/drivers/gpu/drm/xe/display/xe_display.c
+++ b/drivers/gpu/drm/xe/display/xe_display.c
@@ -289,53 +289,6 @@ static bool suspend_to_idle(void)
 	return false;
 }
 
-static void xe_display_enable_d3cold(struct xe_device *xe)
-{
-	struct intel_display *display = xe->display;
-
-	if (!xe->info.probe_display)
-		return;
-
-	/*
-	 * We do a lot of poking in a lot of registers, make sure they work
-	 * properly.
-	 */
-	intel_display_power_disable(display);
-
-	intel_display_flush_cleanup_work(display);
-
-	intel_opregion_suspend(display, PCI_D3cold);
-
-	intel_dmc_suspend(display);
-
-	if (intel_display_device_present(display))
-		intel_hpd_poll_enable(display);
-}
-
-static void xe_display_disable_d3cold(struct xe_device *xe)
-{
-	struct intel_display *display = xe->display;
-
-	if (!xe->info.probe_display)
-		return;
-
-	intel_dmc_resume(display);
-
-	if (intel_display_device_present(display))
-		drm_mode_config_reset(&xe->drm);
-
-	intel_display_driver_init_hw(display);
-
-	intel_hpd_init(display);
-
-	if (intel_display_device_present(display))
-		intel_hpd_poll_disable(display);
-
-	intel_opregion_resume(display);
-
-	intel_display_power_enable(display);
-}
-
 void xe_display_pm_suspend(struct xe_device *xe)
 {
 	struct intel_display *display = xe->display;
@@ -371,21 +324,6 @@ void xe_display_pm_suspend(struct xe_device *xe)
 	intel_dmc_suspend(display);
 }
 
-void xe_display_pm_runtime_suspend(struct xe_device *xe)
-{
-	struct intel_display *display = xe->display;
-
-	if (!xe->info.probe_display)
-		return;
-
-	if (xe->d3cold.allowed) {
-		xe_display_enable_d3cold(xe);
-		return;
-	}
-
-	intel_hpd_poll_enable(display);
-}
-
 void xe_display_pm_suspend_late(struct xe_device *xe)
 {
 	struct intel_display *display = xe->display;
@@ -397,24 +335,6 @@ void xe_display_pm_suspend_late(struct xe_device *xe)
 	intel_display_power_suspend_late(display, s2idle);
 }
 
-void xe_display_pm_runtime_suspend_late(struct xe_device *xe)
-{
-	struct intel_display *display = xe->display;
-
-	if (!xe->info.probe_display)
-		return;
-
-	if (xe->d3cold.allowed)
-		xe_display_pm_suspend_late(xe);
-
-	/*
-	 * If xe_display_pm_suspend_late() is not called, it is likely
-	 * that we will be on dynamic DC states with DMC wakelock enabled. We
-	 * need to flush the release work in that case.
-	 */
-	intel_dmc_wl_flush_release_work(display);
-}
-
 void xe_display_pm_resume_early(struct xe_device *xe)
 {
 	struct intel_display *display = xe->display;
@@ -462,6 +382,86 @@ void xe_display_pm_resume(struct xe_device *xe)
 	intel_display_power_enable(display);
 }
 
+static void xe_display_enable_d3cold(struct xe_device *xe)
+{
+	struct intel_display *display = xe->display;
+
+	if (!xe->info.probe_display)
+		return;
+
+	/*
+	 * We do a lot of poking in a lot of registers, make sure they work
+	 * properly.
+	 */
+	intel_display_power_disable(display);
+
+	intel_display_flush_cleanup_work(display);
+
+	intel_opregion_suspend(display, PCI_D3cold);
+
+	intel_dmc_suspend(display);
+
+	if (intel_display_device_present(display))
+		intel_hpd_poll_enable(display);
+}
+
+static void xe_display_disable_d3cold(struct xe_device *xe)
+{
+	struct intel_display *display = xe->display;
+
+	if (!xe->info.probe_display)
+		return;
+
+	intel_dmc_resume(display);
+
+	if (intel_display_device_present(display))
+		drm_mode_config_reset(&xe->drm);
+
+	intel_display_driver_init_hw(display);
+
+	intel_hpd_init(display);
+
+	if (intel_display_device_present(display))
+		intel_hpd_poll_disable(display);
+
+	intel_opregion_resume(display);
+
+	intel_display_power_enable(display);
+}
+
+void xe_display_pm_runtime_suspend(struct xe_device *xe)
+{
+	struct intel_display *display = xe->display;
+
+	if (!xe->info.probe_display)
+		return;
+
+	if (xe->d3cold.allowed) {
+		xe_display_enable_d3cold(xe);
+		return;
+	}
+
+	intel_hpd_poll_enable(display);
+}
+
+void xe_display_pm_runtime_suspend_late(struct xe_device *xe)
+{
+	struct intel_display *display = xe->display;
+
+	if (!xe->info.probe_display)
+		return;
+
+	if (xe->d3cold.allowed)
+		xe_display_pm_suspend_late(xe);
+
+	/*
+	 * If xe_display_pm_suspend_late() is not called, it is likely
+	 * that we will be on dynamic DC states with DMC wakelock enabled. We
+	 * need to flush the release work in that case.
+	 */
+	intel_dmc_wl_flush_release_work(display);
+}
+
 void xe_display_pm_runtime_resume(struct xe_device *xe)
 {
 	struct intel_display *display = xe->display;
-- 
2.47.3

[PATCH 10/24] drm/{i915, xe}: move more calls inside intel_display_driver_pm_suspend()

[Jani Nikula]

The intel_display_driver_pm_suspend() calls are surrounded by near
identical display calls. Move the calls inside
intel_display_driver_pm_suspend().

There's a slight functional change in that
intel_display_driver_pm_suspend() returns early for
!HAS_DISPLAY(). Assume this is what we want, and there are no cases
where display engine is present but all pipes have been fused off.

Signed-off-by: Jani Nikula <jani.nikula@intel.com>
---
 .../drm/i915/display/intel_display_driver.c   | 11 ++++++++++
 drivers/gpu/drm/i915/i915_driver.c            |  9 --------
 drivers/gpu/drm/xe/display/xe_display.c       | 22 ++-----------------
 3 files changed, 13 insertions(+), 29 deletions(-)

diff --git a/drivers/gpu/drm/i915/display/intel_display_driver.c b/drivers/gpu/drm/i915/display/intel_display_driver.c
index 9be4c94740dc..41a2244985fa 100644
--- a/drivers/gpu/drm/i915/display/intel_display_driver.c
+++ b/drivers/gpu/drm/i915/display/intel_display_driver.c
@@ -686,6 +686,17 @@ int intel_display_driver_pm_suspend(struct intel_display *display)
 	if (!HAS_DISPLAY(display))
 		return 0;
 
+	/*
+	 * We do a lot of poking in a lot of registers, make sure they work
+	 * properly.
+	 */
+	intel_display_power_disable(display);
+
+	drm_client_dev_suspend(display->drm);
+
+	drm_kms_helper_poll_disable(display->drm);
+	intel_display_driver_disable_user_access(display);
+
 	state = drm_atomic_helper_suspend(display->drm);
 	ret = PTR_ERR_OR_ZERO(state);
 	if (ret)
diff --git a/drivers/gpu/drm/i915/i915_driver.c b/drivers/gpu/drm/i915/i915_driver.c
index bd73d64c1ccb..f161723f653e 100644
--- a/drivers/gpu/drm/i915/i915_driver.c
+++ b/drivers/gpu/drm/i915/i915_driver.c
@@ -1130,15 +1130,6 @@ static int i915_drm_suspend(struct drm_device *dev)
 
 	disable_rpm_wakeref_asserts(&dev_priv->runtime_pm);
 
-	/* We do a lot of poking in a lot of registers, make sure they work
-	 * properly. */
-	intel_display_power_disable(display);
-	drm_client_dev_suspend(dev);
-	if (intel_display_device_present(display)) {
-		drm_kms_helper_poll_disable(dev);
-		intel_display_driver_disable_user_access(display);
-	}
-
 	intel_display_driver_pm_suspend(display);
 
 	intel_encoder_block_all_hpds(display);
diff --git a/drivers/gpu/drm/xe/display/xe_display.c b/drivers/gpu/drm/xe/display/xe_display.c
index 38ebcc2b712a..027db7b6ceb5 100644
--- a/drivers/gpu/drm/xe/display/xe_display.c
+++ b/drivers/gpu/drm/xe/display/xe_display.c
@@ -198,14 +198,7 @@ void xe_display_shutdown(struct xe_device *xe)
 	if (!xe->info.probe_display)
 		return;
 
-	intel_display_power_disable(display);
-	drm_client_dev_suspend(&xe->drm);
-
-	if (intel_display_device_present(display)) {
-		drm_kms_helper_poll_disable(&xe->drm);
-		intel_display_driver_disable_user_access(display);
-		intel_display_driver_pm_suspend(display);
-	}
+	intel_display_driver_pm_suspend(display);
 
 	intel_encoder_block_all_hpds(display);
 	intel_hpd_cancel_work(display);
@@ -297,18 +290,7 @@ void xe_display_pm_suspend(struct xe_device *xe)
 	if (!xe->info.probe_display)
 		return;
 
-	/*
-	 * We do a lot of poking in a lot of registers, make sure they work
-	 * properly.
-	 */
-	intel_display_power_disable(display);
-	drm_client_dev_suspend(&xe->drm);
-
-	if (intel_display_device_present(display)) {
-		drm_kms_helper_poll_disable(&xe->drm);
-		intel_display_driver_disable_user_access(display);
-		intel_display_driver_pm_suspend(display);
-	}
+	intel_display_driver_pm_suspend(display);
 
 	intel_encoder_block_all_hpds(display);
 
-- 
2.47.3

[PATCH 11/24] drm/{i915, xe}: move more calls inside intel_display_driver_pm_resume()

[Jani Nikula]

The intel_display_driver_pm_resume() calls are surrounded by near
identical display calls. Move the calls inside
intel_display_driver_pm_resume().

There's a slight functional change in that
intel_display_driver_pm_resume() returns early for
!HAS_DISPLAY(). Assume this is what we want, and there are no cases
where display engine is present but all pipes have been fused off.

Signed-off-by: Jani Nikula <jani.nikula@intel.com>
---
 .../drm/i915/display/intel_display_driver.c   | 18 +++++++++++++++
 drivers/gpu/drm/i915/i915_driver.c            | 19 ----------------
 drivers/gpu/drm/xe/display/xe_display.c       | 22 +------------------
 3 files changed, 19 insertions(+), 40 deletions(-)

diff --git a/drivers/gpu/drm/i915/display/intel_display_driver.c b/drivers/gpu/drm/i915/display/intel_display_driver.c
index 41a2244985fa..f362532c6834 100644
--- a/drivers/gpu/drm/i915/display/intel_display_driver.c
+++ b/drivers/gpu/drm/i915/display/intel_display_driver.c
@@ -43,6 +43,7 @@
 #include "intel_dp_tunnel.h"
 #include "intel_dpll.h"
 #include "intel_dpll_mgr.h"
+#include "intel_encoder.h"
 #include "intel_fb.h"
 #include "intel_fbc.h"
 #include "intel_fbdev.h"
@@ -761,6 +762,12 @@ void intel_display_driver_pm_resume(struct intel_display *display)
 	if (!HAS_DISPLAY(display))
 		return;
 
+	intel_display_driver_resume_access(display);
+
+	intel_hpd_init(display);
+
+	intel_encoder_unblock_all_hpds(display);
+
 	/* MST sideband requires HPD interrupts enabled */
 	intel_dp_mst_resume(display);
 
@@ -790,4 +797,15 @@ void intel_display_driver_pm_resume(struct intel_display *display)
 			"Restoring old state failed with %i\n", ret);
 	if (state)
 		drm_atomic_commit_put(state);
+
+	intel_display_driver_enable_user_access(display);
+	drm_kms_helper_poll_enable(display->drm);
+
+	intel_hpd_poll_disable(display);
+
+	intel_opregion_resume(display);
+
+	drm_client_dev_resume(display->drm);
+
+	intel_display_power_enable(display);
 }
diff --git a/drivers/gpu/drm/i915/i915_driver.c b/drivers/gpu/drm/i915/i915_driver.c
index f161723f653e..063d4bdec2d9 100644
--- a/drivers/gpu/drm/i915/i915_driver.c
+++ b/drivers/gpu/drm/i915/i915_driver.c
@@ -1309,27 +1309,8 @@ static int i915_drm_resume(struct drm_device *dev)
 
 	intel_clock_gating_init(&dev_priv->drm);
 
-	if (intel_display_device_present(display))
-		intel_display_driver_resume_access(display);
-
-	intel_hpd_init(display);
-
-	intel_encoder_unblock_all_hpds(display);
-
 	intel_display_driver_pm_resume(display);
 
-	if (intel_display_device_present(display)) {
-		intel_display_driver_enable_user_access(display);
-		drm_kms_helper_poll_enable(dev);
-	}
-	intel_hpd_poll_disable(display);
-
-	intel_opregion_resume(display);
-
-	drm_client_dev_resume(dev);
-
-	intel_display_power_enable(display);
-
 	intel_gvt_resume(dev_priv);
 
 	enable_rpm_wakeref_asserts(&dev_priv->runtime_pm);
diff --git a/drivers/gpu/drm/xe/display/xe_display.c b/drivers/gpu/drm/xe/display/xe_display.c
index 027db7b6ceb5..f34a9d2ffc16 100644
--- a/drivers/gpu/drm/xe/display/xe_display.c
+++ b/drivers/gpu/drm/xe/display/xe_display.c
@@ -341,27 +341,7 @@ void xe_display_pm_resume(struct xe_device *xe)
 
 	intel_display_driver_init_hw(display);
 
-	if (intel_display_device_present(display))
-		intel_display_driver_resume_access(display);
-
-	intel_hpd_init(display);
-
-	intel_encoder_unblock_all_hpds(display);
-
-	if (intel_display_device_present(display)) {
-		intel_display_driver_pm_resume(display);
-		intel_display_driver_enable_user_access(display);
-		drm_kms_helper_poll_enable(&xe->drm);
-	}
-
-	if (intel_display_device_present(display))
-		intel_hpd_poll_disable(display);
-
-	intel_opregion_resume(display);
-
-	drm_client_dev_resume(&xe->drm);
-
-	intel_display_power_enable(display);
+	intel_display_driver_pm_resume(display);
 }
 
 static void xe_display_enable_d3cold(struct xe_device *xe)
-- 
2.47.3

[PATCH 12/24] drm/{i915, xe}: add intel_display_driver_pm_{suspend_late, resume_early}()

[Jani Nikula]

Add new functions intel_display_driver_pm_suspend_late() and
intel_display_driver_pm_resume_early(), to be called from the
corresponding struct dev_pm_ops hooks.

There's a slight functional change for !HAS_DISPLAY() in that the new
functions return early. Assume this is what we want, and there are no
cases where display engine is present but all pipes have been fused off.

Signed-off-by: Jani Nikula <jani.nikula@intel.com>
---
 .../gpu/drm/i915/display/intel_display_driver.c  | 16 ++++++++++++++++
 .../gpu/drm/i915/display/intel_display_driver.h  |  2 ++
 drivers/gpu/drm/i915/i915_driver.c               |  6 +++---
 drivers/gpu/drm/xe/display/xe_display.c          |  4 ++--
 4 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/drivers/gpu/drm/i915/display/intel_display_driver.c b/drivers/gpu/drm/i915/display/intel_display_driver.c
index f362532c6834..77fa4497b442 100644
--- a/drivers/gpu/drm/i915/display/intel_display_driver.c
+++ b/drivers/gpu/drm/i915/display/intel_display_driver.c
@@ -714,6 +714,22 @@ int intel_display_driver_pm_suspend(struct intel_display *display)
 	return ret;
 }
 
+void intel_display_driver_pm_suspend_late(struct intel_display *display, bool s2idle)
+{
+	if (!HAS_DISPLAY(display))
+		return;
+
+	intel_display_power_suspend_late(display, s2idle);
+}
+
+void intel_display_driver_pm_resume_early(struct intel_display *display)
+{
+	if (!HAS_DISPLAY(display))
+		return;
+
+	intel_display_power_resume_early(display);
+}
+
 int
 __intel_display_driver_resume(struct intel_display *display,
 			      struct drm_atomic_commit *state,
diff --git a/drivers/gpu/drm/i915/display/intel_display_driver.h b/drivers/gpu/drm/i915/display/intel_display_driver.h
index d8a08ca68d4e..adfde02465ea 100644
--- a/drivers/gpu/drm/i915/display/intel_display_driver.h
+++ b/drivers/gpu/drm/i915/display/intel_display_driver.h
@@ -26,6 +26,8 @@ void intel_display_driver_remove_nogem(struct intel_display *display);
 void intel_display_driver_unregister(struct intel_display *display);
 
 int intel_display_driver_pm_suspend(struct intel_display *display);
+void intel_display_driver_pm_suspend_late(struct intel_display *display, bool s2idle);
+void intel_display_driver_pm_resume_early(struct intel_display *display);
 void intel_display_driver_pm_resume(struct intel_display *display);
 
 /* interface for intel_display_reset.c */
diff --git a/drivers/gpu/drm/i915/i915_driver.c b/drivers/gpu/drm/i915/i915_driver.c
index 063d4bdec2d9..6fd3e8b155b1 100644
--- a/drivers/gpu/drm/i915/i915_driver.c
+++ b/drivers/gpu/drm/i915/i915_driver.c
@@ -1181,12 +1181,12 @@ 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_display_power_suspend_late(display, s2idle);
+	intel_display_driver_pm_suspend_late(display, s2idle);
 
 	ret = vlv_suspend_complete(dev_priv);
 	if (ret) {
 		drm_err(&dev_priv->drm, "Suspend complete failed: %d\n", ret);
-		intel_display_power_resume_early(display);
+		intel_display_driver_pm_resume_early(display);
 	}
 
 	enable_rpm_wakeref_asserts(rpm);
@@ -1345,7 +1345,7 @@ static int i915_drm_resume_early(struct drm_device *dev)
 	for_each_gt(gt, dev_priv, i)
 		intel_gt_resume_early(gt);
 
-	intel_display_power_resume_early(display);
+	intel_display_driver_pm_resume_early(display);
 
 	enable_rpm_wakeref_asserts(&dev_priv->runtime_pm);
 
diff --git a/drivers/gpu/drm/xe/display/xe_display.c b/drivers/gpu/drm/xe/display/xe_display.c
index f34a9d2ffc16..bbd4f527d5e3 100644
--- a/drivers/gpu/drm/xe/display/xe_display.c
+++ b/drivers/gpu/drm/xe/display/xe_display.c
@@ -314,7 +314,7 @@ void xe_display_pm_suspend_late(struct xe_device *xe)
 	if (!xe->info.probe_display)
 		return;
 
-	intel_display_power_suspend_late(display, s2idle);
+	intel_display_driver_pm_suspend_late(display, s2idle);
 }
 
 void xe_display_pm_resume_early(struct xe_device *xe)
@@ -324,7 +324,7 @@ void xe_display_pm_resume_early(struct xe_device *xe)
 	if (!xe->info.probe_display)
 		return;
 
-	intel_display_power_resume_early(display);
+	intel_display_driver_pm_resume_early(display);
 }
 
 void xe_display_pm_resume(struct xe_device *xe)
-- 
2.47.3

[PATCH 13/24] drm/{i915, xe}: move more calls inside intel_display_driver_{register, unregister}()

[Jani Nikula]

The intel_display_driver_register() and
intel_display_driver_unregister() calls are followed and preceded by
intel_display_power_enable() and intel_display_power_disable() calls,
respectively. Move them inside the register/unregister calls.

Semantically, this is a weird location, as there's nothing really
"register" or "unregister" about them, but they retain the existing
sequence. Add comments to note that.

There's a slight functional change for !HAS_DISPLAY() in that
register/unregister return early. Assume this is what we want, and there
are no cases where display engine is present but all pipes have been
fused off.

Signed-off-by: Jani Nikula <jani.nikula@intel.com>
---
 drivers/gpu/drm/i915/display/intel_display_driver.c | 6 ++++++
 drivers/gpu/drm/i915/i915_driver.c                  | 2 --
 drivers/gpu/drm/xe/display/xe_display.c             | 2 --
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/drivers/gpu/drm/i915/display/intel_display_driver.c b/drivers/gpu/drm/i915/display/intel_display_driver.c
index 77fa4497b442..7fee9ef88224 100644
--- a/drivers/gpu/drm/i915/display/intel_display_driver.c
+++ b/drivers/gpu/drm/i915/display/intel_display_driver.c
@@ -578,6 +578,9 @@ void intel_display_driver_register(struct intel_display *display)
 					DISPLAY_RUNTIME_INFO(display), &p);
 
 	intel_register_dsm_handler();
+
+	/* Semantically out of place, just for the sequence */
+	intel_display_power_enable(display);
 }
 
 /* part #1: call before irq uninstall */
@@ -652,6 +655,9 @@ void intel_display_driver_unregister(struct intel_display *display)
 	if (!HAS_DISPLAY(display))
 		return;
 
+	/* Semantically out of place, just for the sequence */
+	intel_display_power_disable(display);
+
 	intel_unregister_dsm_handler();
 
 	drm_client_dev_unregister(display->drm);
diff --git a/drivers/gpu/drm/i915/i915_driver.c b/drivers/gpu/drm/i915/i915_driver.c
index 6fd3e8b155b1..b637c4dedf1b 100644
--- a/drivers/gpu/drm/i915/i915_driver.c
+++ b/drivers/gpu/drm/i915/i915_driver.c
@@ -661,7 +661,6 @@ static int i915_driver_register(struct drm_i915_private *dev_priv)
 
 	intel_display_driver_register(display);
 
-	intel_display_power_enable(display);
 	intel_runtime_pm_enable(&dev_priv->runtime_pm);
 
 	if (i915_switcheroo_register(dev_priv))
@@ -683,7 +682,6 @@ static void i915_driver_unregister(struct drm_i915_private *dev_priv)
 	i915_switcheroo_unregister(dev_priv);
 
 	intel_runtime_pm_disable(&dev_priv->runtime_pm);
-	intel_display_power_disable(display);
 
 	intel_display_driver_unregister(display);
 
diff --git a/drivers/gpu/drm/xe/display/xe_display.c b/drivers/gpu/drm/xe/display/xe_display.c
index bbd4f527d5e3..e17e05a8854c 100644
--- a/drivers/gpu/drm/xe/display/xe_display.c
+++ b/drivers/gpu/drm/xe/display/xe_display.c
@@ -177,7 +177,6 @@ void xe_display_register(struct xe_device *xe)
 		return;
 
 	intel_display_driver_register(display);
-	intel_display_power_enable(display);
 }
 
 void xe_display_unregister(struct xe_device *xe)
@@ -187,7 +186,6 @@ void xe_display_unregister(struct xe_device *xe)
 	if (!xe->info.probe_display)
 		return;
 
-	intel_display_power_disable(display);
 	intel_display_driver_unregister(display);
 }
 
-- 
2.47.3

[PATCH 14/24] drm/{i915, xe}: add intel_display_driver_shutdown_late()

[Jani Nikula]

Add new function intel_display_driver_shutdown_late() to be called
"later" in the struct pci_driver .shutdown hook.

There's a slight functional change in that
intel_display_driver_shutdown_late() returns early for
!HAS_DISPLAY(). Assume this is what we want, and there are no cases
where display engine is present but all pipes have been fused off.

Signed-off-by: Jani Nikula <jani.nikula@intel.com>
---
 drivers/gpu/drm/i915/display/intel_display_driver.c | 13 +++++++++++++
 drivers/gpu/drm/i915/display/intel_display_driver.h |  1 +
 drivers/gpu/drm/i915/i915_driver.c                  |  7 ++-----
 drivers/gpu/drm/xe/display/xe_display.c             |  7 +------
 4 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/drivers/gpu/drm/i915/display/intel_display_driver.c b/drivers/gpu/drm/i915/display/intel_display_driver.c
index 7fee9ef88224..7f2d191b9ef0 100644
--- a/drivers/gpu/drm/i915/display/intel_display_driver.c
+++ b/drivers/gpu/drm/i915/display/intel_display_driver.c
@@ -681,6 +681,19 @@ void intel_display_driver_unregister(struct intel_display *display)
 	intel_vga_unregister(display);
 }
 
+void intel_display_driver_shutdown_late(struct intel_display *display)
+{
+	if (!HAS_DISPLAY(display))
+		return;
+
+	/*
+	 * The only requirement is to reboot with display DC states disabled,
+	 * for now leaving all display power wells in the INIT power domain
+	 * enabled.
+	 */
+	intel_display_power_driver_remove(display);
+}
+
 /*
  * turn all crtc's off, but do not adjust state
  * This has to be paired with a call to intel_modeset_setup_hw_state.
diff --git a/drivers/gpu/drm/i915/display/intel_display_driver.h b/drivers/gpu/drm/i915/display/intel_display_driver.h
index adfde02465ea..61515577758b 100644
--- a/drivers/gpu/drm/i915/display/intel_display_driver.h
+++ b/drivers/gpu/drm/i915/display/intel_display_driver.h
@@ -24,6 +24,7 @@ void intel_display_driver_remove(struct intel_display *display);
 void intel_display_driver_remove_noirq(struct intel_display *display);
 void intel_display_driver_remove_nogem(struct intel_display *display);
 void intel_display_driver_unregister(struct intel_display *display);
+void intel_display_driver_shutdown_late(struct intel_display *display);
 
 int intel_display_driver_pm_suspend(struct intel_display *display);
 void intel_display_driver_pm_suspend_late(struct intel_display *display, bool s2idle);
diff --git a/drivers/gpu/drm/i915/i915_driver.c b/drivers/gpu/drm/i915/i915_driver.c
index b637c4dedf1b..140c562a8627 100644
--- a/drivers/gpu/drm/i915/i915_driver.c
+++ b/drivers/gpu/drm/i915/i915_driver.c
@@ -1073,17 +1073,14 @@ void i915_driver_shutdown(struct drm_i915_private *i915)
 	i915_gem_suspend(i915);
 
 	/*
-	 * The only requirement is to reboot with display DC states disabled,
-	 * for now leaving all display power wells in the INIT power domain
-	 * enabled.
-	 *
 	 * TODO:
 	 * - unify the pci_driver::shutdown sequence here with the
 	 *   pci_driver.driver.pm.poweroff,poweroff_late sequence.
 	 * - unify the driver remove and system/runtime suspend sequences with
 	 *   the above unified shutdown/poweroff sequence.
 	 */
-	intel_display_power_driver_remove(display);
+
+	intel_display_driver_shutdown_late(display);
 	enable_rpm_wakeref_asserts(&i915->runtime_pm);
 
 	intel_runtime_pm_driver_last_release(&i915->runtime_pm);
diff --git a/drivers/gpu/drm/xe/display/xe_display.c b/drivers/gpu/drm/xe/display/xe_display.c
index e17e05a8854c..fdc999c62bc9 100644
--- a/drivers/gpu/drm/xe/display/xe_display.c
+++ b/drivers/gpu/drm/xe/display/xe_display.c
@@ -219,12 +219,7 @@ void xe_display_shutdown_late(struct xe_device *xe)
 	if (!xe->info.probe_display)
 		return;
 
-	/*
-	 * The only requirement is to reboot with display DC states disabled,
-	 * for now leaving all display power wells in the INIT power domain
-	 * enabled.
-	 */
-	intel_display_power_driver_remove(display);
+	intel_display_driver_shutdown_late(display);
 }
 
 /* IRQ-related functions */
-- 
2.47.3

[PATCH 15/24] drm/i915: add intel_display_driver_shutdown()

[Jani Nikula]

Add intel_display_driver_shutdown() to be called from the struct
pci_driver .shutdown path. Initially, only migrate i915, as there are
some subtle differences with xe that will be addressed later.

Pick up as much as we can at this point without making major functional
changes.

There's a slight functional change in that
intel_display_driver_shutdown() returns early for !HAS_DISPLAY(). Assume
this is what we want, and there are no cases where display engine is
present but all pipes have been fused off.

Signed-off-by: Jani Nikula <jani.nikula@intel.com>
---
 .../drm/i915/display/intel_display_driver.c   | 28 +++++++++++++++++++
 .../drm/i915/display/intel_display_driver.h   |  1 +
 drivers/gpu/drm/i915/i915_driver.c            | 24 +---------------
 3 files changed, 30 insertions(+), 23 deletions(-)

diff --git a/drivers/gpu/drm/i915/display/intel_display_driver.c b/drivers/gpu/drm/i915/display/intel_display_driver.c
index 7f2d191b9ef0..90b2a62798c1 100644
--- a/drivers/gpu/drm/i915/display/intel_display_driver.c
+++ b/drivers/gpu/drm/i915/display/intel_display_driver.c
@@ -681,6 +681,34 @@ void intel_display_driver_unregister(struct intel_display *display)
 	intel_vga_unregister(display);
 }
 
+void intel_display_driver_shutdown(struct intel_display *display)
+{
+	if (!HAS_DISPLAY(display))
+		return;
+
+	intel_display_power_disable(display);
+
+	drm_client_dev_suspend(display->drm);
+	drm_kms_helper_poll_disable(display->drm);
+
+	intel_display_driver_disable_user_access(display);
+
+	drm_atomic_helper_shutdown(display->drm);
+
+	flush_workqueue(display->wq.cleanup);
+
+	intel_dp_mst_suspend(display);
+
+	intel_encoder_block_all_hpds(display);
+
+	intel_hpd_cancel_work(display);
+
+	intel_display_driver_suspend_access(display);
+
+	intel_encoder_suspend_all(display);
+	intel_encoder_shutdown_all(display);
+}
+
 void intel_display_driver_shutdown_late(struct intel_display *display)
 {
 	if (!HAS_DISPLAY(display))
diff --git a/drivers/gpu/drm/i915/display/intel_display_driver.h b/drivers/gpu/drm/i915/display/intel_display_driver.h
index 61515577758b..7eca3d17dd82 100644
--- a/drivers/gpu/drm/i915/display/intel_display_driver.h
+++ b/drivers/gpu/drm/i915/display/intel_display_driver.h
@@ -24,6 +24,7 @@ void intel_display_driver_remove(struct intel_display *display);
 void intel_display_driver_remove_noirq(struct intel_display *display);
 void intel_display_driver_remove_nogem(struct intel_display *display);
 void intel_display_driver_unregister(struct intel_display *display);
+void intel_display_driver_shutdown(struct intel_display *display);
 void intel_display_driver_shutdown_late(struct intel_display *display);
 
 int intel_display_driver_pm_suspend(struct intel_display *display);
diff --git a/drivers/gpu/drm/i915/i915_driver.c b/drivers/gpu/drm/i915/i915_driver.c
index 140c562a8627..80313ee07b07 100644
--- a/drivers/gpu/drm/i915/i915_driver.c
+++ b/drivers/gpu/drm/i915/i915_driver.c
@@ -54,7 +54,6 @@
 #include "display/intel_bw.h"
 #include "display/intel_cdclk.h"
 #include "display/intel_crtc.h"
-#include "display/intel_display_core.h"
 #include "display/intel_display_device.h"
 #include "display/intel_display_driver.h"
 #include "display/intel_display_power.h"
@@ -1042,29 +1041,8 @@ void i915_driver_shutdown(struct drm_i915_private *i915)
 
 	disable_rpm_wakeref_asserts(&i915->runtime_pm);
 	intel_runtime_pm_disable(&i915->runtime_pm);
-	intel_display_power_disable(display);
 
-	drm_client_dev_suspend(&i915->drm);
-	if (intel_display_device_present(display)) {
-		drm_kms_helper_poll_disable(&i915->drm);
-		intel_display_driver_disable_user_access(display);
-
-		drm_atomic_helper_shutdown(&i915->drm);
-	}
-
-	flush_workqueue(display->wq.cleanup);
-
-	intel_dp_mst_suspend(display);
-
-	intel_encoder_block_all_hpds(display);
-
-	intel_hpd_cancel_work(display);
-
-	if (intel_display_device_present(display))
-		intel_display_driver_suspend_access(display);
-
-	intel_encoder_suspend_all(display);
-	intel_encoder_shutdown_all(display);
+	intel_display_driver_shutdown(display);
 
 	intel_irq_suspend(i915);
 
-- 
2.47.3

[PATCH 16/24] drm/i915/display: deduplicate suspend and shutdown a bit

[Jani Nikula]

intel_display_driver_shutdown() and intel_display_driver_pm_suspend()
are quite similar. Abstract a shared function to call from both.

This is intentionally just the first non-functional step. More gradual
changes will follow.

Signed-off-by: Jani Nikula <jani.nikula@intel.com>
---
 .../drm/i915/display/intel_display_driver.c   | 45 ++++++++++---------
 1 file changed, 23 insertions(+), 22 deletions(-)

diff --git a/drivers/gpu/drm/i915/display/intel_display_driver.c b/drivers/gpu/drm/i915/display/intel_display_driver.c
index 90b2a62798c1..0dd0b15641eb 100644
--- a/drivers/gpu/drm/i915/display/intel_display_driver.c
+++ b/drivers/gpu/drm/i915/display/intel_display_driver.c
@@ -66,6 +66,8 @@
 #include "intel_wm.h"
 #include "skl_watermark.h"
 
+static int __intel_display_driver_pm_suspend(struct intel_display *display, bool shutdown);
+
 bool intel_display_driver_probe_defer(struct pci_dev *pdev)
 {
 	struct drm_privacy_screen *privacy_screen;
@@ -686,18 +688,7 @@ void intel_display_driver_shutdown(struct intel_display *display)
 	if (!HAS_DISPLAY(display))
 		return;
 
-	intel_display_power_disable(display);
-
-	drm_client_dev_suspend(display->drm);
-	drm_kms_helper_poll_disable(display->drm);
-
-	intel_display_driver_disable_user_access(display);
-
-	drm_atomic_helper_shutdown(display->drm);
-
-	flush_workqueue(display->wq.cleanup);
-
-	intel_dp_mst_suspend(display);
+	__intel_display_driver_pm_suspend(display, true);
 
 	intel_encoder_block_all_hpds(display);
 
@@ -726,10 +717,9 @@ void intel_display_driver_shutdown_late(struct intel_display *display)
  * turn all crtc's off, but do not adjust state
  * This has to be paired with a call to intel_modeset_setup_hw_state.
  */
-int intel_display_driver_pm_suspend(struct intel_display *display)
+static int __intel_display_driver_pm_suspend(struct intel_display *display, bool shutdown)
 {
-	struct drm_atomic_commit *state;
-	int ret;
+	int ret = 0;
 
 	if (!HAS_DISPLAY(display))
 		return 0;
@@ -745,13 +735,19 @@ int intel_display_driver_pm_suspend(struct intel_display *display)
 	drm_kms_helper_poll_disable(display->drm);
 	intel_display_driver_disable_user_access(display);
 
-	state = drm_atomic_helper_suspend(display->drm);
-	ret = PTR_ERR_OR_ZERO(state);
-	if (ret)
-		drm_err(display->drm, "Suspending crtc's failed with %i\n",
-			ret);
-	else
-		display->restore.modeset_state = state;
+	if (shutdown) {
+		drm_atomic_helper_shutdown(display->drm);
+	} else {
+		struct drm_atomic_commit *state;
+
+		state = drm_atomic_helper_suspend(display->drm);
+		ret = PTR_ERR_OR_ZERO(state);
+		if (ret)
+			drm_err(display->drm, "Suspending crtc's failed with %i\n",
+				ret);
+		else
+			display->restore.modeset_state = state;
+	}
 
 	/* ensure all DPT VMAs have been unpinned for intel_dpt_suspend() */
 	flush_workqueue(display->wq.cleanup);
@@ -761,6 +757,11 @@ int intel_display_driver_pm_suspend(struct intel_display *display)
 	return ret;
 }
 
+int intel_display_driver_pm_suspend(struct intel_display *display)
+{
+	return __intel_display_driver_pm_suspend(display, false);
+}
+
 void intel_display_driver_pm_suspend_late(struct intel_display *display, bool s2idle)
 {
 	if (!HAS_DISPLAY(display))
-- 
2.47.3

[PATCH 17/24] drm/xe/display: use intel_display_driver_pm_shutdown()

[Jani Nikula]

Replace direct intel_display_driver_pm_suspend() and additional calls
with intel_display_driver_pm_shutdown(). This switches to use
drm_atomic_helper_shutdown() instead of drm_atomic_helper_suspend(),
which is the more appropriate thing to do anyway.

Not calling intel_display_driver_pm_suspend() from the xe shutdown path
unblocks further follow-up changes.

There's a slight functional change in that
intel_display_driver_shutdown() returns early for !HAS_DISPLAY(). Assume
this is what we want, and there are no cases where display engine is
present but all pipes have been fused off.

Signed-off-by: Jani Nikula <jani.nikula@intel.com>
---
 drivers/gpu/drm/xe/display/xe_display.c | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/drivers/gpu/drm/xe/display/xe_display.c b/drivers/gpu/drm/xe/display/xe_display.c
index fdc999c62bc9..99bcaa49d11a 100644
--- a/drivers/gpu/drm/xe/display/xe_display.c
+++ b/drivers/gpu/drm/xe/display/xe_display.c
@@ -196,16 +196,7 @@ void xe_display_shutdown(struct xe_device *xe)
 	if (!xe->info.probe_display)
 		return;
 
-	intel_display_driver_pm_suspend(display);
-
-	intel_encoder_block_all_hpds(display);
-	intel_hpd_cancel_work(display);
-
-	if (intel_display_device_present(display))
-		intel_display_driver_suspend_access(display);
-
-	intel_encoder_suspend_all(display);
-	intel_encoder_shutdown_all(display);
+	intel_display_driver_shutdown(display);
 
 	intel_opregion_suspend(display, PCI_D3cold);
 
-- 
2.47.3

[PATCH 18/24] drm/{i915, xe}: move more stuff to __intel_display_driver_pm_suspend()

[Jani Nikula]

The calls leading up to __intel_display_driver_pm_suspend() are
surrounded by near identical display calls. Move the calls inside
__intel_display_driver_pm_suspend() to clean up and deduplicate.

There's a slight functional change in that
intel_display_driver_pm_suspend() returns early for
!HAS_DISPLAY(). Assume this is what we want, and there are no cases
where display engine is present but all pipes have been fused off.

Signed-off-by: Jani Nikula <jani.nikula@intel.com>
---
 .../gpu/drm/i915/display/intel_display_driver.c   | 15 ++++++++-------
 drivers/gpu/drm/i915/i915_driver.c                | 10 ----------
 drivers/gpu/drm/xe/display/xe_display.c           | 10 ----------
 3 files changed, 8 insertions(+), 27 deletions(-)

diff --git a/drivers/gpu/drm/i915/display/intel_display_driver.c b/drivers/gpu/drm/i915/display/intel_display_driver.c
index 0dd0b15641eb..bc632ac8c9b4 100644
--- a/drivers/gpu/drm/i915/display/intel_display_driver.c
+++ b/drivers/gpu/drm/i915/display/intel_display_driver.c
@@ -690,13 +690,6 @@ void intel_display_driver_shutdown(struct intel_display *display)
 
 	__intel_display_driver_pm_suspend(display, true);
 
-	intel_encoder_block_all_hpds(display);
-
-	intel_hpd_cancel_work(display);
-
-	intel_display_driver_suspend_access(display);
-
-	intel_encoder_suspend_all(display);
 	intel_encoder_shutdown_all(display);
 }
 
@@ -754,6 +747,14 @@ static int __intel_display_driver_pm_suspend(struct intel_display *display, bool
 
 	intel_dp_mst_suspend(display);
 
+	intel_encoder_block_all_hpds(display);
+
+	intel_hpd_cancel_work(display);
+
+	intel_display_driver_suspend_access(display);
+
+	intel_encoder_suspend_all(display);
+
 	return ret;
 }
 
diff --git a/drivers/gpu/drm/i915/i915_driver.c b/drivers/gpu/drm/i915/i915_driver.c
index 80313ee07b07..209ac512455d 100644
--- a/drivers/gpu/drm/i915/i915_driver.c
+++ b/drivers/gpu/drm/i915/i915_driver.c
@@ -61,7 +61,6 @@
 #include "display/intel_dp.h"
 #include "display/intel_dpt.h"
 #include "display/intel_dram.h"
-#include "display/intel_encoder.h"
 #include "display/intel_fbdev.h"
 #include "display/intel_gmbus.h"
 #include "display/intel_hotplug.h"
@@ -1105,15 +1104,6 @@ static int i915_drm_suspend(struct drm_device *dev)
 
 	intel_display_driver_pm_suspend(display);
 
-	intel_encoder_block_all_hpds(display);
-
-	intel_hpd_cancel_work(display);
-
-	if (intel_display_device_present(display))
-		intel_display_driver_suspend_access(display);
-
-	intel_encoder_suspend_all(display);
-
 	intel_irq_suspend(dev_priv);
 
 	/* Must be called before GGTT is suspended. */
diff --git a/drivers/gpu/drm/xe/display/xe_display.c b/drivers/gpu/drm/xe/display/xe_display.c
index 99bcaa49d11a..561ec1ed6845 100644
--- a/drivers/gpu/drm/xe/display/xe_display.c
+++ b/drivers/gpu/drm/xe/display/xe_display.c
@@ -30,7 +30,6 @@
 #include "intel_dmc_wl.h"
 #include "intel_dp.h"
 #include "intel_dram.h"
-#include "intel_encoder.h"
 #include "intel_fbdev.h"
 #include "intel_hdcp.h"
 #include "intel_hotplug.h"
@@ -276,15 +275,6 @@ void xe_display_pm_suspend(struct xe_device *xe)
 
 	intel_display_driver_pm_suspend(display);
 
-	intel_encoder_block_all_hpds(display);
-
-	intel_hpd_cancel_work(display);
-
-	if (intel_display_device_present(display)) {
-		intel_display_driver_suspend_access(display);
-		intel_encoder_suspend_all(display);
-	}
-
 	intel_opregion_suspend(display, s2idle ? PCI_D1 : PCI_D3cold);
 
 	intel_dmc_suspend(display);
-- 
2.47.3

[PATCH 19/24] drm/{i915, xe}: make intel_dmc_suspend() part of display suspend/shutdown calls

[Jani Nikula]

Move the intel_dmc_suspend() calls from i915 and xe suspend and shutdown
hooks all the way down to a shared location in
__intel_display_driver_pm_suspend().

This is a change in the suspend/shutdown sequences, but hopefully one
without problems.

Signed-off-by: Jani Nikula <jani.nikula@intel.com>
---
 drivers/gpu/drm/i915/display/intel_display_driver.c | 2 ++
 drivers/gpu/drm/i915/i915_driver.c                  | 4 ----
 drivers/gpu/drm/xe/display/xe_display.c             | 4 ----
 3 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/drivers/gpu/drm/i915/display/intel_display_driver.c b/drivers/gpu/drm/i915/display/intel_display_driver.c
index bc632ac8c9b4..6cac36157bea 100644
--- a/drivers/gpu/drm/i915/display/intel_display_driver.c
+++ b/drivers/gpu/drm/i915/display/intel_display_driver.c
@@ -755,6 +755,8 @@ static int __intel_display_driver_pm_suspend(struct intel_display *display, bool
 
 	intel_encoder_suspend_all(display);
 
+	intel_dmc_suspend(display);
+
 	return ret;
 }
 
diff --git a/drivers/gpu/drm/i915/i915_driver.c b/drivers/gpu/drm/i915/i915_driver.c
index 209ac512455d..40fc15017486 100644
--- a/drivers/gpu/drm/i915/i915_driver.c
+++ b/drivers/gpu/drm/i915/i915_driver.c
@@ -1045,8 +1045,6 @@ void i915_driver_shutdown(struct drm_i915_private *i915)
 
 	intel_irq_suspend(i915);
 
-	intel_dmc_suspend(display);
-
 	i915_gem_suspend(i915);
 
 	/*
@@ -1117,8 +1115,6 @@ static int i915_drm_suspend(struct drm_device *dev)
 
 	dev_priv->suspend_count++;
 
-	intel_dmc_suspend(display);
-
 	enable_rpm_wakeref_asserts(&dev_priv->runtime_pm);
 
 	i915_gem_drain_freed_objects(dev_priv);
diff --git a/drivers/gpu/drm/xe/display/xe_display.c b/drivers/gpu/drm/xe/display/xe_display.c
index 561ec1ed6845..9416405667d8 100644
--- a/drivers/gpu/drm/xe/display/xe_display.c
+++ b/drivers/gpu/drm/xe/display/xe_display.c
@@ -198,8 +198,6 @@ void xe_display_shutdown(struct xe_device *xe)
 	intel_display_driver_shutdown(display);
 
 	intel_opregion_suspend(display, PCI_D3cold);
-
-	intel_dmc_suspend(display);
 }
 
 void xe_display_shutdown_late(struct xe_device *xe)
@@ -276,8 +274,6 @@ void xe_display_pm_suspend(struct xe_device *xe)
 	intel_display_driver_pm_suspend(display);
 
 	intel_opregion_suspend(display, s2idle ? PCI_D1 : PCI_D3cold);
-
-	intel_dmc_suspend(display);
 }
 
 void xe_display_pm_suspend_late(struct xe_device *xe)
-- 
2.47.3

[PATCH 20/24] drm/{i915, xe}: move intel_opregion_suspend() to intel_display_driver_pm_suspend_late()

[Jani Nikula]

Try to unify the suspend paths and behaviour by moving the
intel_opregion_suspend() calls to
intel_display_driver_pm_suspend_late().

This is a change in the suspend sequences. The idea behind adding this
to intel_display_driver_pm_suspend_late() is primarily based on not
having to pass the s2idle parameter to more functions than that.

This also changes behaviour for i915 hibernation, going for PCI_D3cold
instead of PCI_D1 on hibernate. It's probably the correct thing to do
anyway, I don't think it should matter all that much, but fingers
crossed.

Signed-off-by: Jani Nikula <jani.nikula@intel.com>
---
 drivers/gpu/drm/i915/display/intel_display_driver.c | 2 ++
 drivers/gpu/drm/i915/i915_driver.c                  | 4 ----
 drivers/gpu/drm/xe/display/xe_display.c             | 3 ---
 3 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/drivers/gpu/drm/i915/display/intel_display_driver.c b/drivers/gpu/drm/i915/display/intel_display_driver.c
index 6cac36157bea..1525ff7a1dc2 100644
--- a/drivers/gpu/drm/i915/display/intel_display_driver.c
+++ b/drivers/gpu/drm/i915/display/intel_display_driver.c
@@ -770,6 +770,8 @@ void intel_display_driver_pm_suspend_late(struct intel_display *display, bool s2
 	if (!HAS_DISPLAY(display))
 		return;
 
+	intel_opregion_suspend(display, s2idle ? PCI_D1 : PCI_D3cold);
+
 	intel_display_power_suspend_late(display, s2idle);
 }
 
diff --git a/drivers/gpu/drm/i915/i915_driver.c b/drivers/gpu/drm/i915/i915_driver.c
index 40fc15017486..7d0f98cbf5d9 100644
--- a/drivers/gpu/drm/i915/i915_driver.c
+++ b/drivers/gpu/drm/i915/i915_driver.c
@@ -1096,7 +1096,6 @@ static int i915_drm_suspend(struct drm_device *dev)
 {
 	struct drm_i915_private *dev_priv = to_i915(dev);
 	struct intel_display *display = dev_priv->display;
-	pci_power_t opregion_target_state;
 
 	disable_rpm_wakeref_asserts(&dev_priv->runtime_pm);
 
@@ -1110,9 +1109,6 @@ static int i915_drm_suspend(struct drm_device *dev)
 
 	i9xx_display_sr_save(display);
 
-	opregion_target_state = suspend_to_idle(dev_priv) ? PCI_D1 : PCI_D3cold;
-	intel_opregion_suspend(display, opregion_target_state);
-
 	dev_priv->suspend_count++;
 
 	enable_rpm_wakeref_asserts(&dev_priv->runtime_pm);
diff --git a/drivers/gpu/drm/xe/display/xe_display.c b/drivers/gpu/drm/xe/display/xe_display.c
index 9416405667d8..73891b36341b 100644
--- a/drivers/gpu/drm/xe/display/xe_display.c
+++ b/drivers/gpu/drm/xe/display/xe_display.c
@@ -266,14 +266,11 @@ static bool suspend_to_idle(void)
 void xe_display_pm_suspend(struct xe_device *xe)
 {
 	struct intel_display *display = xe->display;
-	bool s2idle = suspend_to_idle();
 
 	if (!xe->info.probe_display)
 		return;
 
 	intel_display_driver_pm_suspend(display);
-
-	intel_opregion_suspend(display, s2idle ? PCI_D1 : PCI_D3cold);
 }
 
 void xe_display_pm_suspend_late(struct xe_device *xe)
-- 
2.47.3

[PATCH 21/24] drm/{i915, xe}: keep moving stuff to intel_display_driver_pm_resume()

[Jani Nikula]

The calls to intel_display_driver_pm_resume() are preceded with similar
calls. Move the calls inside intel_display_driver_pm_resume().

In i915 the calls are interspersed among other things, so this is a
functional change. Fingers crossed.

There's a slight functional change in that
intel_display_driver_pm_resume() returns early for
!HAS_DISPLAY(). Assume this is what we want, and there are no cases
where display engine is present but all pipes have been fused off.

Signed-off-by: Jani Nikula <jani.nikula@intel.com>
---
 drivers/gpu/drm/i915/display/intel_display_driver.c | 6 ++++++
 drivers/gpu/drm/i915/i915_driver.c                  | 8 --------
 drivers/gpu/drm/xe/display/xe_display.c             | 7 -------
 3 files changed, 6 insertions(+), 15 deletions(-)

diff --git a/drivers/gpu/drm/i915/display/intel_display_driver.c b/drivers/gpu/drm/i915/display/intel_display_driver.c
index 1525ff7a1dc2..84807a9bff2b 100644
--- a/drivers/gpu/drm/i915/display/intel_display_driver.c
+++ b/drivers/gpu/drm/i915/display/intel_display_driver.c
@@ -831,6 +831,12 @@ void intel_display_driver_pm_resume(struct intel_display *display)
 	if (!HAS_DISPLAY(display))
 		return;
 
+	intel_dmc_resume(display);
+
+	drm_mode_config_reset(display->drm);
+
+	intel_display_driver_init_hw(display);
+
 	intel_display_driver_resume_access(display);
 
 	intel_hpd_init(display);
diff --git a/drivers/gpu/drm/i915/i915_driver.c b/drivers/gpu/drm/i915/i915_driver.c
index 7d0f98cbf5d9..6b9e1b268a89 100644
--- a/drivers/gpu/drm/i915/i915_driver.c
+++ b/drivers/gpu/drm/i915/i915_driver.c
@@ -57,7 +57,6 @@
 #include "display/intel_display_device.h"
 #include "display/intel_display_driver.h"
 #include "display/intel_display_power.h"
-#include "display/intel_dmc.h"
 #include "display/intel_dp.h"
 #include "display/intel_dpt.h"
 #include "display/intel_dram.h"
@@ -1233,8 +1232,6 @@ static int i915_drm_resume(struct drm_device *dev)
 	/* Must be called after GGTT is resumed. */
 	intel_dpt_resume(display);
 
-	intel_dmc_resume(display);
-
 	i9xx_display_sr_restore(display);
 
 	intel_gmbus_reset(display);
@@ -1255,13 +1252,8 @@ static int i915_drm_resume(struct drm_device *dev)
 	 */
 	intel_irq_resume(dev_priv);
 
-	if (intel_display_device_present(display))
-		drm_mode_config_reset(dev);
-
 	i915_gem_resume(dev_priv);
 
-	intel_display_driver_init_hw(display);
-
 	intel_clock_gating_init(&dev_priv->drm);
 
 	intel_display_driver_pm_resume(display);
diff --git a/drivers/gpu/drm/xe/display/xe_display.c b/drivers/gpu/drm/xe/display/xe_display.c
index 73891b36341b..b153bf9c83d8 100644
--- a/drivers/gpu/drm/xe/display/xe_display.c
+++ b/drivers/gpu/drm/xe/display/xe_display.c
@@ -301,13 +301,6 @@ void xe_display_pm_resume(struct xe_device *xe)
 	if (!xe->info.probe_display)
 		return;
 
-	intel_dmc_resume(display);
-
-	if (intel_display_device_present(display))
-		drm_mode_config_reset(&xe->drm);
-
-	intel_display_driver_init_hw(display);
-
 	intel_display_driver_pm_resume(display);
 }
 
-- 
2.47.3

[PATCH 22/24] drm/i915: add intel_display_driver_pm_runtime*() functions

[Jani Nikula]

Add new functions intel_display_driver_pm_runtime_suspend(),
intel_display_driver_pm_runtime_suspend_late(),
intel_display_driver_pm_runtime_resume_early(), and
intel_display_driver_pm_runtime_resume(). Initially, only migrate i915,
as there are some differences with xe that will be addressed later.

There are a few functional changes, which should be benign:

- i915_pm_runtime_suspend() moves assert_forcewakes_inactive() call
  before opregion calls.

- i915_pm_runtime_resume() moves intel_opregion_notify_adapter() call
  slightly later.

In the interest of not introducing more severe functional changes, the
calls become slightly asymmetric. We might want to address this later.

Signed-off-by: Jani Nikula <jani.nikula@intel.com>
---
 .../drm/i915/display/intel_display_driver.c   | 56 +++++++++++++++++++
 .../drm/i915/display/intel_display_driver.h   |  5 ++
 drivers/gpu/drm/i915/i915_driver.c            | 44 ++-------------
 3 files changed, 65 insertions(+), 40 deletions(-)

diff --git a/drivers/gpu/drm/i915/display/intel_display_driver.c b/drivers/gpu/drm/i915/display/intel_display_driver.c
index 84807a9bff2b..a27ddf21b08b 100644
--- a/drivers/gpu/drm/i915/display/intel_display_driver.c
+++ b/drivers/gpu/drm/i915/display/intel_display_driver.c
@@ -884,3 +884,59 @@ void intel_display_driver_pm_resume(struct intel_display *display)
 
 	intel_display_power_enable(display);
 }
+
+void intel_display_driver_pm_runtime_suspend(struct intel_display *display)
+{
+	intel_display_power_runtime_suspend(display);
+}
+
+void intel_display_driver_pm_runtime_suspend_late(struct intel_display *display)
+{
+	/*
+	 * FIXME: We really should find a document that references the arguments
+	 * used below!
+	 */
+	if (display->platform.broadwell) {
+		/*
+		 * On Broadwell, if we use PCI_D1 the PCH DDI ports will stop
+		 * being detected, and the call we do at i915_pm_runtime_resume()
+		 * won't be able to restore them. Since PCI_D3hot matches the
+		 * actual specification and appears to be working, use it.
+		 */
+		intel_opregion_notify_adapter(display, PCI_D3hot);
+	} else {
+		/*
+		 * current versions of firmware which depend on this opregion
+		 * notification have repurposed the D1 definition to mean
+		 * "runtime suspended" vs. what you would normally expect (D3)
+		 * to distinguish it from notifications that might be sent via
+		 * the suspend path.
+		 */
+		intel_opregion_notify_adapter(display, PCI_D1);
+	}
+
+	if (!display->platform.valleyview && !display->platform.cherryview)
+		intel_hpd_poll_enable(display);
+}
+
+void intel_display_driver_pm_runtime_resume_early(struct intel_display *display)
+{
+	intel_opregion_notify_adapter(display, PCI_D0);
+
+	intel_display_power_runtime_resume(display);
+}
+
+void intel_display_driver_pm_runtime_resume(struct intel_display *display)
+{
+	/*
+	 * On VLV/CHV display interrupts are part of the display
+	 * power well, so hpd is reinitialized from there. For
+	 * everyone else do it here.
+	 */
+	if (!display->platform.valleyview && !display->platform.cherryview) {
+		intel_hpd_init(display);
+		intel_hpd_poll_disable(display);
+	}
+
+	skl_watermark_ipc_update(display);
+}
diff --git a/drivers/gpu/drm/i915/display/intel_display_driver.h b/drivers/gpu/drm/i915/display/intel_display_driver.h
index 7eca3d17dd82..1b494337d629 100644
--- a/drivers/gpu/drm/i915/display/intel_display_driver.h
+++ b/drivers/gpu/drm/i915/display/intel_display_driver.h
@@ -43,5 +43,10 @@ void intel_display_driver_suspend_access(struct intel_display *display);
 void intel_display_driver_resume_access(struct intel_display *display);
 bool intel_display_driver_check_access(struct intel_display *display);
 
+void intel_display_driver_pm_runtime_suspend(struct intel_display *display);
+void intel_display_driver_pm_runtime_suspend_late(struct intel_display *display);
+void intel_display_driver_pm_runtime_resume_early(struct intel_display *display);
+void intel_display_driver_pm_runtime_resume(struct intel_display *display);
+
 #endif /* __INTEL_DISPLAY_DRIVER_H__ */
 
diff --git a/drivers/gpu/drm/i915/i915_driver.c b/drivers/gpu/drm/i915/i915_driver.c
index 6b9e1b268a89..519a519d2d96 100644
--- a/drivers/gpu/drm/i915/i915_driver.c
+++ b/drivers/gpu/drm/i915/i915_driver.c
@@ -1521,7 +1521,7 @@ static int i915_pm_runtime_suspend(struct device *kdev)
 	for_each_gt(gt, dev_priv, i)
 		intel_uncore_suspend(gt->uncore);
 
-	intel_display_power_runtime_suspend(display);
+	intel_display_driver_pm_runtime_suspend(display);
 
 	ret = vlv_suspend_complete(dev_priv);
 	if (ret) {
@@ -1555,33 +1555,9 @@ static int i915_pm_runtime_suspend(struct device *kdev)
 	if (root_pdev)
 		pci_d3cold_disable(root_pdev);
 
-	/*
-	 * FIXME: We really should find a document that references the arguments
-	 * used below!
-	 */
-	if (IS_BROADWELL(dev_priv)) {
-		/*
-		 * On Broadwell, if we use PCI_D1 the PCH DDI ports will stop
-		 * being detected, and the call we do at i915_pm_runtime_resume()
-		 * won't be able to restore them. Since PCI_D3hot matches the
-		 * actual specification and appears to be working, use it.
-		 */
-		intel_opregion_notify_adapter(display, PCI_D3hot);
-	} else {
-		/*
-		 * current versions of firmware which depend on this opregion
-		 * notification have repurposed the D1 definition to mean
-		 * "runtime suspended" vs. what you would normally expect (D3)
-		 * to distinguish it from notifications that might be sent via
-		 * the suspend path.
-		 */
-		intel_opregion_notify_adapter(display, PCI_D1);
-	}
-
 	assert_forcewakes_inactive(&dev_priv->uncore);
 
-	if (!IS_VALLEYVIEW(dev_priv) && !IS_CHERRYVIEW(dev_priv))
-		intel_hpd_poll_enable(display);
+	intel_display_driver_pm_runtime_suspend_late(display);
 
 	drm_dbg(&dev_priv->drm, "Device suspended\n");
 	return 0;
@@ -1605,8 +1581,6 @@ static int i915_pm_runtime_resume(struct device *kdev)
 	drm_WARN_ON_ONCE(&dev_priv->drm, atomic_read(&rpm->wakeref_count));
 	disable_rpm_wakeref_asserts(rpm);
 
-	intel_opregion_notify_adapter(display, PCI_D0);
-
 	root_pdev = pcie_find_root_port(pdev);
 	if (root_pdev)
 		pci_d3cold_enable(root_pdev);
@@ -1615,7 +1589,7 @@ static int i915_pm_runtime_resume(struct device *kdev)
 		drm_dbg(&dev_priv->drm,
 			"Unclaimed access during suspend, bios?\n");
 
-	intel_display_power_runtime_resume(display);
+	intel_display_driver_pm_runtime_resume_early(display);
 
 	ret = vlv_resume_prepare(dev_priv, true);
 
@@ -1633,17 +1607,7 @@ static int i915_pm_runtime_resume(struct device *kdev)
 
 	intel_pxp_runtime_resume(dev_priv->pxp);
 
-	/*
-	 * On VLV/CHV display interrupts are part of the display
-	 * power well, so hpd is reinitialized from there. For
-	 * everyone else do it here.
-	 */
-	if (!IS_VALLEYVIEW(dev_priv) && !IS_CHERRYVIEW(dev_priv)) {
-		intel_hpd_init(display);
-		intel_hpd_poll_disable(display);
-	}
-
-	skl_watermark_ipc_update(display);
+	intel_display_driver_pm_runtime_resume(display);
 
 	enable_rpm_wakeref_asserts(rpm);
 
-- 
2.47.3

[PATCH 23/24] drm/xe/display: separate d3cold handling from xe_display_pm_runtime_suspend_late()

[Jani Nikula]

Make the special d3cold paths completely separate from the rest of the
runtime pm calls.

The intel_dmc_wl_flush_release_work() call right after
xe_display_pm_suspend_late() might be completely redundant, but this
avoids any functional changes.

Signed-off-by: Jani Nikula <jani.nikula@intel.com>
---
 drivers/gpu/drm/xe/display/xe_display.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/xe/display/xe_display.c b/drivers/gpu/drm/xe/display/xe_display.c
index b153bf9c83d8..0fadc62e1cdd 100644
--- a/drivers/gpu/drm/xe/display/xe_display.c
+++ b/drivers/gpu/drm/xe/display/xe_display.c
@@ -373,8 +373,11 @@ void xe_display_pm_runtime_suspend_late(struct xe_device *xe)
 	if (!xe->info.probe_display)
 		return;
 
-	if (xe->d3cold.allowed)
+	if (xe->d3cold.allowed) {
 		xe_display_pm_suspend_late(xe);
+		intel_dmc_wl_flush_release_work(display);
+		return;
+	}
 
 	/*
 	 * If xe_display_pm_suspend_late() is not called, it is likely
-- 
2.47.3

[PATCH 24/24] drm/xe/display: unify runtime suspend/resume with i915 for non-d3cold

[Jani Nikula]

With the special d3cold handling in xe runtime suspend/resume separated,
unify the non-d3cold paths with i915. There are multiple changes here at
once that probably wouldn't make much sense to split out further.

Add the call to intel_display_driver_pm_runtime_suspend(), which in turn
starts calling intel_display_power_runtime_suspend(). Deep down, this
should take care of intel_dmc_wl_flush_release_work(), allowing us to
drop the extra call in xe_display_pm_runtime_suspend_late().

Add the call to intel_display_driver_pm_runtime_suspend_late(), which
starts calling intel_opregion_notify_adapter(). The
intel_hpd_poll_enable() call is also done here, postponed from the
previous location in xe_display_pm_runtime_suspend().

Add the call to intel_display_driver_pm_runtime_resume_early(), which
contains the intel_display_power_runtime_resume() and
intel_opregion_notify_adapter() counterparts found in
intel_display_power_runtime_suspend() and
intel_display_power_runtime_suspend_late(). (They are not symmetric.)

Finally, intel_display_driver_pm_runtime_resume() replaces the direct
calls to intel_hpd_init(), intel_hpd_poll_disable(), and
skl_watermark_ipc_update().

Signed-off-by: Jani Nikula <jani.nikula@intel.com>
---
 drivers/gpu/drm/xe/display/xe_display.c | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

diff --git a/drivers/gpu/drm/xe/display/xe_display.c b/drivers/gpu/drm/xe/display/xe_display.c
index 0fadc62e1cdd..cd7264d7dfe2 100644
--- a/drivers/gpu/drm/xe/display/xe_display.c
+++ b/drivers/gpu/drm/xe/display/xe_display.c
@@ -363,7 +363,7 @@ void xe_display_pm_runtime_suspend(struct xe_device *xe)
 		return;
 	}
 
-	intel_hpd_poll_enable(display);
+	intel_display_driver_pm_runtime_suspend(display);
 }
 
 void xe_display_pm_runtime_suspend_late(struct xe_device *xe)
@@ -379,12 +379,7 @@ void xe_display_pm_runtime_suspend_late(struct xe_device *xe)
 		return;
 	}
 
-	/*
-	 * If xe_display_pm_suspend_late() is not called, it is likely
-	 * that we will be on dynamic DC states with DMC wakelock enabled. We
-	 * need to flush the release work in that case.
-	 */
-	intel_dmc_wl_flush_release_work(display);
+	intel_display_driver_pm_runtime_suspend_late(display);
 }
 
 void xe_display_pm_runtime_resume(struct xe_device *xe)
@@ -399,9 +394,8 @@ void xe_display_pm_runtime_resume(struct xe_device *xe)
 		return;
 	}
 
-	intel_hpd_init(display);
-	intel_hpd_poll_disable(display);
-	skl_watermark_ipc_update(display);
+	intel_display_driver_pm_runtime_resume_early(display);
+	intel_display_driver_pm_runtime_resume(display);
 }
 
 
-- 
2.47.3

✓ CI.KUnit: success for drm/{i915, xe}: display (runtime) suspend/resume/shutdown unification

[Patchwork]

== Series Details ==

Series: drm/{i915, xe}: display (runtime) suspend/resume/shutdown unification
URL   : https://patchwork.freedesktop.org/series/167536/
State : success

== Summary ==

+ trap cleanup EXIT
+ /kernel/tools/testing/kunit/kunit.py run --kunitconfig /kernel/drivers/gpu/drm/xe/.kunitconfig
[11:12:21] Configuring KUnit Kernel ...
Generating .config ...
Populating config with:
$ make ARCH=um O=.kunit olddefconfig
[11:12:25] Building KUnit Kernel ...
Populating config with:
$ make ARCH=um O=.kunit olddefconfig
Building with:
$ make all compile_commands.json scripts_gdb ARCH=um O=.kunit --jobs=48
[11:12:56] Starting KUnit Kernel (1/1)...
[11:12:56] ============================================================
Running tests with:
$ .kunit/linux kunit.enable=1 mem=1G console=tty kunit_shutdown=halt
[11:12:57] ================== guc_buf (11 subtests) ===================
[11:12:57] [PASSED] test_smallest
[11:12:57] [PASSED] test_largest
[11:12:57] [PASSED] test_granular
[11:12:57] [PASSED] test_unique
[11:12:57] [PASSED] test_overlap
[11:12:57] [PASSED] test_reusable
[11:12:57] [PASSED] test_too_big
[11:12:57] [PASSED] test_flush
[11:12:57] [PASSED] test_lookup
[11:12:57] [PASSED] test_data
[11:12:57] [PASSED] test_class
[11:12:57] ===================== [PASSED] guc_buf =====================
[11:12:57] =================== guc_dbm (7 subtests) ===================
[11:12:57] [PASSED] test_empty
[11:12:57] [PASSED] test_default
[11:12:57] ======================== test_size  ========================
[11:12:57] [PASSED] 4
[11:12:57] [PASSED] 8
[11:12:57] [PASSED] 32
[11:12:57] [PASSED] 256
[11:12:57] ==================== [PASSED] test_size ====================
[11:12:57] ======================= test_reuse  ========================
[11:12:57] [PASSED] 4
[11:12:57] [PASSED] 8
[11:12:57] [PASSED] 32
[11:12:57] [PASSED] 256
[11:12:57] =================== [PASSED] test_reuse ====================
[11:12:57] =================== test_range_overlap  ====================
[11:12:57] [PASSED] 4
[11:12:57] [PASSED] 8
[11:12:57] [PASSED] 32
[11:12:57] [PASSED] 256
[11:12:57] =============== [PASSED] test_range_overlap ================
[11:12:57] =================== test_range_compact  ====================
[11:12:57] [PASSED] 4
[11:12:57] [PASSED] 8
[11:12:57] [PASSED] 32
[11:12:57] [PASSED] 256
[11:12:57] =============== [PASSED] test_range_compact ================
[11:12:57] ==================== test_range_spare  =====================
[11:12:57] [PASSED] 4
[11:12:57] [PASSED] 8
[11:12:57] [PASSED] 32
[11:12:57] [PASSED] 256
[11:12:57] ================ [PASSED] test_range_spare =================
[11:12:57] ===================== [PASSED] guc_dbm =====================
[11:12:57] =================== guc_idm (6 subtests) ===================
[11:12:57] [PASSED] bad_init
[11:12:57] [PASSED] no_init
[11:12:57] [PASSED] init_fini
[11:12:57] [PASSED] check_used
[11:12:57] [PASSED] check_quota
[11:12:57] [PASSED] check_all
[11:12:57] ===================== [PASSED] guc_idm =====================
[11:12:57] ================== no_relay (3 subtests) ===================
[11:12:57] [PASSED] xe_drops_guc2pf_if_not_ready
[11:12:57] [PASSED] xe_drops_guc2vf_if_not_ready
[11:12:57] [PASSED] xe_rejects_send_if_not_ready
[11:12:57] ==================== [PASSED] no_relay =====================
[11:12:57] ================== pf_relay (14 subtests) ==================
[11:12:57] [PASSED] pf_rejects_guc2pf_too_short
[11:12:57] [PASSED] pf_rejects_guc2pf_too_long
[11:12:57] [PASSED] pf_rejects_guc2pf_no_payload
[11:12:57] [PASSED] pf_fails_no_payload
[11:12:57] [PASSED] pf_fails_bad_origin
[11:12:57] [PASSED] pf_fails_bad_type
[11:12:57] [PASSED] pf_txn_reports_error
[11:12:57] [PASSED] pf_txn_sends_pf2guc
[11:12:57] [PASSED] pf_sends_pf2guc
[11:12:57] [SKIPPED] pf_loopback_nop
[11:12:57] [SKIPPED] pf_loopback_echo
[11:12:57] [SKIPPED] pf_loopback_fail
[11:12:57] [SKIPPED] pf_loopback_busy
[11:12:57] [SKIPPED] pf_loopback_retry
[11:12:57] ==================== [PASSED] pf_relay =====================
[11:12:57] ================== vf_relay (3 subtests) ===================
[11:12:57] [PASSED] vf_rejects_guc2vf_too_short
[11:12:57] [PASSED] vf_rejects_guc2vf_too_long
[11:12:57] [PASSED] vf_rejects_guc2vf_no_payload
[11:12:57] ==================== [PASSED] vf_relay =====================
[11:12:57] ================ pf_gt_config (9 subtests) =================
[11:12:57] [PASSED] fair_contexts_1vf
[11:12:57] [PASSED] fair_doorbells_1vf
[11:12:57] [PASSED] fair_ggtt_1vf
[11:12:57] ====================== fair_vram_1vf  ======================
[11:12:57] [PASSED] 3.50 GiB
[11:12:57] [PASSED] 11.5 GiB
[11:12:57] [PASSED] 15.5 GiB
[11:12:57] [PASSED] 31.5 GiB
[11:12:57] [PASSED] 63.5 GiB
[11:12:57] [PASSED] 1.91 GiB
[11:12:57] ================== [PASSED] fair_vram_1vf ==================
[11:12:57] ================ fair_vram_1vf_admin_only  =================
[11:12:57] [PASSED] 3.50 GiB
[11:12:57] [PASSED] 11.5 GiB
[11:12:57] [PASSED] 15.5 GiB
[11:12:57] [PASSED] 31.5 GiB
[11:12:57] [PASSED] 63.5 GiB
[11:12:57] [PASSED] 1.91 GiB
[11:12:57] ============ [PASSED] fair_vram_1vf_admin_only =============
[11:12:57] ====================== fair_contexts  ======================
[11:12:57] [PASSED] 1 VF
[11:12:57] [PASSED] 2 VFs
[11:12:57] [PASSED] 3 VFs
[11:12:57] [PASSED] 4 VFs
[11:12:57] [PASSED] 5 VFs
[11:12:57] [PASSED] 6 VFs
[11:12:57] [PASSED] 7 VFs
[11:12:57] [PASSED] 8 VFs
[11:12:57] [PASSED] 9 VFs
[11:12:57] [PASSED] 10 VFs
[11:12:57] [PASSED] 11 VFs
[11:12:57] [PASSED] 12 VFs
[11:12:57] [PASSED] 13 VFs
[11:12:57] [PASSED] 14 VFs
[11:12:57] [PASSED] 15 VFs
[11:12:57] [PASSED] 16 VFs
[11:12:57] [PASSED] 17 VFs
[11:12:57] [PASSED] 18 VFs
[11:12:57] [PASSED] 19 VFs
[11:12:57] [PASSED] 20 VFs
[11:12:57] [PASSED] 21 VFs
[11:12:57] [PASSED] 22 VFs
[11:12:57] [PASSED] 23 VFs
[11:12:57] [PASSED] 24 VFs
[11:12:57] [PASSED] 25 VFs
[11:12:57] [PASSED] 26 VFs
[11:12:57] [PASSED] 27 VFs
[11:12:57] [PASSED] 28 VFs
[11:12:57] [PASSED] 29 VFs
[11:12:57] [PASSED] 30 VFs
[11:12:57] [PASSED] 31 VFs
[11:12:57] [PASSED] 32 VFs
[11:12:57] [PASSED] 33 VFs
[11:12:57] [PASSED] 34 VFs
[11:12:57] [PASSED] 35 VFs
[11:12:57] [PASSED] 36 VFs
[11:12:57] [PASSED] 37 VFs
[11:12:57] [PASSED] 38 VFs
[11:12:57] [PASSED] 39 VFs
[11:12:57] [PASSED] 40 VFs
[11:12:57] [PASSED] 41 VFs
[11:12:57] [PASSED] 42 VFs
[11:12:57] [PASSED] 43 VFs
[11:12:57] [PASSED] 44 VFs
[11:12:57] [PASSED] 45 VFs
[11:12:57] [PASSED] 46 VFs
[11:12:57] [PASSED] 47 VFs
[11:12:57] [PASSED] 48 VFs
[11:12:57] [PASSED] 49 VFs
[11:12:57] [PASSED] 50 VFs
[11:12:57] [PASSED] 51 VFs
[11:12:57] [PASSED] 52 VFs
[11:12:57] [PASSED] 53 VFs
[11:12:57] [PASSED] 54 VFs
[11:12:57] [PASSED] 55 VFs
[11:12:57] [PASSED] 56 VFs
[11:12:57] [PASSED] 57 VFs
[11:12:57] [PASSED] 58 VFs
[11:12:57] [PASSED] 59 VFs
[11:12:57] [PASSED] 60 VFs
[11:12:57] [PASSED] 61 VFs
[11:12:57] [PASSED] 62 VFs
[11:12:57] [PASSED] 63 VFs
[11:12:57] ================== [PASSED] fair_contexts ==================
[11:12:57] ===================== fair_doorbells  ======================
[11:12:57] [PASSED] 1 VF
[11:12:57] [PASSED] 2 VFs
[11:12:57] [PASSED] 3 VFs
[11:12:57] [PASSED] 4 VFs
[11:12:57] [PASSED] 5 VFs
[11:12:57] [PASSED] 6 VFs
[11:12:57] [PASSED] 7 VFs
[11:12:57] [PASSED] 8 VFs
[11:12:57] [PASSED] 9 VFs
[11:12:57] [PASSED] 10 VFs
[11:12:57] [PASSED] 11 VFs
[11:12:57] [PASSED] 12 VFs
[11:12:57] [PASSED] 13 VFs
[11:12:57] [PASSED] 14 VFs
[11:12:57] [PASSED] 15 VFs
[11:12:57] [PASSED] 16 VFs
[11:12:57] [PASSED] 17 VFs
[11:12:57] [PASSED] 18 VFs
[11:12:57] [PASSED] 19 VFs
[11:12:57] [PASSED] 20 VFs
[11:12:57] [PASSED] 21 VFs
[11:12:57] [PASSED] 22 VFs
[11:12:57] [PASSED] 23 VFs
[11:12:57] [PASSED] 24 VFs
[11:12:57] [PASSED] 25 VFs
[11:12:57] [PASSED] 26 VFs
[11:12:57] [PASSED] 27 VFs
[11:12:57] [PASSED] 28 VFs
[11:12:57] [PASSED] 29 VFs
[11:12:57] [PASSED] 30 VFs
[11:12:57] [PASSED] 31 VFs
[11:12:57] [PASSED] 32 VFs
[11:12:57] [PASSED] 33 VFs
[11:12:57] [PASSED] 34 VFs
[11:12:57] [PASSED] 35 VFs
[11:12:57] [PASSED] 36 VFs
[11:12:57] [PASSED] 37 VFs
[11:12:57] [PASSED] 38 VFs
[11:12:57] [PASSED] 39 VFs
[11:12:57] [PASSED] 40 VFs
[11:12:57] [PASSED] 41 VFs
[11:12:57] [PASSED] 42 VFs
[11:12:57] [PASSED] 43 VFs
[11:12:57] [PASSED] 44 VFs
[11:12:57] [PASSED] 45 VFs
[11:12:57] [PASSED] 46 VFs
[11:12:57] [PASSED] 47 VFs
[11:12:57] [PASSED] 48 VFs
[11:12:57] [PASSED] 49 VFs
[11:12:57] [PASSED] 50 VFs
[11:12:57] [PASSED] 51 VFs
[11:12:57] [PASSED] 52 VFs
[11:12:57] [PASSED] 53 VFs
[11:12:57] [PASSED] 54 VFs
[11:12:57] [PASSED] 55 VFs
[11:12:57] [PASSED] 56 VFs
[11:12:57] [PASSED] 57 VFs
[11:12:57] [PASSED] 58 VFs
[11:12:57] [PASSED] 59 VFs
[11:12:57] [PASSED] 60 VFs
[11:12:57] [PASSED] 61 VFs
[11:12:57] [PASSED] 62 VFs
[11:12:57] [PASSED] 63 VFs
[11:12:57] ================= [PASSED] fair_doorbells ==================
[11:12:57] ======================== fair_ggtt  ========================
[11:12:57] [PASSED] 1 VF
[11:12:57] [PASSED] 2 VFs
[11:12:57] [PASSED] 3 VFs
[11:12:57] [PASSED] 4 VFs
[11:12:57] [PASSED] 5 VFs
[11:12:57] [PASSED] 6 VFs
[11:12:57] [PASSED] 7 VFs
[11:12:57] [PASSED] 8 VFs
[11:12:57] [PASSED] 9 VFs
[11:12:57] [PASSED] 10 VFs
[11:12:57] [PASSED] 11 VFs
[11:12:57] [PASSED] 12 VFs
[11:12:57] [PASSED] 13 VFs
[11:12:57] [PASSED] 14 VFs
[11:12:57] [PASSED] 15 VFs
[11:12:57] [PASSED] 16 VFs
[11:12:57] [PASSED] 17 VFs
[11:12:57] [PASSED] 18 VFs
[11:12:57] [PASSED] 19 VFs
[11:12:57] [PASSED] 20 VFs
[11:12:57] [PASSED] 21 VFs
[11:12:57] [PASSED] 22 VFs
[11:12:57] [PASSED] 23 VFs
[11:12:57] [PASSED] 24 VFs
[11:12:57] [PASSED] 25 VFs
[11:12:57] [PASSED] 26 VFs
[11:12:57] [PASSED] 27 VFs
[11:12:57] [PASSED] 28 VFs
[11:12:57] [PASSED] 29 VFs
[11:12:57] [PASSED] 30 VFs
[11:12:57] [PASSED] 31 VFs
[11:12:57] [PASSED] 32 VFs
[11:12:57] [PASSED] 33 VFs
[11:12:57] [PASSED] 34 VFs
[11:12:57] [PASSED] 35 VFs
[11:12:57] [PASSED] 36 VFs
[11:12:57] [PASSED] 37 VFs
[11:12:57] [PASSED] 38 VFs
[11:12:57] [PASSED] 39 VFs
[11:12:57] [PASSED] 40 VFs
[11:12:57] [PASSED] 41 VFs
[11:12:57] [PASSED] 42 VFs
[11:12:57] [PASSED] 43 VFs
[11:12:57] [PASSED] 44 VFs
[11:12:57] [PASSED] 45 VFs
[11:12:57] [PASSED] 46 VFs
[11:12:57] [PASSED] 47 VFs
[11:12:57] [PASSED] 48 VFs
[11:12:57] [PASSED] 49 VFs
[11:12:57] [PASSED] 50 VFs
[11:12:57] [PASSED] 51 VFs
[11:12:57] [PASSED] 52 VFs
[11:12:57] [PASSED] 53 VFs
[11:12:57] [PASSED] 54 VFs
[11:12:57] [PASSED] 55 VFs
[11:12:57] [PASSED] 56 VFs
[11:12:57] [PASSED] 57 VFs
[11:12:57] [PASSED] 58 VFs
[11:12:57] [PASSED] 59 VFs
[11:12:57] [PASSED] 60 VFs
[11:12:57] [PASSED] 61 VFs
[11:12:57] [PASSED] 62 VFs
[11:12:57] [PASSED] 63 VFs
[11:12:57] ==================== [PASSED] fair_ggtt ====================
[11:12:57] ======================== fair_vram  ========================
[11:12:57] [PASSED] 1 VF
[11:12:57] [PASSED] 2 VFs
[11:12:57] [PASSED] 3 VFs
[11:12:57] [PASSED] 4 VFs
[11:12:57] [PASSED] 5 VFs
[11:12:57] [PASSED] 6 VFs
[11:12:57] [PASSED] 7 VFs
[11:12:57] [PASSED] 8 VFs
[11:12:57] [PASSED] 9 VFs
[11:12:57] [PASSED] 10 VFs
[11:12:57] [PASSED] 11 VFs
[11:12:57] [PASSED] 12 VFs
[11:12:57] [PASSED] 13 VFs
[11:12:57] [PASSED] 14 VFs
[11:12:57] [PASSED] 15 VFs
[11:12:57] [PASSED] 16 VFs
[11:12:57] [PASSED] 17 VFs
[11:12:57] [PASSED] 18 VFs
[11:12:57] [PASSED] 19 VFs
[11:12:57] [PASSED] 20 VFs
[11:12:57] [PASSED] 21 VFs
[11:12:57] [PASSED] 22 VFs
[11:12:57] [PASSED] 23 VFs
[11:12:57] [PASSED] 24 VFs
[11:12:57] [PASSED] 25 VFs
[11:12:57] [PASSED] 26 VFs
[11:12:57] [PASSED] 27 VFs
[11:12:57] [PASSED] 28 VFs
[11:12:57] [PASSED] 29 VFs
[11:12:57] [PASSED] 30 VFs
[11:12:57] [PASSED] 31 VFs
[11:12:57] [PASSED] 32 VFs
[11:12:57] [PASSED] 33 VFs
[11:12:57] [PASSED] 34 VFs
[11:12:57] [PASSED] 35 VFs
[11:12:57] [PASSED] 36 VFs
[11:12:57] [PASSED] 37 VFs
[11:12:57] [PASSED] 38 VFs
[11:12:57] [PASSED] 39 VFs
[11:12:57] [PASSED] 40 VFs
[11:12:57] [PASSED] 41 VFs
[11:12:57] [PASSED] 42 VFs
[11:12:57] [PASSED] 43 VFs
[11:12:57] [PASSED] 44 VFs
[11:12:57] [PASSED] 45 VFs
[11:12:57] [PASSED] 46 VFs
[11:12:57] [PASSED] 47 VFs
[11:12:57] [PASSED] 48 VFs
[11:12:57] [PASSED] 49 VFs
[11:12:57] [PASSED] 50 VFs
[11:12:57] [PASSED] 51 VFs
[11:12:57] [PASSED] 52 VFs
[11:12:57] [PASSED] 53 VFs
[11:12:57] [PASSED] 54 VFs
[11:12:57] [PASSED] 55 VFs
[11:12:57] [PASSED] 56 VFs
[11:12:57] [PASSED] 57 VFs
[11:12:57] [PASSED] 58 VFs
[11:12:57] [PASSED] 59 VFs
[11:12:57] [PASSED] 60 VFs
[11:12:57] [PASSED] 61 VFs
[11:12:57] [PASSED] 62 VFs
[11:12:57] [PASSED] 63 VFs
[11:12:57] ==================== [PASSED] fair_vram ====================
[11:12:57] ================== [PASSED] pf_gt_config ===================
[11:12:57] ===================== lmtt (1 subtest) =====================
[11:12:57] ======================== test_ops  =========================
[11:12:57] [PASSED] 2-level
[11:12:57] [PASSED] multi-level
[11:12:57] ==================== [PASSED] test_ops =====================
[11:12:57] ====================== [PASSED] lmtt =======================
[11:12:57] ================= pf_service (11 subtests) =================
[11:12:57] [PASSED] pf_negotiate_any
[11:12:57] [PASSED] pf_negotiate_base_match
[11:12:57] [PASSED] pf_negotiate_base_newer
[11:12:57] [PASSED] pf_negotiate_base_next
[11:12:57] [SKIPPED] pf_negotiate_base_older
[11:12:57] [PASSED] pf_negotiate_base_prev
[11:12:57] [PASSED] pf_negotiate_latest_match
[11:12:57] [PASSED] pf_negotiate_latest_newer
[11:12:57] [PASSED] pf_negotiate_latest_next
[11:12:57] [SKIPPED] pf_negotiate_latest_older
[11:12:57] [SKIPPED] pf_negotiate_latest_prev
[11:12:57] =================== [PASSED] pf_service ====================
[11:12:57] ================= xe_guc_g2g (2 subtests) ==================
[11:12:57] ============== xe_live_guc_g2g_kunit_default  ==============
[11:12:57] ========= [SKIPPED] xe_live_guc_g2g_kunit_default ==========
[11:12:57] ============== xe_live_guc_g2g_kunit_allmem  ===============
[11:12:57] ========== [SKIPPED] xe_live_guc_g2g_kunit_allmem ==========
[11:12:57] =================== [SKIPPED] xe_guc_g2g ===================
[11:12:57] =================== xe_mocs (2 subtests) ===================
[11:12:57] ================ xe_live_mocs_kernel_kunit  ================
[11:12:57] =========== [SKIPPED] xe_live_mocs_kernel_kunit ============
[11:12:57] ================ xe_live_mocs_reset_kunit  =================
[11:12:57] ============ [SKIPPED] xe_live_mocs_reset_kunit ============
[11:12:57] ==================== [SKIPPED] xe_mocs =====================
[11:12:57] ================= xe_migrate (2 subtests) ==================
[11:12:57] ================= xe_migrate_sanity_kunit  =================
[11:12:57] ============ [SKIPPED] xe_migrate_sanity_kunit =============
[11:12:57] ================== xe_validate_ccs_kunit  ==================
[11:12:57] ============= [SKIPPED] xe_validate_ccs_kunit ==============
[11:12:57] =================== [SKIPPED] xe_migrate ===================
[11:12:57] ================== xe_dma_buf (1 subtest) ==================
[11:12:57] ==================== xe_dma_buf_kunit  =====================
[11:12:57] ================ [SKIPPED] xe_dma_buf_kunit ================
[11:12:57] =================== [SKIPPED] xe_dma_buf ===================
[11:12:57] ================= xe_bo_shrink (1 subtest) =================
[11:12:57] =================== xe_bo_shrink_kunit  ====================
[11:12:57] =============== [SKIPPED] xe_bo_shrink_kunit ===============
[11:12:57] ================== [SKIPPED] xe_bo_shrink ==================
[11:12:57] ==================== xe_bo (2 subtests) ====================
[11:12:57] ================== xe_ccs_migrate_kunit  ===================
[11:12:57] ============== [SKIPPED] xe_ccs_migrate_kunit ==============
[11:12:57] ==================== xe_bo_evict_kunit  ====================
[11:12:57] =============== [SKIPPED] xe_bo_evict_kunit ================
[11:12:57] ===================== [SKIPPED] xe_bo ======================
[11:12:57] ==================== args (13 subtests) ====================
[11:12:57] [PASSED] count_args_test
[11:12:57] [PASSED] call_args_example
[11:12:57] [PASSED] call_args_test
[11:12:57] [PASSED] drop_first_arg_example
[11:12:57] [PASSED] drop_first_arg_test
[11:12:57] [PASSED] first_arg_example
[11:12:57] [PASSED] first_arg_test
[11:12:57] [PASSED] last_arg_example
[11:12:57] [PASSED] last_arg_test
[11:12:57] [PASSED] pick_arg_example
[11:12:57] [PASSED] if_args_example
[11:12:57] [PASSED] if_args_test
[11:12:57] [PASSED] sep_comma_example
[11:12:57] ====================== [PASSED] args =======================
[11:12:57] =================== xe_pci (3 subtests) ====================
[11:12:57] ==================== check_graphics_ip  ====================
[11:12:57] [PASSED] 12.00 Xe_LP
[11:12:57] [PASSED] 12.10 Xe_LP+
[11:12:57] [PASSED] 12.55 Xe_HPG
[11:12:57] [PASSED] 12.60 Xe_HPC
[11:12:57] [PASSED] 12.70 Xe_LPG
[11:12:57] [PASSED] 12.71 Xe_LPG
[11:12:57] [PASSED] 12.74 Xe_LPG+
[11:12:57] [PASSED] 20.01 Xe2_HPG
[11:12:57] [PASSED] 20.02 Xe2_HPG
[11:12:57] [PASSED] 20.04 Xe2_LPG
[11:12:57] [PASSED] 30.00 Xe3_LPG
[11:12:57] [PASSED] 30.01 Xe3_LPG
[11:12:57] [PASSED] 30.03 Xe3_LPG
[11:12:57] [PASSED] 30.04 Xe3_LPG
[11:12:57] [PASSED] 30.05 Xe3_LPG
[11:12:57] [PASSED] 35.10 Xe3p_LPG
[11:12:57] [PASSED] 35.11 Xe3p_XPC
[11:12:57] ================ [PASSED] check_graphics_ip ================
[11:12:57] ===================== check_media_ip  ======================
[11:12:57] [PASSED] 12.00 Xe_M
[11:12:57] [PASSED] 12.55 Xe_HPM
[11:12:57] [PASSED] 13.00 Xe_LPM+
[11:12:57] [PASSED] 13.01 Xe2_HPM
[11:12:57] [PASSED] 20.00 Xe2_LPM
[11:12:57] [PASSED] 30.00 Xe3_LPM
[11:12:57] [PASSED] 30.02 Xe3_LPM
[11:12:57] [PASSED] 35.00 Xe3p_LPM
[11:12:57] [PASSED] 35.03 Xe3p_HPM
[11:12:57] ================= [PASSED] check_media_ip ==================
[11:12:57] =================== check_platform_desc  ===================
[11:12:57] [PASSED] 0x9A60 (TIGERLAKE)
[11:12:57] [PASSED] 0x9A68 (TIGERLAKE)
[11:12:57] [PASSED] 0x9A70 (TIGERLAKE)
[11:12:57] [PASSED] 0x9A40 (TIGERLAKE)
[11:12:57] [PASSED] 0x9A49 (TIGERLAKE)
[11:12:57] [PASSED] 0x9A59 (TIGERLAKE)
[11:12:57] [PASSED] 0x9A78 (TIGERLAKE)
[11:12:57] [PASSED] 0x9AC0 (TIGERLAKE)
[11:12:57] [PASSED] 0x9AC9 (TIGERLAKE)
[11:12:57] [PASSED] 0x9AD9 (TIGERLAKE)
[11:12:57] [PASSED] 0x9AF8 (TIGERLAKE)
[11:12:57] [PASSED] 0x4C80 (ROCKETLAKE)
[11:12:57] [PASSED] 0x4C8A (ROCKETLAKE)
[11:12:57] [PASSED] 0x4C8B (ROCKETLAKE)
[11:12:57] [PASSED] 0x4C8C (ROCKETLAKE)
[11:12:57] [PASSED] 0x4C90 (ROCKETLAKE)
[11:12:57] [PASSED] 0x4C9A (ROCKETLAKE)
[11:12:57] [PASSED] 0x4680 (ALDERLAKE_S)
[11:12:57] [PASSED] 0x4682 (ALDERLAKE_S)
[11:12:57] [PASSED] 0x4688 (ALDERLAKE_S)
[11:12:57] [PASSED] 0x468A (ALDERLAKE_S)
[11:12:57] [PASSED] 0x468B (ALDERLAKE_S)
[11:12:57] [PASSED] 0x4690 (ALDERLAKE_S)
[11:12:57] [PASSED] 0x4692 (ALDERLAKE_S)
[11:12:57] [PASSED] 0x4693 (ALDERLAKE_S)
[11:12:57] [PASSED] 0x46A0 (ALDERLAKE_P)
[11:12:57] [PASSED] 0x46A1 (ALDERLAKE_P)
[11:12:57] [PASSED] 0x46A2 (ALDERLAKE_P)
[11:12:57] [PASSED] 0x46A3 (ALDERLAKE_P)
[11:12:57] [PASSED] 0x46A6 (ALDERLAKE_P)
[11:12:57] [PASSED] 0x46A8 (ALDERLAKE_P)
[11:12:57] [PASSED] 0x46AA (ALDERLAKE_P)
[11:12:57] [PASSED] 0x462A (ALDERLAKE_P)
[11:12:57] [PASSED] 0x4626 (ALDERLAKE_P)
[11:12:57] [PASSED] 0x4628 (ALDERLAKE_P)
[11:12:57] [PASSED] 0x46B0 (ALDERLAKE_P)
[11:12:57] [PASSED] 0x46B1 (ALDERLAKE_P)
[11:12:57] [PASSED] 0x46B2 (ALDERLAKE_P)
[11:12:57] [PASSED] 0x46B3 (ALDERLAKE_P)
[11:12:57] [PASSED] 0x46C0 (ALDERLAKE_P)
[11:12:57] [PASSED] 0x46C1 (ALDERLAKE_P)
[11:12:57] [PASSED] 0x46C2 (ALDERLAKE_P)
[11:12:57] [PASSED] 0x46C3 (ALDERLAKE_P)
[11:12:57] [PASSED] 0x46D0 (ALDERLAKE_N)
[11:12:57] [PASSED] 0x46D1 (ALDERLAKE_N)
[11:12:57] [PASSED] 0x46D2 (ALDERLAKE_N)
[11:12:57] [PASSED] 0x46D3 (ALDERLAKE_N)
[11:12:57] [PASSED] 0x46D4 (ALDERLAKE_N)
[11:12:57] [PASSED] 0xA721 (ALDERLAKE_P)
[11:12:57] [PASSED] 0xA7A1 (ALDERLAKE_P)
[11:12:57] [PASSED] 0xA7A9 (ALDERLAKE_P)
[11:12:57] [PASSED] 0xA7AC (ALDERLAKE_P)
[11:12:57] [PASSED] 0xA7AD (ALDERLAKE_P)
[11:12:57] [PASSED] 0xA720 (ALDERLAKE_P)
[11:12:57] [PASSED] 0xA7A0 (ALDERLAKE_P)
[11:12:57] [PASSED] 0xA7A8 (ALDERLAKE_P)
[11:12:57] [PASSED] 0xA7AA (ALDERLAKE_P)
[11:12:57] [PASSED] 0xA7AB (ALDERLAKE_P)
[11:12:57] [PASSED] 0xA780 (ALDERLAKE_S)
[11:12:57] [PASSED] 0xA781 (ALDERLAKE_S)
[11:12:57] [PASSED] 0xA782 (ALDERLAKE_S)
[11:12:57] [PASSED] 0xA783 (ALDERLAKE_S)
[11:12:57] [PASSED] 0xA788 (ALDERLAKE_S)
[11:12:57] [PASSED] 0xA789 (ALDERLAKE_S)
[11:12:57] [PASSED] 0xA78A (ALDERLAKE_S)
[11:12:57] [PASSED] 0xA78B (ALDERLAKE_S)
[11:12:57] [PASSED] 0x4905 (DG1)
[11:12:57] [PASSED] 0x4906 (DG1)
[11:12:57] [PASSED] 0x4907 (DG1)
[11:12:57] [PASSED] 0x4908 (DG1)
[11:12:57] [PASSED] 0x4909 (DG1)
[11:12:57] [PASSED] 0x56C0 (DG2)
[11:12:57] [PASSED] 0x56C2 (DG2)
[11:12:57] [PASSED] 0x56C1 (DG2)
[11:12:57] [PASSED] 0x7D51 (METEORLAKE)
[11:12:57] [PASSED] 0x7DD1 (METEORLAKE)
[11:12:57] [PASSED] 0x7D41 (METEORLAKE)
[11:12:57] [PASSED] 0x7D67 (METEORLAKE)
[11:12:57] [PASSED] 0xB640 (METEORLAKE)
[11:12:57] [PASSED] 0x56A0 (DG2)
[11:12:57] [PASSED] 0x56A1 (DG2)
[11:12:57] [PASSED] 0x56A2 (DG2)
[11:12:57] [PASSED] 0x56BE (DG2)
[11:12:57] [PASSED] 0x56BF (DG2)
[11:12:57] [PASSED] 0x5690 (DG2)
[11:12:57] [PASSED] 0x5691 (DG2)
[11:12:57] [PASSED] 0x5692 (DG2)
[11:12:57] [PASSED] 0x56A5 (DG2)
[11:12:57] [PASSED] 0x56A6 (DG2)
[11:12:57] [PASSED] 0x56B0 (DG2)
[11:12:57] [PASSED] 0x56B1 (DG2)
[11:12:57] [PASSED] 0x56BA (DG2)
[11:12:57] [PASSED] 0x56BB (DG2)
[11:12:57] [PASSED] 0x56BC (DG2)
[11:12:57] [PASSED] 0x56BD (DG2)
[11:12:57] [PASSED] 0x5693 (DG2)
[11:12:57] [PASSED] 0x5694 (DG2)
[11:12:57] [PASSED] 0x5695 (DG2)
[11:12:57] [PASSED] 0x56A3 (DG2)
[11:12:57] [PASSED] 0x56A4 (DG2)
[11:12:57] [PASSED] 0x56B2 (DG2)
[11:12:57] [PASSED] 0x56B3 (DG2)
[11:12:57] [PASSED] 0x5696 (DG2)
[11:12:57] [PASSED] 0x5697 (DG2)
[11:12:57] [PASSED] 0xB69 (PVC)
[11:12:57] [PASSED] 0xB6E (PVC)
[11:12:57] [PASSED] 0xBD4 (PVC)
[11:12:57] [PASSED] 0xBD5 (PVC)
[11:12:57] [PASSED] 0xBD6 (PVC)
[11:12:57] [PASSED] 0xBD7 (PVC)
[11:12:57] [PASSED] 0xBD8 (PVC)
[11:12:57] [PASSED] 0xBD9 (PVC)
[11:12:57] [PASSED] 0xBDA (PVC)
[11:12:57] [PASSED] 0xBDB (PVC)
[11:12:57] [PASSED] 0xBE0 (PVC)
[11:12:57] [PASSED] 0xBE1 (PVC)
[11:12:57] [PASSED] 0xBE5 (PVC)
[11:12:57] [PASSED] 0x7D40 (METEORLAKE)
[11:12:57] [PASSED] 0x7D45 (METEORLAKE)
[11:12:57] [PASSED] 0x7D55 (METEORLAKE)
[11:12:57] [PASSED] 0x7D60 (METEORLAKE)
[11:12:57] [PASSED] 0x7DD5 (METEORLAKE)
[11:12:57] [PASSED] 0x6420 (LUNARLAKE)
[11:12:57] [PASSED] 0x64A0 (LUNARLAKE)
[11:12:57] [PASSED] 0x64B0 (LUNARLAKE)
[11:12:57] [PASSED] 0xE202 (BATTLEMAGE)
[11:12:57] [PASSED] 0xE209 (BATTLEMAGE)
[11:12:57] [PASSED] 0xE20B (BATTLEMAGE)
[11:12:57] [PASSED] 0xE20C (BATTLEMAGE)
[11:12:57] [PASSED] 0xE20D (BATTLEMAGE)
[11:12:57] [PASSED] 0xE210 (BATTLEMAGE)
[11:12:57] [PASSED] 0xE211 (BATTLEMAGE)
[11:12:57] [PASSED] 0xE212 (BATTLEMAGE)
[11:12:57] [PASSED] 0xE216 (BATTLEMAGE)
[11:12:57] [PASSED] 0xE220 (BATTLEMAGE)
[11:12:57] [PASSED] 0xE221 (BATTLEMAGE)
[11:12:57] [PASSED] 0xE222 (BATTLEMAGE)
[11:12:57] [PASSED] 0xE223 (BATTLEMAGE)
[11:12:57] [PASSED] 0xB080 (PANTHERLAKE)
[11:12:57] [PASSED] 0xB081 (PANTHERLAKE)
[11:12:57] [PASSED] 0xB082 (PANTHERLAKE)
[11:12:57] [PASSED] 0xB083 (PANTHERLAKE)
[11:12:57] [PASSED] 0xB084 (PANTHERLAKE)
[11:12:57] [PASSED] 0xB085 (PANTHERLAKE)
[11:12:57] [PASSED] 0xB086 (PANTHERLAKE)
[11:12:57] [PASSED] 0xB087 (PANTHERLAKE)
[11:12:57] [PASSED] 0xB08F (PANTHERLAKE)
[11:12:57] [PASSED] 0xB090 (PANTHERLAKE)
[11:12:57] [PASSED] 0xB0A0 (PANTHERLAKE)
[11:12:57] [PASSED] 0xB0B0 (PANTHERLAKE)
[11:12:57] [PASSED] 0xFD80 (PANTHERLAKE)
[11:12:57] [PASSED] 0xFD81 (PANTHERLAKE)
[11:12:57] [PASSED] 0xD740 (NOVALAKE_S)
[11:12:57] [PASSED] 0xD741 (NOVALAKE_S)
[11:12:57] [PASSED] 0xD742 (NOVALAKE_S)
[11:12:57] [PASSED] 0xD743 (NOVALAKE_S)
[11:12:57] [PASSED] 0xD744 (NOVALAKE_S)
[11:12:57] [PASSED] 0xD745 (NOVALAKE_S)
[11:12:57] [PASSED] 0x674C (CRESCENTISLAND)
[11:12:57] [PASSED] 0x674D (CRESCENTISLAND)
[11:12:57] [PASSED] 0x674E (CRESCENTISLAND)
[11:12:57] [PASSED] 0x674F (CRESCENTISLAND)
[11:12:57] [PASSED] 0x6750 (CRESCENTISLAND)
[11:12:57] [PASSED] 0xD750 (NOVALAKE_P)
[11:12:57] [PASSED] 0xD751 (NOVALAKE_P)
[11:12:57] [PASSED] 0xD752 (NOVALAKE_P)
[11:12:57] [PASSED] 0xD753 (NOVALAKE_P)
[11:12:57] [PASSED] 0xD754 (NOVALAKE_P)
[11:12:57] [PASSED] 0xD755 (NOVALAKE_P)
[11:12:57] [PASSED] 0xD756 (NOVALAKE_P)
[11:12:57] [PASSED] 0xD757 (NOVALAKE_P)
[11:12:57] [PASSED] 0xD75F (NOVALAKE_P)
[11:12:57] =============== [PASSED] check_platform_desc ===============
[11:12:57] ===================== [PASSED] xe_pci ======================
[11:12:57] =================== xe_rtp (3 subtests) ====================
[11:12:57] =================== xe_rtp_rules_tests  ====================
[11:12:57] [PASSED] no
[11:12:57] [PASSED] yes
[11:12:57] [PASSED] no-and-no
[11:12:57] [PASSED] no-and-yes
[11:12:57] [PASSED] yes-and-no
[11:12:57] [PASSED] yes-and-yes
[11:12:57] [PASSED] no-or-no
[11:12:57] [PASSED] no-or-yes
[11:12:57] [PASSED] yes-or-no
[11:12:57] [PASSED] yes-or-yes
[11:12:57] [PASSED] no-yes-or-yes-no
[11:12:57] [PASSED] no-yes-or-yes-yes
[11:12:57] [PASSED] yes-yes-or-no-yes
[11:12:57] [PASSED] yes-yes-or-yes-yes
[11:12:57] [PASSED] no-no-or-yes-or-no
[11:12:57] [PASSED] or
[11:12:57] [PASSED] or-yes
[11:12:57] [PASSED] or-no
[11:12:57] [PASSED] yes-or
[11:12:57] [PASSED] no-or
[11:12:57] [PASSED] no-or-or-yes
[11:12:57] [PASSED] yes-or-or-no
[11:12:57] [PASSED] no-or-or-no
[11:12:57] [PASSED] missing-context-engine-class
[11:12:57] [PASSED] missing-context-engine-class-or-yes
[11:12:57] [PASSED] missing-context-engine-class-or-or-yes
[11:12:57] =============== [PASSED] xe_rtp_rules_tests ================
[11:12:57] =============== xe_rtp_process_to_sr_tests  ================
[11:12:57] [PASSED] coalesce-same-reg
[11:12:57] [PASSED] no-match-no-add
[11:12:57] [PASSED] two-regs-two-entries
[11:12:57] [PASSED] clr-one-set-other
[11:12:57] [PASSED] set-field
[11:12:57] [PASSED] conflict-duplicate
[11:12:57] [PASSED] conflict-not-disjoint
[11:12:57] [PASSED] conflict-reg-type
[11:12:57] [PASSED] bad-mcr-reg-forced-to-regular
[11:12:57] [PASSED] bad-regular-reg-forced-to-mcr
[11:12:57] =========== [PASSED] xe_rtp_process_to_sr_tests ============
[11:12:57] ================== xe_rtp_process_tests  ===================
[11:12:57] [PASSED] active1
[11:12:57] [PASSED] active2
[11:12:57] [PASSED] active-inactive
[11:12:57] [PASSED] inactive-active
[11:12:57] [PASSED] inactive-active-inactive
[11:12:57] [PASSED] inactive-inactive-inactive
[11:12:57] ============== [PASSED] xe_rtp_process_tests ===============
[11:12:57] ===================== [PASSED] xe_rtp ======================
[11:12:57] ==================== xe_wa (1 subtest) =====================
[11:12:57] ======================== xe_wa_gt  =========================
[11:12:57] [PASSED] TIGERLAKE B0
[11:12:57] [PASSED] DG1 A0
[11:12:57] [PASSED] DG1 B0
[11:12:57] [PASSED] ALDERLAKE_S A0
[11:12:57] [PASSED] ALDERLAKE_S B0
[11:12:57] [PASSED] ALDERLAKE_S C0
[11:12:57] [PASSED] ALDERLAKE_S D0
[11:12:57] [PASSED] ALDERLAKE_P A0
[11:12:57] [PASSED] ALDERLAKE_P B0
[11:12:57] [PASSED] ALDERLAKE_P C0
[11:12:57] [PASSED] ALDERLAKE_S RPLS D0
[11:12:57] [PASSED] ALDERLAKE_P RPLU E0
[11:12:57] [PASSED] DG2 G10 C0
[11:12:57] [PASSED] DG2 G11 B1
[11:12:57] [PASSED] DG2 G12 A1
[11:12:57] [PASSED] METEORLAKE 12.70(Xe_LPG) A0 13.00(Xe_LPM+) A0
[11:12:57] [PASSED] METEORLAKE 12.71(Xe_LPG) A0 13.00(Xe_LPM+) A0
[11:12:57] [PASSED] METEORLAKE 12.74(Xe_LPG+) A0 13.00(Xe_LPM+) A0
[11:12:57] [PASSED] LUNARLAKE 20.04(Xe2_LPG) A0 20.00(Xe2_LPM) A0
[11:12:57] [PASSED] LUNARLAKE 20.04(Xe2_LPG) B0 20.00(Xe2_LPM) A0
[11:12:57] [PASSED] BATTLEMAGE 20.01(Xe2_HPG) A0 13.01(Xe2_HPM) A1
[11:12:57] [PASSED] PANTHERLAKE 30.00(Xe3_LPG) A0 30.00(Xe3_LPM) A0
[11:12:57] ==================== [PASSED] xe_wa_gt =====================
[11:12:57] ====================== [PASSED] xe_wa ======================
[11:12:57] ============================================================
[11:12:57] Testing complete. Ran 624 tests: passed: 606, skipped: 18
[11:12:57] Elapsed time: 36.153s total, 4.302s configuring, 31.186s building, 0.635s running

+ /kernel/tools/testing/kunit/kunit.py run --kunitconfig /kernel/drivers/gpu/drm/tests/.kunitconfig
[11:12:57] Configuring KUnit Kernel ...
Regenerating .config ...
Populating config with:
$ make ARCH=um O=.kunit olddefconfig
[11:12:59] Building KUnit Kernel ...
Populating config with:
$ make ARCH=um O=.kunit olddefconfig
Building with:
$ make all compile_commands.json scripts_gdb ARCH=um O=.kunit --jobs=48
[11:13:23] Starting KUnit Kernel (1/1)...
[11:13:23] ============================================================
Running tests with:
$ .kunit/linux kunit.enable=1 mem=1G console=tty kunit_shutdown=halt
[11:13:23] ============ drm_test_pick_cmdline (2 subtests) ============
[11:13:23] [PASSED] drm_test_pick_cmdline_res_1920_1080_60
[11:13:23] =============== drm_test_pick_cmdline_named  ===============
[11:13:23] [PASSED] NTSC
[11:13:23] [PASSED] NTSC-J
[11:13:23] [PASSED] PAL
[11:13:23] [PASSED] PAL-M
[11:13:23] =========== [PASSED] drm_test_pick_cmdline_named ===========
[11:13:23] ============== [PASSED] drm_test_pick_cmdline ==============
[11:13:23] == drm_test_atomic_get_connector_for_encoder (1 subtest) ===
[11:13:23] [PASSED] drm_test_drm_atomic_get_connector_for_encoder
[11:13:23] ==== [PASSED] drm_test_atomic_get_connector_for_encoder ====
[11:13:23] =========== drm_validate_clone_mode (2 subtests) ===========
[11:13:23] ============== drm_test_check_in_clone_mode  ===============
[11:13:23] [PASSED] in_clone_mode
[11:13:23] [PASSED] not_in_clone_mode
[11:13:23] ========== [PASSED] drm_test_check_in_clone_mode ===========
[11:13:23] =============== drm_test_check_valid_clones  ===============
[11:13:23] [PASSED] not_in_clone_mode
[11:13:23] [PASSED] valid_clone
[11:13:23] [PASSED] invalid_clone
[11:13:23] =========== [PASSED] drm_test_check_valid_clones ===========
[11:13:23] ============= [PASSED] drm_validate_clone_mode =============
[11:13:23] ============= drm_validate_modeset (1 subtest) =============
[11:13:23] [PASSED] drm_test_check_connector_changed_modeset
[11:13:23] ============== [PASSED] drm_validate_modeset ===============
[11:13:23] ====== drm_test_bridge_get_current_state (2 subtests) ======
[11:13:23] [PASSED] drm_test_drm_bridge_get_current_state_atomic
[11:13:23] [PASSED] drm_test_drm_bridge_get_current_state_legacy
[11:13:23] ======== [PASSED] drm_test_bridge_get_current_state ========
[11:13:23] ====== drm_test_bridge_helper_reset_crtc (3 subtests) ======
[11:13:23] [PASSED] drm_test_drm_bridge_helper_reset_crtc_atomic
[11:13:23] [PASSED] drm_test_drm_bridge_helper_reset_crtc_atomic_disabled
[11:13:23] [PASSED] drm_test_drm_bridge_helper_reset_crtc_legacy
[11:13:23] ======== [PASSED] drm_test_bridge_helper_reset_crtc ========
[11:13:23] ============== drm_bridge_alloc (2 subtests) ===============
[11:13:23] [PASSED] drm_test_drm_bridge_alloc_basic
[11:13:23] [PASSED] drm_test_drm_bridge_alloc_get_put
[11:13:23] ================ [PASSED] drm_bridge_alloc =================
[11:13:23] ============= drm_cmdline_parser (40 subtests) =============
[11:13:23] [PASSED] drm_test_cmdline_force_d_only
[11:13:23] [PASSED] drm_test_cmdline_force_D_only_dvi
[11:13:23] [PASSED] drm_test_cmdline_force_D_only_hdmi
[11:13:23] [PASSED] drm_test_cmdline_force_D_only_not_digital
[11:13:23] [PASSED] drm_test_cmdline_force_e_only
[11:13:23] [PASSED] drm_test_cmdline_res
[11:13:23] [PASSED] drm_test_cmdline_res_vesa
[11:13:23] [PASSED] drm_test_cmdline_res_vesa_rblank
[11:13:23] [PASSED] drm_test_cmdline_res_rblank
[11:13:23] [PASSED] drm_test_cmdline_res_bpp
[11:13:23] [PASSED] drm_test_cmdline_res_refresh
[11:13:23] [PASSED] drm_test_cmdline_res_bpp_refresh
[11:13:23] [PASSED] drm_test_cmdline_res_bpp_refresh_interlaced
[11:13:23] [PASSED] drm_test_cmdline_res_bpp_refresh_margins
[11:13:23] [PASSED] drm_test_cmdline_res_bpp_refresh_force_off
[11:13:23] [PASSED] drm_test_cmdline_res_bpp_refresh_force_on
[11:13:23] [PASSED] drm_test_cmdline_res_bpp_refresh_force_on_analog
[11:13:23] [PASSED] drm_test_cmdline_res_bpp_refresh_force_on_digital
[11:13:23] [PASSED] drm_test_cmdline_res_bpp_refresh_interlaced_margins_force_on
[11:13:23] [PASSED] drm_test_cmdline_res_margins_force_on
[11:13:23] [PASSED] drm_test_cmdline_res_vesa_margins
[11:13:23] [PASSED] drm_test_cmdline_name
[11:13:23] [PASSED] drm_test_cmdline_name_bpp
[11:13:23] [PASSED] drm_test_cmdline_name_option
[11:13:23] [PASSED] drm_test_cmdline_name_bpp_option
[11:13:23] [PASSED] drm_test_cmdline_rotate_0
[11:13:23] [PASSED] drm_test_cmdline_rotate_90
[11:13:23] [PASSED] drm_test_cmdline_rotate_180
[11:13:23] [PASSED] drm_test_cmdline_rotate_270
[11:13:23] [PASSED] drm_test_cmdline_hmirror
[11:13:23] [PASSED] drm_test_cmdline_vmirror
[11:13:23] [PASSED] drm_test_cmdline_margin_options
[11:13:23] [PASSED] drm_test_cmdline_multiple_options
[11:13:23] [PASSED] drm_test_cmdline_bpp_extra_and_option
[11:13:23] [PASSED] drm_test_cmdline_extra_and_option
[11:13:23] [PASSED] drm_test_cmdline_freestanding_options
[11:13:23] [PASSED] drm_test_cmdline_freestanding_force_e_and_options
[11:13:23] [PASSED] drm_test_cmdline_panel_orientation
[11:13:23] ================ drm_test_cmdline_invalid  =================
[11:13:23] [PASSED] margin_only
[11:13:23] [PASSED] interlace_only
[11:13:23] [PASSED] res_missing_x
[11:13:23] [PASSED] res_missing_y
[11:13:23] [PASSED] res_bad_y
[11:13:23] [PASSED] res_missing_y_bpp
[11:13:23] [PASSED] res_bad_bpp
[11:13:23] [PASSED] res_bad_refresh
[11:13:23] [PASSED] res_bpp_refresh_force_on_off
[11:13:23] [PASSED] res_invalid_mode
[11:13:23] [PASSED] res_bpp_wrong_place_mode
[11:13:23] [PASSED] name_bpp_refresh
[11:13:23] [PASSED] name_refresh
[11:13:23] [PASSED] name_refresh_wrong_mode
[11:13:23] [PASSED] name_refresh_invalid_mode
[11:13:23] [PASSED] rotate_multiple
[11:13:23] [PASSED] rotate_invalid_val
[11:13:23] [PASSED] rotate_truncated
[11:13:23] [PASSED] invalid_option
[11:13:23] [PASSED] invalid_tv_option
[11:13:23] [PASSED] truncated_tv_option
[11:13:23] ============ [PASSED] drm_test_cmdline_invalid =============
[11:13:23] =============== drm_test_cmdline_tv_options  ===============
[11:13:23] [PASSED] NTSC
[11:13:23] [PASSED] NTSC_443
[11:13:23] [PASSED] NTSC_J
[11:13:23] [PASSED] PAL
[11:13:23] [PASSED] PAL_M
[11:13:23] [PASSED] PAL_N
[11:13:23] [PASSED] SECAM
[11:13:23] [PASSED] MONO_525
[11:13:23] [PASSED] MONO_625
[11:13:23] =========== [PASSED] drm_test_cmdline_tv_options ===========
[11:13:23] =============== [PASSED] drm_cmdline_parser ================
[11:13:23] ========== drmm_connector_hdmi_init (20 subtests) ==========
[11:13:23] [PASSED] drm_test_connector_hdmi_init_valid
[11:13:23] [PASSED] drm_test_connector_hdmi_init_bpc_8
[11:13:23] [PASSED] drm_test_connector_hdmi_init_bpc_10
[11:13:23] [PASSED] drm_test_connector_hdmi_init_bpc_12
[11:13:23] [PASSED] drm_test_connector_hdmi_init_bpc_invalid
[11:13:23] [PASSED] drm_test_connector_hdmi_init_bpc_null
[11:13:23] [PASSED] drm_test_connector_hdmi_init_formats_empty
[11:13:23] [PASSED] drm_test_connector_hdmi_init_formats_no_rgb
[11:13:23] === drm_test_connector_hdmi_init_formats_yuv420_allowed  ===
[11:13:23] [PASSED] supported_formats=0x9 yuv420_allowed=1
[11:13:23] [PASSED] supported_formats=0x9 yuv420_allowed=0
[11:13:23] [PASSED] supported_formats=0x5 yuv420_allowed=1
[11:13:23] [PASSED] supported_formats=0x5 yuv420_allowed=0
[11:13:23] === [PASSED] drm_test_connector_hdmi_init_formats_yuv420_allowed ===
[11:13:23] [PASSED] drm_test_connector_hdmi_init_null_ddc
[11:13:23] [PASSED] drm_test_connector_hdmi_init_null_product
[11:13:23] [PASSED] drm_test_connector_hdmi_init_null_vendor
[11:13:23] [PASSED] drm_test_connector_hdmi_init_product_length_exact
[11:13:23] [PASSED] drm_test_connector_hdmi_init_product_length_too_long
[11:13:23] [PASSED] drm_test_connector_hdmi_init_product_valid
[11:13:23] [PASSED] drm_test_connector_hdmi_init_vendor_length_exact
[11:13:23] [PASSED] drm_test_connector_hdmi_init_vendor_length_too_long
[11:13:23] [PASSED] drm_test_connector_hdmi_init_vendor_valid
[11:13:23] ========= drm_test_connector_hdmi_init_type_valid  =========
[11:13:23] [PASSED] HDMI-A
[11:13:23] [PASSED] HDMI-B
[11:13:23] ===== [PASSED] drm_test_connector_hdmi_init_type_valid =====
[11:13:23] ======== drm_test_connector_hdmi_init_type_invalid  ========
[11:13:23] [PASSED] Unknown
[11:13:23] [PASSED] VGA
[11:13:23] [PASSED] DVI-I
[11:13:23] [PASSED] DVI-D
[11:13:23] [PASSED] DVI-A
[11:13:23] [PASSED] Composite
[11:13:23] [PASSED] SVIDEO
[11:13:23] [PASSED] LVDS
[11:13:23] [PASSED] Component
[11:13:23] [PASSED] DIN
[11:13:23] [PASSED] DP
[11:13:23] [PASSED] TV
[11:13:23] [PASSED] eDP
[11:13:23] [PASSED] Virtual
[11:13:23] [PASSED] DSI
[11:13:23] [PASSED] DPI
[11:13:23] [PASSED] Writeback
[11:13:23] [PASSED] SPI
[11:13:23] [PASSED] USB
[11:13:23] ==== [PASSED] drm_test_connector_hdmi_init_type_invalid ====
[11:13:23] ============ [PASSED] drmm_connector_hdmi_init =============
[11:13:23] ============= drmm_connector_init (3 subtests) =============
[11:13:23] [PASSED] drm_test_drmm_connector_init
[11:13:23] [PASSED] drm_test_drmm_connector_init_null_ddc
[11:13:23] ========= drm_test_drmm_connector_init_type_valid  =========
[11:13:23] [PASSED] Unknown
[11:13:23] [PASSED] VGA
[11:13:23] [PASSED] DVI-I
[11:13:23] [PASSED] DVI-D
[11:13:23] [PASSED] DVI-A
[11:13:23] [PASSED] Composite
[11:13:23] [PASSED] SVIDEO
[11:13:23] [PASSED] LVDS
[11:13:23] [PASSED] Component
[11:13:23] [PASSED] DIN
[11:13:23] [PASSED] DP
[11:13:23] [PASSED] HDMI-A
[11:13:23] [PASSED] HDMI-B
[11:13:23] [PASSED] TV
[11:13:23] [PASSED] eDP
[11:13:23] [PASSED] Virtual
[11:13:23] [PASSED] DSI
[11:13:23] [PASSED] DPI
[11:13:23] [PASSED] Writeback
[11:13:23] [PASSED] SPI
[11:13:23] [PASSED] USB
[11:13:23] ===== [PASSED] drm_test_drmm_connector_init_type_valid =====
[11:13:23] =============== [PASSED] drmm_connector_init ===============
[11:13:23] ========= drm_connector_dynamic_init (6 subtests) ==========
[11:13:23] [PASSED] drm_test_drm_connector_dynamic_init
[11:13:23] [PASSED] drm_test_drm_connector_dynamic_init_null_ddc
[11:13:23] [PASSED] drm_test_drm_connector_dynamic_init_not_added
[11:13:23] [PASSED] drm_test_drm_connector_dynamic_init_properties
[11:13:23] ===== drm_test_drm_connector_dynamic_init_type_valid  ======
[11:13:23] [PASSED] Unknown
[11:13:23] [PASSED] VGA
[11:13:23] [PASSED] DVI-I
[11:13:23] [PASSED] DVI-D
[11:13:23] [PASSED] DVI-A
[11:13:23] [PASSED] Composite
[11:13:23] [PASSED] SVIDEO
[11:13:23] [PASSED] LVDS
[11:13:23] [PASSED] Component
[11:13:23] [PASSED] DIN
[11:13:23] [PASSED] DP
[11:13:23] [PASSED] HDMI-A
[11:13:23] [PASSED] HDMI-B
[11:13:23] [PASSED] TV
[11:13:23] [PASSED] eDP
[11:13:23] [PASSED] Virtual
[11:13:23] [PASSED] DSI
[11:13:23] [PASSED] DPI
[11:13:23] [PASSED] Writeback
[11:13:23] [PASSED] SPI
[11:13:23] [PASSED] USB
[11:13:23] = [PASSED] drm_test_drm_connector_dynamic_init_type_valid ==
[11:13:23] ======== drm_test_drm_connector_dynamic_init_name  =========
[11:13:23] [PASSED] Unknown
[11:13:23] [PASSED] VGA
[11:13:23] [PASSED] DVI-I
[11:13:23] [PASSED] DVI-D
[11:13:23] [PASSED] DVI-A
[11:13:23] [PASSED] Composite
[11:13:23] [PASSED] SVIDEO
[11:13:23] [PASSED] LVDS
[11:13:23] [PASSED] Component
[11:13:23] [PASSED] DIN
[11:13:23] [PASSED] DP
[11:13:23] [PASSED] HDMI-A
[11:13:23] [PASSED] HDMI-B
[11:13:23] [PASSED] TV
[11:13:23] [PASSED] eDP
[11:13:23] [PASSED] Virtual
[11:13:23] [PASSED] DSI
[11:13:23] [PASSED] DPI
[11:13:23] [PASSED] Writeback
[11:13:23] [PASSED] SPI
[11:13:23] [PASSED] USB
[11:13:23] ==== [PASSED] drm_test_drm_connector_dynamic_init_name =====
[11:13:23] =========== [PASSED] drm_connector_dynamic_init ============
[11:13:23] ==== drm_connector_dynamic_register_early (4 subtests) =====
[11:13:23] [PASSED] drm_test_drm_connector_dynamic_register_early_on_list
[11:13:23] [PASSED] drm_test_drm_connector_dynamic_register_early_defer
[11:13:23] [PASSED] drm_test_drm_connector_dynamic_register_early_no_init
[11:13:23] [PASSED] drm_test_drm_connector_dynamic_register_early_no_mode_object
[11:13:23] ====== [PASSED] drm_connector_dynamic_register_early =======
[11:13:23] ======= drm_connector_dynamic_register (7 subtests) ========
[11:13:23] [PASSED] drm_test_drm_connector_dynamic_register_on_list
[11:13:23] [PASSED] drm_test_drm_connector_dynamic_register_no_defer
[11:13:23] [PASSED] drm_test_drm_connector_dynamic_register_no_init
[11:13:23] [PASSED] drm_test_drm_connector_dynamic_register_mode_object
[11:13:23] [PASSED] drm_test_drm_connector_dynamic_register_sysfs
[11:13:23] [PASSED] drm_test_drm_connector_dynamic_register_sysfs_name
[11:13:23] [PASSED] drm_test_drm_connector_dynamic_register_debugfs
[11:13:23] ========= [PASSED] drm_connector_dynamic_register ==========
[11:13:23] = drm_connector_attach_broadcast_rgb_property (2 subtests) =
[11:13:23] [PASSED] drm_test_drm_connector_attach_broadcast_rgb_property
[11:13:23] [PASSED] drm_test_drm_connector_attach_broadcast_rgb_property_hdmi_connector
[11:13:23] === [PASSED] drm_connector_attach_broadcast_rgb_property ===
[11:13:23] ========== drm_get_tv_mode_from_name (2 subtests) ==========
[11:13:23] ========== drm_test_get_tv_mode_from_name_valid  ===========
[11:13:23] [PASSED] NTSC
[11:13:23] [PASSED] NTSC-443
[11:13:23] [PASSED] NTSC-J
[11:13:23] [PASSED] PAL
[11:13:23] [PASSED] PAL-M
[11:13:23] [PASSED] PAL-N
[11:13:23] [PASSED] SECAM
[11:13:23] [PASSED] Mono
[11:13:23] ====== [PASSED] drm_test_get_tv_mode_from_name_valid =======
[11:13:23] [PASSED] drm_test_get_tv_mode_from_name_truncated
[11:13:23] ============ [PASSED] drm_get_tv_mode_from_name ============
[11:13:23] = drm_test_connector_hdmi_compute_mode_clock (12 subtests) =
[11:13:23] [PASSED] drm_test_drm_hdmi_compute_mode_clock_rgb
[11:13:23] [PASSED] drm_test_drm_hdmi_compute_mode_clock_rgb_10bpc
[11:13:23] [PASSED] drm_test_drm_hdmi_compute_mode_clock_rgb_10bpc_vic_1
[11:13:23] [PASSED] drm_test_drm_hdmi_compute_mode_clock_rgb_12bpc
[11:13:23] [PASSED] drm_test_drm_hdmi_compute_mode_clock_rgb_12bpc_vic_1
[11:13:23] [PASSED] drm_test_drm_hdmi_compute_mode_clock_rgb_double
[11:13:23] = drm_test_connector_hdmi_compute_mode_clock_yuv420_valid  =
[11:13:23] [PASSED] VIC 96
[11:13:23] [PASSED] VIC 97
[11:13:23] [PASSED] VIC 101
[11:13:23] [PASSED] VIC 102
[11:13:23] [PASSED] VIC 106
[11:13:23] [PASSED] VIC 107
[11:13:23] === [PASSED] drm_test_connector_hdmi_compute_mode_clock_yuv420_valid ===
[11:13:23] [PASSED] drm_test_connector_hdmi_compute_mode_clock_yuv420_10_bpc
[11:13:23] [PASSED] drm_test_connector_hdmi_compute_mode_clock_yuv420_12_bpc
[11:13:23] [PASSED] drm_test_connector_hdmi_compute_mode_clock_yuv422_8_bpc
[11:13:23] [PASSED] drm_test_connector_hdmi_compute_mode_clock_yuv422_10_bpc
[11:13:23] [PASSED] drm_test_connector_hdmi_compute_mode_clock_yuv422_12_bpc
[11:13:23] === [PASSED] drm_test_connector_hdmi_compute_mode_clock ====
[11:13:23] == drm_hdmi_connector_get_broadcast_rgb_name (2 subtests) ==
[11:13:23] === drm_test_drm_hdmi_connector_get_broadcast_rgb_name  ====
[11:13:23] [PASSED] Automatic
[11:13:23] [PASSED] Full
[11:13:23] [PASSED] Limited 16:235
[11:13:23] === [PASSED] drm_test_drm_hdmi_connector_get_broadcast_rgb_name ===
[11:13:23] [PASSED] drm_test_drm_hdmi_connector_get_broadcast_rgb_name_invalid
[11:13:23] ==== [PASSED] drm_hdmi_connector_get_broadcast_rgb_name ====
[11:13:23] == drm_hdmi_connector_get_output_format_name (2 subtests) ==
[11:13:23] === drm_test_drm_hdmi_connector_get_output_format_name  ====
[11:13:23] [PASSED] RGB
[11:13:23] [PASSED] YUV 4:2:0
[11:13:23] [PASSED] YUV 4:2:2
[11:13:23] [PASSED] YUV 4:4:4
[11:13:23] === [PASSED] drm_test_drm_hdmi_connector_get_output_format_name ===
[11:13:23] [PASSED] drm_test_drm_hdmi_connector_get_output_format_name_invalid
[11:13:23] ==== [PASSED] drm_hdmi_connector_get_output_format_name ====
[11:13:23] ============= drm_damage_helper (21 subtests) ==============
[11:13:23] [PASSED] drm_test_damage_iter_no_damage
[11:13:23] [PASSED] drm_test_damage_iter_no_damage_fractional_src
[11:13:23] [PASSED] drm_test_damage_iter_no_damage_src_moved
[11:13:23] [PASSED] drm_test_damage_iter_no_damage_fractional_src_moved
[11:13:23] [PASSED] drm_test_damage_iter_no_damage_not_visible
[11:13:23] [PASSED] drm_test_damage_iter_no_damage_no_crtc
[11:13:23] [PASSED] drm_test_damage_iter_no_damage_no_fb
[11:13:23] [PASSED] drm_test_damage_iter_simple_damage
[11:13:23] [PASSED] drm_test_damage_iter_single_damage
[11:13:23] [PASSED] drm_test_damage_iter_single_damage_intersect_src
[11:13:23] [PASSED] drm_test_damage_iter_single_damage_outside_src
[11:13:23] [PASSED] drm_test_damage_iter_single_damage_fractional_src
[11:13:23] [PASSED] drm_test_damage_iter_single_damage_intersect_fractional_src
[11:13:23] [PASSED] drm_test_damage_iter_single_damage_outside_fractional_src
[11:13:23] [PASSED] drm_test_damage_iter_single_damage_src_moved
[11:13:23] [PASSED] drm_test_damage_iter_single_damage_fractional_src_moved
[11:13:23] [PASSED] drm_test_damage_iter_damage
[11:13:23] [PASSED] drm_test_damage_iter_damage_one_intersect
[11:13:23] [PASSED] drm_test_damage_iter_damage_one_outside
[11:13:23] [PASSED] drm_test_damage_iter_damage_src_moved
[11:13:23] [PASSED] drm_test_damage_iter_damage_not_visible
[11:13:23] ================ [PASSED] drm_damage_helper ================
[11:13:23] ============== drm_dp_mst_helper (3 subtests) ==============
[11:13:23] ============== drm_test_dp_mst_calc_pbn_mode  ==============
[11:13:23] [PASSED] Clock 154000 BPP 30 DSC disabled
[11:13:23] [PASSED] Clock 234000 BPP 30 DSC disabled
[11:13:23] [PASSED] Clock 297000 BPP 24 DSC disabled
[11:13:23] [PASSED] Clock 332880 BPP 24 DSC enabled
[11:13:23] [PASSED] Clock 324540 BPP 24 DSC enabled
[11:13:23] ========== [PASSED] drm_test_dp_mst_calc_pbn_mode ==========
[11:13:23] ============== drm_test_dp_mst_calc_pbn_div  ===============
[11:13:23] [PASSED] Link rate 2000000 lane count 4
[11:13:23] [PASSED] Link rate 2000000 lane count 2
[11:13:23] [PASSED] Link rate 2000000 lane count 1
[11:13:23] [PASSED] Link rate 1350000 lane count 4
[11:13:23] [PASSED] Link rate 1350000 lane count 2
[11:13:23] [PASSED] Link rate 1350000 lane count 1
[11:13:23] [PASSED] Link rate 1000000 lane count 4
[11:13:23] [PASSED] Link rate 1000000 lane count 2
[11:13:23] [PASSED] Link rate 1000000 lane count 1
[11:13:23] [PASSED] Link rate 810000 lane count 4
[11:13:23] [PASSED] Link rate 810000 lane count 2
[11:13:23] [PASSED] Link rate 810000 lane count 1
[11:13:23] [PASSED] Link rate 540000 lane count 4
[11:13:23] [PASSED] Link rate 540000 lane count 2
[11:13:23] [PASSED] Link rate 540000 lane count 1
[11:13:23] [PASSED] Link rate 270000 lane count 4
[11:13:23] [PASSED] Link rate 270000 lane count 2
[11:13:23] [PASSED] Link rate 270000 lane count 1
[11:13:23] [PASSED] Link rate 162000 lane count 4
[11:13:23] [PASSED] Link rate 162000 lane count 2
[11:13:23] [PASSED] Link rate 162000 lane count 1
[11:13:23] ========== [PASSED] drm_test_dp_mst_calc_pbn_div ===========
[11:13:23] ========= drm_test_dp_mst_sideband_msg_req_decode  =========
[11:13:23] [PASSED] DP_ENUM_PATH_RESOURCES with port number
[11:13:23] [PASSED] DP_POWER_UP_PHY with port number
[11:13:23] [PASSED] DP_POWER_DOWN_PHY with port number
[11:13:23] [PASSED] DP_ALLOCATE_PAYLOAD with SDP stream sinks
[11:13:23] [PASSED] DP_ALLOCATE_PAYLOAD with port number
[11:13:23] [PASSED] DP_ALLOCATE_PAYLOAD with VCPI
[11:13:23] [PASSED] DP_ALLOCATE_PAYLOAD with PBN
[11:13:23] [PASSED] DP_QUERY_PAYLOAD with port number
[11:13:23] [PASSED] DP_QUERY_PAYLOAD with VCPI
[11:13:23] [PASSED] DP_REMOTE_DPCD_READ with port number
[11:13:23] [PASSED] DP_REMOTE_DPCD_READ with DPCD address
[11:13:23] [PASSED] DP_REMOTE_DPCD_READ with max number of bytes
[11:13:23] [PASSED] DP_REMOTE_DPCD_WRITE with port number
[11:13:23] [PASSED] DP_REMOTE_DPCD_WRITE with DPCD address
[11:13:23] [PASSED] DP_REMOTE_DPCD_WRITE with data array
[11:13:23] [PASSED] DP_REMOTE_I2C_READ with port number
[11:13:23] [PASSED] DP_REMOTE_I2C_READ with I2C device ID
[11:13:23] [PASSED] DP_REMOTE_I2C_READ with transactions array
[11:13:23] [PASSED] DP_REMOTE_I2C_WRITE with port number
[11:13:23] [PASSED] DP_REMOTE_I2C_WRITE with I2C device ID
[11:13:23] [PASSED] DP_REMOTE_I2C_WRITE with data array
[11:13:23] [PASSED] DP_QUERY_STREAM_ENC_STATUS with stream ID
[11:13:23] [PASSED] DP_QUERY_STREAM_ENC_STATUS with client ID
[11:13:23] [PASSED] DP_QUERY_STREAM_ENC_STATUS with stream event
[11:13:23] [PASSED] DP_QUERY_STREAM_ENC_STATUS with valid stream event
[11:13:23] [PASSED] DP_QUERY_STREAM_ENC_STATUS with stream behavior
[11:13:23] [PASSED] DP_QUERY_STREAM_ENC_STATUS with a valid stream behavior
[11:13:23] ===== [PASSED] drm_test_dp_mst_sideband_msg_req_decode =====
[11:13:23] ================ [PASSED] drm_dp_mst_helper ================
[11:13:23] ================== drm_exec (7 subtests) ===================
[11:13:23] [PASSED] sanitycheck
[11:13:23] [PASSED] test_lock
[11:13:23] [PASSED] test_lock_unlock
[11:13:23] [PASSED] test_duplicates
[11:13:23] [PASSED] test_prepare
[11:13:23] [PASSED] test_prepare_array
[11:13:23] [PASSED] test_multiple_loops
[11:13:23] ==================== [PASSED] drm_exec =====================
[11:13:23] =========== drm_format_helper_test (17 subtests) ===========
[11:13:23] ============== drm_test_fb_xrgb8888_to_gray8  ==============
[11:13:23] [PASSED] single_pixel_source_buffer
[11:13:23] [PASSED] single_pixel_clip_rectangle
[11:13:23] [PASSED] well_known_colors
[11:13:23] [PASSED] destination_pitch
[11:13:23] ========== [PASSED] drm_test_fb_xrgb8888_to_gray8 ==========
[11:13:23] ============= drm_test_fb_xrgb8888_to_rgb332  ==============
[11:13:23] [PASSED] single_pixel_source_buffer
[11:13:23] [PASSED] single_pixel_clip_rectangle
[11:13:23] [PASSED] well_known_colors
[11:13:23] [PASSED] destination_pitch
[11:13:23] ========= [PASSED] drm_test_fb_xrgb8888_to_rgb332 ==========
[11:13:23] ============= drm_test_fb_xrgb8888_to_rgb565  ==============
[11:13:23] [PASSED] single_pixel_source_buffer
[11:13:23] [PASSED] single_pixel_clip_rectangle
[11:13:23] [PASSED] well_known_colors
[11:13:23] [PASSED] destination_pitch
[11:13:23] ========= [PASSED] drm_test_fb_xrgb8888_to_rgb565 ==========
[11:13:23] ============ drm_test_fb_xrgb8888_to_xrgb1555  =============
[11:13:23] [PASSED] single_pixel_source_buffer
[11:13:23] [PASSED] single_pixel_clip_rectangle
[11:13:23] [PASSED] well_known_colors
[11:13:23] [PASSED] destination_pitch
[11:13:23] ======== [PASSED] drm_test_fb_xrgb8888_to_xrgb1555 =========
[11:13:23] ============ drm_test_fb_xrgb8888_to_argb1555  =============
[11:13:23] [PASSED] single_pixel_source_buffer
[11:13:23] [PASSED] single_pixel_clip_rectangle
[11:13:23] [PASSED] well_known_colors
[11:13:23] [PASSED] destination_pitch
[11:13:23] ======== [PASSED] drm_test_fb_xrgb8888_to_argb1555 =========
[11:13:23] ============ drm_test_fb_xrgb8888_to_rgba5551  =============
[11:13:23] [PASSED] single_pixel_source_buffer
[11:13:23] [PASSED] single_pixel_clip_rectangle
[11:13:23] [PASSED] well_known_colors
[11:13:23] [PASSED] destination_pitch
[11:13:23] ======== [PASSED] drm_test_fb_xrgb8888_to_rgba5551 =========
[11:13:23] ============= drm_test_fb_xrgb8888_to_rgb888  ==============
[11:13:23] [PASSED] single_pixel_source_buffer
[11:13:23] [PASSED] single_pixel_clip_rectangle
[11:13:23] [PASSED] well_known_colors
[11:13:23] [PASSED] destination_pitch
[11:13:23] ========= [PASSED] drm_test_fb_xrgb8888_to_rgb888 ==========
[11:13:23] ============= drm_test_fb_xrgb8888_to_bgr888  ==============
[11:13:23] [PASSED] single_pixel_source_buffer
[11:13:23] [PASSED] single_pixel_clip_rectangle
[11:13:23] [PASSED] well_known_colors
[11:13:23] [PASSED] destination_pitch
[11:13:23] ========= [PASSED] drm_test_fb_xrgb8888_to_bgr888 ==========
[11:13:23] ============ drm_test_fb_xrgb8888_to_argb8888  =============
[11:13:23] [PASSED] single_pixel_source_buffer
[11:13:23] [PASSED] single_pixel_clip_rectangle
[11:13:23] [PASSED] well_known_colors
[11:13:23] [PASSED] destination_pitch
[11:13:23] ======== [PASSED] drm_test_fb_xrgb8888_to_argb8888 =========
[11:13:23] =========== drm_test_fb_xrgb8888_to_xrgb2101010  ===========
[11:13:23] [PASSED] single_pixel_source_buffer
[11:13:23] [PASSED] single_pixel_clip_rectangle
[11:13:23] [PASSED] well_known_colors
[11:13:23] [PASSED] destination_pitch
[11:13:23] ======= [PASSED] drm_test_fb_xrgb8888_to_xrgb2101010 =======
[11:13:23] =========== drm_test_fb_xrgb8888_to_argb2101010  ===========
[11:13:23] [PASSED] single_pixel_source_buffer
[11:13:23] [PASSED] single_pixel_clip_rectangle
[11:13:23] [PASSED] well_known_colors
[11:13:23] [PASSED] destination_pitch
[11:13:23] ======= [PASSED] drm_test_fb_xrgb8888_to_argb2101010 =======
[11:13:23] ============== drm_test_fb_xrgb8888_to_mono  ===============
[11:13:23] [PASSED] single_pixel_source_buffer
[11:13:23] [PASSED] single_pixel_clip_rectangle
[11:13:23] [PASSED] well_known_colors
[11:13:23] [PASSED] destination_pitch
[11:13:23] ========== [PASSED] drm_test_fb_xrgb8888_to_mono ===========
[11:13:23] ==================== drm_test_fb_swab  =====================
[11:13:23] [PASSED] single_pixel_source_buffer
[11:13:23] [PASSED] single_pixel_clip_rectangle
[11:13:23] [PASSED] well_known_colors
[11:13:23] [PASSED] destination_pitch
[11:13:23] ================ [PASSED] drm_test_fb_swab =================
[11:13:23] ============ drm_test_fb_xrgb8888_to_xbgr8888  =============
[11:13:23] [PASSED] single_pixel_source_buffer
[11:13:23] [PASSED] single_pixel_clip_rectangle
[11:13:23] [PASSED] well_known_colors
[11:13:23] [PASSED] destination_pitch
[11:13:23] ======== [PASSED] drm_test_fb_xrgb8888_to_xbgr8888 =========
[11:13:23] ============ drm_test_fb_xrgb8888_to_abgr8888  =============
[11:13:23] [PASSED] single_pixel_source_buffer
[11:13:23] [PASSED] single_pixel_clip_rectangle
[11:13:23] [PASSED] well_known_colors
[11:13:23] [PASSED] destination_pitch
[11:13:23] ======== [PASSED] drm_test_fb_xrgb8888_to_abgr8888 =========
[11:13:23] ================= drm_test_fb_clip_offset  =================
[11:13:23] [PASSED] pass through
[11:13:23] [PASSED] horizontal offset
[11:13:23] [PASSED] vertical offset
[11:13:23] [PASSED] horizontal and vertical offset
[11:13:23] [PASSED] horizontal offset (custom pitch)
[11:13:23] [PASSED] vertical offset (custom pitch)
[11:13:23] [PASSED] horizontal and vertical offset (custom pitch)
[11:13:23] ============= [PASSED] drm_test_fb_clip_offset =============
[11:13:23] =================== drm_test_fb_memcpy  ====================
[11:13:23] [PASSED] single_pixel_source_buffer: XR24 little-endian (0x34325258)
[11:13:23] [PASSED] single_pixel_source_buffer: XRA8 little-endian (0x38415258)
[11:13:23] [PASSED] single_pixel_source_buffer: YU24 little-endian (0x34325559)
[11:13:23] [PASSED] single_pixel_clip_rectangle: XB24 little-endian (0x34324258)
[11:13:23] [PASSED] single_pixel_clip_rectangle: XRA8 little-endian (0x38415258)
[11:13:23] [PASSED] single_pixel_clip_rectangle: YU24 little-endian (0x34325559)
[11:13:23] [PASSED] well_known_colors: XB24 little-endian (0x34324258)
[11:13:23] [PASSED] well_known_colors: XRA8 little-endian (0x38415258)
[11:13:23] [PASSED] well_known_colors: YU24 little-endian (0x34325559)
[11:13:23] [PASSED] destination_pitch: XB24 little-endian (0x34324258)
[11:13:23] [PASSED] destination_pitch: XRA8 little-endian (0x38415258)
[11:13:23] [PASSED] destination_pitch: YU24 little-endian (0x34325559)
[11:13:23] =============== [PASSED] drm_test_fb_memcpy ================
[11:13:23] ============= [PASSED] drm_format_helper_test ==============
[11:13:23] ================= drm_format (18 subtests) =================
[11:13:23] [PASSED] drm_test_format_block_width_invalid
[11:13:23] [PASSED] drm_test_format_block_width_one_plane
[11:13:23] [PASSED] drm_test_format_block_width_two_plane
[11:13:23] [PASSED] drm_test_format_block_width_three_plane
[11:13:23] [PASSED] drm_test_format_block_width_tiled
[11:13:23] [PASSED] drm_test_format_block_height_invalid
[11:13:23] [PASSED] drm_test_format_block_height_one_plane
[11:13:23] [PASSED] drm_test_format_block_height_two_plane
[11:13:23] [PASSED] drm_test_format_block_height_three_plane
[11:13:23] [PASSED] drm_test_format_block_height_tiled
[11:13:23] [PASSED] drm_test_format_min_pitch_invalid
[11:13:23] [PASSED] drm_test_format_min_pitch_one_plane_8bpp
[11:13:23] [PASSED] drm_test_format_min_pitch_one_plane_16bpp
[11:13:23] [PASSED] drm_test_format_min_pitch_one_plane_24bpp
[11:13:23] [PASSED] drm_test_format_min_pitch_one_plane_32bpp
[11:13:23] [PASSED] drm_test_format_min_pitch_two_plane
[11:13:23] [PASSED] drm_test_format_min_pitch_three_plane_8bpp
[11:13:23] [PASSED] drm_test_format_min_pitch_tiled
[11:13:23] =================== [PASSED] drm_format ====================
[11:13:23] ============== drm_framebuffer (10 subtests) ===============
[11:13:23] ========== drm_test_framebuffer_check_src_coords  ==========
[11:13:23] [PASSED] Success: source fits into fb
[11:13:23] [PASSED] Fail: overflowing fb with x-axis coordinate
[11:13:23] [PASSED] Fail: overflowing fb with y-axis coordinate
[11:13:23] [PASSED] Fail: overflowing fb with source width
[11:13:23] [PASSED] Fail: overflowing fb with source height
[11:13:23] ====== [PASSED] drm_test_framebuffer_check_src_coords ======
[11:13:23] [PASSED] drm_test_framebuffer_cleanup
[11:13:23] =============== drm_test_framebuffer_create  ===============
[11:13:23] [PASSED] ABGR8888 normal sizes
[11:13:23] [PASSED] ABGR8888 max sizes
[11:13:23] [PASSED] ABGR8888 pitch greater than min required
[11:13:23] [PASSED] ABGR8888 pitch less than min required
[11:13:23] [PASSED] ABGR8888 Invalid width
[11:13:23] [PASSED] ABGR8888 Invalid buffer handle
[11:13:23] [PASSED] No pixel format
[11:13:23] [PASSED] ABGR8888 Width 0
[11:13:23] [PASSED] ABGR8888 Height 0
[11:13:23] [PASSED] ABGR8888 Out of bound height * pitch combination
[11:13:23] [PASSED] ABGR8888 Large buffer offset
[11:13:23] [PASSED] ABGR8888 Buffer offset for inexistent plane
[11:13:23] [PASSED] ABGR8888 Invalid flag
[11:13:23] [PASSED] ABGR8888 Set DRM_MODE_FB_MODIFIERS without modifiers
[11:13:23] [PASSED] ABGR8888 Valid buffer modifier
[11:13:23] [PASSED] ABGR8888 Invalid buffer modifier(DRM_FORMAT_MOD_SAMSUNG_64_32_TILE)
[11:13:23] [PASSED] ABGR8888 Extra pitches without DRM_MODE_FB_MODIFIERS
[11:13:23] [PASSED] ABGR8888 Extra pitches with DRM_MODE_FB_MODIFIERS
[11:13:23] [PASSED] NV12 Normal sizes
[11:13:23] [PASSED] NV12 Max sizes
[11:13:23] [PASSED] NV12 Invalid pitch
[11:13:23] [PASSED] NV12 Invalid modifier/missing DRM_MODE_FB_MODIFIERS flag
[11:13:23] [PASSED] NV12 different  modifier per-plane
[11:13:23] [PASSED] NV12 with DRM_FORMAT_MOD_SAMSUNG_64_32_TILE
[11:13:23] [PASSED] NV12 Valid modifiers without DRM_MODE_FB_MODIFIERS
[11:13:23] [PASSED] NV12 Modifier for inexistent plane
[11:13:23] [PASSED] NV12 Handle for inexistent plane
[11:13:23] [PASSED] NV12 Handle for inexistent plane without DRM_MODE_FB_MODIFIERS
[11:13:23] [PASSED] YVU420 DRM_MODE_FB_MODIFIERS set without modifier
[11:13:23] [PASSED] YVU420 Normal sizes
[11:13:23] [PASSED] YVU420 Max sizes
[11:13:23] [PASSED] YVU420 Invalid pitch
[11:13:23] [PASSED] YVU420 Different pitches
[11:13:23] [PASSED] YVU420 Different buffer offsets/pitches
[11:13:23] [PASSED] YVU420 Modifier set just for plane 0, without DRM_MODE_FB_MODIFIERS
[11:13:23] [PASSED] YVU420 Modifier set just for planes 0, 1, without DRM_MODE_FB_MODIFIERS
[11:13:23] [PASSED] YVU420 Modifier set just for plane 0, 1, with DRM_MODE_FB_MODIFIERS
[11:13:23] [PASSED] YVU420 Valid modifier
[11:13:23] [PASSED] YVU420 Different modifiers per plane
[11:13:23] [PASSED] YVU420 Modifier for inexistent plane
[11:13:23] [PASSED] YUV420_10BIT Invalid modifier(DRM_FORMAT_MOD_LINEAR)
[11:13:23] [PASSED] X0L2 Normal sizes
[11:13:23] [PASSED] X0L2 Max sizes
[11:13:23] [PASSED] X0L2 Invalid pitch
[11:13:23] [PASSED] X0L2 Pitch greater than minimum required
[11:13:23] [PASSED] X0L2 Handle for inexistent plane
[11:13:23] [PASSED] X0L2 Offset for inexistent plane, without DRM_MODE_FB_MODIFIERS set
[11:13:23] [PASSED] X0L2 Modifier without DRM_MODE_FB_MODIFIERS set
[11:13:23] [PASSED] X0L2 Valid modifier
[11:13:23] [PASSED] X0L2 Modifier for inexistent plane
[11:13:23] =========== [PASSED] drm_test_framebuffer_create ===========
[11:13:23] [PASSED] drm_test_framebuffer_free
[11:13:23] [PASSED] drm_test_framebuffer_init
[11:13:23] [PASSED] drm_test_framebuffer_init_bad_format
[11:13:23] [PASSED] drm_test_framebuffer_init_dev_mismatch
[11:13:23] [PASSED] drm_test_framebuffer_lookup
[11:13:23] [PASSED] drm_test_framebuffer_lookup_inexistent
[11:13:23] [PASSED] drm_test_framebuffer_modifiers_not_supported
[11:13:23] ================= [PASSED] drm_framebuffer =================
[11:13:23] ================ drm_gem_shmem (8 subtests) ================
[11:13:23] [PASSED] drm_gem_shmem_test_obj_create
[11:13:23] [PASSED] drm_gem_shmem_test_obj_create_private
[11:13:23] [PASSED] drm_gem_shmem_test_pin_pages
[11:13:23] [PASSED] drm_gem_shmem_test_vmap
[11:13:23] [PASSED] drm_gem_shmem_test_get_sg_table
[11:13:23] [PASSED] drm_gem_shmem_test_get_pages_sgt
[11:13:23] [PASSED] drm_gem_shmem_test_madvise
[11:13:23] [PASSED] drm_gem_shmem_test_purge
[11:13:23] ================== [PASSED] drm_gem_shmem ==================
[11:13:23] === drm_atomic_helper_connector_hdmi_check (27 subtests) ===
[11:13:23] [PASSED] drm_test_check_broadcast_rgb_auto_cea_mode
[11:13:23] [PASSED] drm_test_check_broadcast_rgb_auto_cea_mode_vic_1
[11:13:23] [PASSED] drm_test_check_broadcast_rgb_full_cea_mode
[11:13:23] [PASSED] drm_test_check_broadcast_rgb_full_cea_mode_vic_1
[11:13:23] [PASSED] drm_test_check_broadcast_rgb_limited_cea_mode
[11:13:23] [PASSED] drm_test_check_broadcast_rgb_limited_cea_mode_vic_1
[11:13:23] ====== drm_test_check_broadcast_rgb_cea_mode_yuv420  =======
[11:13:23] [PASSED] Automatic
[11:13:23] [PASSED] Full
[11:13:23] [PASSED] Limited 16:235
[11:13:23] == [PASSED] drm_test_check_broadcast_rgb_cea_mode_yuv420 ===
[11:13:23] [PASSED] drm_test_check_broadcast_rgb_crtc_mode_changed
[11:13:23] [PASSED] drm_test_check_broadcast_rgb_crtc_mode_not_changed
[11:13:23] [PASSED] drm_test_check_disable_connector
[11:13:23] [PASSED] drm_test_check_hdmi_funcs_reject_rate
[11:13:23] [PASSED] drm_test_check_max_tmds_rate_bpc_fallback_rgb
[11:13:23] [PASSED] drm_test_check_max_tmds_rate_bpc_fallback_yuv420
[11:13:23] [PASSED] drm_test_check_max_tmds_rate_bpc_fallback_ignore_yuv422
[11:13:23] [PASSED] drm_test_check_max_tmds_rate_bpc_fallback_ignore_yuv420
[11:13:23] [PASSED] drm_test_check_driver_unsupported_fallback_yuv420
[11:13:23] [PASSED] drm_test_check_output_bpc_crtc_mode_changed
[11:13:23] [PASSED] drm_test_check_output_bpc_crtc_mode_not_changed
[11:13:23] [PASSED] drm_test_check_output_bpc_dvi
[11:13:23] [PASSED] drm_test_check_output_bpc_format_vic_1
[11:13:23] [PASSED] drm_test_check_output_bpc_format_display_8bpc_only
[11:13:23] [PASSED] drm_test_check_output_bpc_format_display_rgb_only
[11:13:23] [PASSED] drm_test_check_output_bpc_format_driver_8bpc_only
[11:13:23] [PASSED] drm_test_check_output_bpc_format_driver_rgb_only
[11:13:23] [PASSED] drm_test_check_tmds_char_rate_rgb_8bpc
[11:13:23] [PASSED] drm_test_check_tmds_char_rate_rgb_10bpc
[11:13:23] [PASSED] drm_test_check_tmds_char_rate_rgb_12bpc
[11:13:23] ===== [PASSED] drm_atomic_helper_connector_hdmi_check ======
[11:13:23] === drm_atomic_helper_connector_hdmi_reset (6 subtests) ====
[11:13:23] [PASSED] drm_test_check_broadcast_rgb_value
[11:13:23] [PASSED] drm_test_check_bpc_8_value
[11:13:23] [PASSED] drm_test_check_bpc_10_value
[11:13:23] [PASSED] drm_test_check_bpc_12_value
[11:13:23] [PASSED] drm_test_check_format_value
[11:13:23] [PASSED] drm_test_check_tmds_char_value
[11:13:23] ===== [PASSED] drm_atomic_helper_connector_hdmi_reset ======
[11:13:23] = drm_atomic_helper_connector_hdmi_mode_valid (4 subtests) =
[11:13:23] [PASSED] drm_test_check_mode_valid
[11:13:23] [PASSED] drm_test_check_mode_valid_reject
[11:13:23] [PASSED] drm_test_check_mode_valid_reject_rate
[11:13:23] [PASSED] drm_test_check_mode_valid_reject_max_clock
[11:13:23] === [PASSED] drm_atomic_helper_connector_hdmi_mode_valid ===
[11:13:23] = drm_atomic_helper_connector_hdmi_infoframes (5 subtests) =
[11:13:23] [PASSED] drm_test_check_infoframes
[11:13:23] [PASSED] drm_test_check_reject_avi_infoframe
[11:13:23] [PASSED] drm_test_check_reject_hdr_infoframe_bpc_8
[11:13:23] [PASSED] drm_test_check_reject_hdr_infoframe_bpc_10
[11:13:23] [PASSED] drm_test_check_reject_audio_infoframe
[11:13:23] === [PASSED] drm_atomic_helper_connector_hdmi_infoframes ===
[11:13:23] ================= drm_managed (2 subtests) =================
[11:13:23] [PASSED] drm_test_managed_release_action
[11:13:23] [PASSED] drm_test_managed_run_action
[11:13:23] =================== [PASSED] drm_managed ===================
[11:13:23] =================== drm_mm (6 subtests) ====================
[11:13:23] [PASSED] drm_test_mm_init
[11:13:23] [PASSED] drm_test_mm_debug
[11:13:23] [PASSED] drm_test_mm_align32
[11:13:23] [PASSED] drm_test_mm_align64
[11:13:23] [PASSED] drm_test_mm_lowest
[11:13:23] [PASSED] drm_test_mm_highest
[11:13:23] ===================== [PASSED] drm_mm ======================
[11:13:23] ============= drm_modes_analog_tv (5 subtests) =============
[11:13:23] [PASSED] drm_test_modes_analog_tv_mono_576i
[11:13:23] [PASSED] drm_test_modes_analog_tv_ntsc_480i
[11:13:23] [PASSED] drm_test_modes_analog_tv_ntsc_480i_inlined
[11:13:23] [PASSED] drm_test_modes_analog_tv_pal_576i
[11:13:23] [PASSED] drm_test_modes_analog_tv_pal_576i_inlined
[11:13:23] =============== [PASSED] drm_modes_analog_tv ===============
[11:13:23] ============== drm_plane_helper (2 subtests) ===============
[11:13:23] =============== drm_test_check_plane_state  ================
[11:13:23] [PASSED] clipping_simple
[11:13:23] [PASSED] clipping_rotate_reflect
[11:13:23] [PASSED] positioning_simple
[11:13:23] [PASSED] upscaling
[11:13:23] [PASSED] downscaling
[11:13:23] [PASSED] rounding1
[11:13:23] [PASSED] rounding2
[11:13:23] [PASSED] rounding3
[11:13:23] [PASSED] rounding4
[11:13:23] =========== [PASSED] drm_test_check_plane_state ============
[11:13:23] =========== drm_test_check_invalid_plane_state  ============
[11:13:23] [PASSED] positioning_invalid
[11:13:23] [PASSED] upscaling_invalid
[11:13:23] [PASSED] downscaling_invalid
[11:13:23] ======= [PASSED] drm_test_check_invalid_plane_state ========
[11:13:23] ================ [PASSED] drm_plane_helper =================
[11:13:23] ====== drm_connector_helper_tv_get_modes (1 subtest) =======
[11:13:23] ====== drm_test_connector_helper_tv_get_modes_check  =======
[11:13:23] [PASSED] None
[11:13:23] [PASSED] PAL
[11:13:23] [PASSED] NTSC
[11:13:23] [PASSED] Both, NTSC Default
[11:13:23] [PASSED] Both, PAL Default
[11:13:23] [PASSED] Both, NTSC Default, with PAL on command-line
[11:13:23] [PASSED] Both, PAL Default, with NTSC on command-line
[11:13:23] == [PASSED] drm_test_connector_helper_tv_get_modes_check ===
[11:13:23] ======== [PASSED] drm_connector_helper_tv_get_modes ========
[11:13:23] ================== drm_rect (9 subtests) ===================
[11:13:23] [PASSED] drm_test_rect_clip_scaled_div_by_zero
[11:13:23] [PASSED] drm_test_rect_clip_scaled_not_clipped
[11:13:23] [PASSED] drm_test_rect_clip_scaled_clipped
[11:13:23] [PASSED] drm_test_rect_clip_scaled_signed_vs_unsigned
[11:13:23] ================= drm_test_rect_intersect  =================
[11:13:23] [PASSED] top-left x bottom-right: 2x2+1+1 x 2x2+0+0
[11:13:23] [PASSED] top-right x bottom-left: 2x2+0+0 x 2x2+1-1
[11:13:23] [PASSED] bottom-left x top-right: 2x2+1-1 x 2x2+0+0
[11:13:23] [PASSED] bottom-right x top-left: 2x2+0+0 x 2x2+1+1
[11:13:23] [PASSED] right x left: 2x1+0+0 x 3x1+1+0
[11:13:23] [PASSED] left x right: 3x1+1+0 x 2x1+0+0
[11:13:23] [PASSED] up x bottom: 1x2+0+0 x 1x3+0-1
[11:13:23] [PASSED] bottom x up: 1x3+0-1 x 1x2+0+0
[11:13:23] [PASSED] touching corner: 1x1+0+0 x 2x2+1+1
[11:13:23] [PASSED] touching side: 1x1+0+0 x 1x1+1+0
[11:13:23] [PASSED] equal rects: 2x2+0+0 x 2x2+0+0
[11:13:23] [PASSED] inside another: 2x2+0+0 x 1x1+1+1
[11:13:23] [PASSED] far away: 1x1+0+0 x 1x1+3+6
[11:13:23] [PASSED] points intersecting: 0x0+5+10 x 0x0+5+10
[11:13:23] [PASSED] points not intersecting: 0x0+0+0 x 0x0+5+10
[11:13:23] ============= [PASSED] drm_test_rect_intersect =============
[11:13:23] ================ drm_test_rect_calc_hscale  ================
[11:13:23] [PASSED] normal use
[11:13:23] [PASSED] out of max range
[11:13:23] [PASSED] out of min range
[11:13:23] [PASSED] zero dst
[11:13:23] [PASSED] negative src
[11:13:23] [PASSED] negative dst
[11:13:23] ============ [PASSED] drm_test_rect_calc_hscale ============
[11:13:23] ================ drm_test_rect_calc_vscale  ================
[11:13:23] [PASSED] normal use
[11:13:23] [PASSED] out of max range
[11:13:23] [PASSED] out of min range
[11:13:23] [PASSED] zero dst
[11:13:23] [PASSED] negative src
[11:13:23] [PASSED] negative dst
[11:13:23] ============ [PASSED] drm_test_rect_calc_vscale ============
[11:13:23] ================== drm_test_rect_rotate  ===================
[11:13:23] [PASSED] reflect-x
[11:13:23] [PASSED] reflect-y
[11:13:23] [PASSED] rotate-0
[11:13:23] [PASSED] rotate-90
[11:13:23] [PASSED] rotate-180
[11:13:23] [PASSED] rotate-270
[11:13:23] ============== [PASSED] drm_test_rect_rotate ===============
[11:13:23] ================ drm_test_rect_rotate_inv  =================
[11:13:23] [PASSED] reflect-x
[11:13:23] [PASSED] reflect-y
[11:13:23] [PASSED] rotate-0
[11:13:23] [PASSED] rotate-90
[11:13:23] [PASSED] rotate-180
[11:13:23] [PASSED] rotate-270
[11:13:23] ============ [PASSED] drm_test_rect_rotate_inv =============
[11:13:23] ==================== [PASSED] drm_rect =====================
[11:13:23] ============ drm_sysfb_modeset_test (1 subtest) ============
[11:13:23] ============ drm_test_sysfb_build_fourcc_list  =============
[11:13:23] [PASSED] no native formats
[11:13:23] [PASSED] XRGB8888 as native format
[11:13:23] [PASSED] remove duplicates
[11:13:23] [PASSED] convert alpha formats
[11:13:23] [PASSED] random formats
[11:13:23] ======== [PASSED] drm_test_sysfb_build_fourcc_list =========
[11:13:23] ============= [PASSED] drm_sysfb_modeset_test ==============
[11:13:23] ================== drm_fixp (2 subtests) ===================
[11:13:23] [PASSED] drm_test_int2fixp
[11:13:23] [PASSED] drm_test_sm2fixp
[11:13:23] ==================== [PASSED] drm_fixp =====================
[11:13:23] ============================================================
[11:13:23] Testing complete. Ran 621 tests: passed: 621
[11:13:24] Elapsed time: 26.253s total, 1.775s configuring, 24.312s building, 0.131s running

+ /kernel/tools/testing/kunit/kunit.py run --kunitconfig /kernel/drivers/gpu/drm/ttm/tests/.kunitconfig
[11:13:24] Configuring KUnit Kernel ...
Regenerating .config ...
Populating config with:
$ make ARCH=um O=.kunit olddefconfig
[11:13:25] Building KUnit Kernel ...
Populating config with:
$ make ARCH=um O=.kunit olddefconfig
Building with:
$ make all compile_commands.json scripts_gdb ARCH=um O=.kunit --jobs=48
[11:13:35] Starting KUnit Kernel (1/1)...
[11:13:35] ============================================================
Running tests with:
$ .kunit/linux kunit.enable=1 mem=1G console=tty kunit_shutdown=halt
[11:13:35] ================= ttm_device (5 subtests) ==================
[11:13:35] [PASSED] ttm_device_init_basic
[11:13:35] [PASSED] ttm_device_init_multiple
[11:13:35] [PASSED] ttm_device_fini_basic
[11:13:35] [PASSED] ttm_device_init_no_vma_man
[11:13:35] ================== ttm_device_init_pools  ==================
[11:13:35] [PASSED] No DMA allocations, no DMA32 required
[11:13:35] [PASSED] DMA allocations, DMA32 required
[11:13:35] [PASSED] No DMA allocations, DMA32 required
[11:13:35] [PASSED] DMA allocations, no DMA32 required
[11:13:35] ============== [PASSED] ttm_device_init_pools ==============
[11:13:35] =================== [PASSED] ttm_device ====================
[11:13:35] ================== ttm_pool (8 subtests) ===================
[11:13:35] ================== ttm_pool_alloc_basic  ===================
[11:13:35] [PASSED] One page
[11:13:35] [PASSED] More than one page
[11:13:35] [PASSED] Above the allocation limit
[11:13:35] [PASSED] One page, with coherent DMA mappings enabled
[11:13:35] [PASSED] Above the allocation limit, with coherent DMA mappings enabled
[11:13:35] ============== [PASSED] ttm_pool_alloc_basic ===============
[11:13:35] ============== ttm_pool_alloc_basic_dma_addr  ==============
[11:13:35] [PASSED] One page
[11:13:35] [PASSED] More than one page
[11:13:35] [PASSED] Above the allocation limit
[11:13:35] [PASSED] One page, with coherent DMA mappings enabled
[11:13:35] [PASSED] Above the allocation limit, with coherent DMA mappings enabled
[11:13:35] ========== [PASSED] ttm_pool_alloc_basic_dma_addr ==========
[11:13:35] [PASSED] ttm_pool_alloc_order_caching_match
[11:13:35] [PASSED] ttm_pool_alloc_caching_mismatch
[11:13:35] [PASSED] ttm_pool_alloc_order_mismatch
[11:13:35] [PASSED] ttm_pool_free_dma_alloc
[11:13:35] [PASSED] ttm_pool_free_no_dma_alloc
[11:13:35] [PASSED] ttm_pool_fini_basic
[11:13:35] ==================== [PASSED] ttm_pool =====================
[11:13:35] ================ ttm_resource (8 subtests) =================
[11:13:35] ================= ttm_resource_init_basic  =================
[11:13:35] [PASSED] Init resource in TTM_PL_SYSTEM
[11:13:35] [PASSED] Init resource in TTM_PL_VRAM
[11:13:35] [PASSED] Init resource in a private placement
[11:13:35] [PASSED] Init resource in TTM_PL_SYSTEM, set placement flags
[11:13:35] ============= [PASSED] ttm_resource_init_basic =============
[11:13:35] [PASSED] ttm_resource_init_pinned
[11:13:35] [PASSED] ttm_resource_fini_basic
[11:13:35] [PASSED] ttm_resource_manager_init_basic
[11:13:35] [PASSED] ttm_resource_manager_usage_basic
[11:13:35] [PASSED] ttm_resource_manager_set_used_basic
[11:13:35] [PASSED] ttm_sys_man_alloc_basic
[11:13:35] [PASSED] ttm_sys_man_free_basic
[11:13:35] ================== [PASSED] ttm_resource ===================
[11:13:35] =================== ttm_tt (15 subtests) ===================
[11:13:35] ==================== ttm_tt_init_basic  ====================
[11:13:35] [PASSED] Page-aligned size
[11:13:35] [PASSED] Extra pages requested
[11:13:35] ================ [PASSED] ttm_tt_init_basic ================
[11:13:35] [PASSED] ttm_tt_init_misaligned
[11:13:35] [PASSED] ttm_tt_fini_basic
[11:13:35] [PASSED] ttm_tt_fini_sg
[11:13:35] [PASSED] ttm_tt_fini_shmem
[11:13:35] [PASSED] ttm_tt_create_basic
[11:13:35] [PASSED] ttm_tt_create_invalid_bo_type
[11:13:35] [PASSED] ttm_tt_create_ttm_exists
[11:13:35] [PASSED] ttm_tt_create_failed
[11:13:35] [PASSED] ttm_tt_destroy_basic
[11:13:35] [PASSED] ttm_tt_populate_null_ttm
[11:13:35] [PASSED] ttm_tt_populate_populated_ttm
[11:13:35] [PASSED] ttm_tt_unpopulate_basic
[11:13:35] [PASSED] ttm_tt_unpopulate_empty_ttm
[11:13:35] [PASSED] ttm_tt_swapin_basic
[11:13:35] ===================== [PASSED] ttm_tt ======================
[11:13:35] =================== ttm_bo (14 subtests) ===================
[11:13:35] =========== ttm_bo_reserve_optimistic_no_ticket  ===========
[11:13:35] [PASSED] Cannot be interrupted and sleeps
[11:13:35] [PASSED] Cannot be interrupted, locks straight away
[11:13:35] [PASSED] Can be interrupted, sleeps
[11:13:35] ======= [PASSED] ttm_bo_reserve_optimistic_no_ticket =======
[11:13:35] [PASSED] ttm_bo_reserve_locked_no_sleep
[11:13:35] [PASSED] ttm_bo_reserve_no_wait_ticket
[11:13:35] [PASSED] ttm_bo_reserve_double_resv
[11:13:35] [PASSED] ttm_bo_reserve_interrupted
[11:13:35] [PASSED] ttm_bo_reserve_deadlock
[11:13:35] [PASSED] ttm_bo_unreserve_basic
[11:13:35] [PASSED] ttm_bo_unreserve_pinned
[11:13:35] [PASSED] ttm_bo_unreserve_bulk
[11:13:35] [PASSED] ttm_bo_fini_basic
[11:13:35] [PASSED] ttm_bo_fini_shared_resv
[11:13:35] [PASSED] ttm_bo_pin_basic
[11:13:35] [PASSED] ttm_bo_pin_unpin_resource
[11:13:35] [PASSED] ttm_bo_multiple_pin_one_unpin
[11:13:35] ===================== [PASSED] ttm_bo ======================
[11:13:35] ============== ttm_bo_validate (22 subtests) ===============
[11:13:35] ============== ttm_bo_init_reserved_sys_man  ===============
[11:13:35] [PASSED] Buffer object for userspace
[11:13:35] [PASSED] Kernel buffer object
[11:13:35] [PASSED] Shared buffer object
[11:13:35] ========== [PASSED] ttm_bo_init_reserved_sys_man ===========
[11:13:35] ============== ttm_bo_init_reserved_mock_man  ==============
[11:13:35] [PASSED] Buffer object for userspace
[11:13:35] [PASSED] Kernel buffer object
[11:13:35] [PASSED] Shared buffer object
[11:13:35] ========== [PASSED] ttm_bo_init_reserved_mock_man ==========
[11:13:35] [PASSED] ttm_bo_init_reserved_resv
[11:13:35] ================== ttm_bo_validate_basic  ==================
[11:13:35] [PASSED] Buffer object for userspace
[11:13:35] [PASSED] Kernel buffer object
[11:13:35] [PASSED] Shared buffer object
[11:13:35] ============== [PASSED] ttm_bo_validate_basic ==============
[11:13:35] [PASSED] ttm_bo_validate_invalid_placement
[11:13:35] ============= ttm_bo_validate_same_placement  ==============
[11:13:35] [PASSED] System manager
[11:13:35] [PASSED] VRAM manager
[11:13:35] ========= [PASSED] ttm_bo_validate_same_placement ==========
[11:13:35] [PASSED] ttm_bo_validate_failed_alloc
[11:13:35] [PASSED] ttm_bo_validate_pinned
[11:13:35] [PASSED] ttm_bo_validate_busy_placement
[11:13:35] ================ ttm_bo_validate_multihop  =================
[11:13:35] [PASSED] Buffer object for userspace
[11:13:35] [PASSED] Kernel buffer object
[11:13:35] [PASSED] Shared buffer object
[11:13:35] ============ [PASSED] ttm_bo_validate_multihop =============
[11:13:35] ========== ttm_bo_validate_no_placement_signaled  ==========
[11:13:35] [PASSED] Buffer object in system domain, no page vector
[11:13:35] [PASSED] Buffer object in system domain with an existing page vector
[11:13:35] ====== [PASSED] ttm_bo_validate_no_placement_signaled ======
[11:13:35] ======== ttm_bo_validate_no_placement_not_signaled  ========
[11:13:35] [PASSED] Buffer object for userspace
[11:13:35] [PASSED] Kernel buffer object
[11:13:35] [PASSED] Shared buffer object
[11:13:35] ==== [PASSED] ttm_bo_validate_no_placement_not_signaled ====
[11:13:35] [PASSED] ttm_bo_validate_move_fence_signaled
[11:13:35] ========= ttm_bo_validate_move_fence_not_signaled  =========
[11:13:35] [PASSED] Waits for GPU
[11:13:35] [PASSED] Tries to lock straight away
[11:13:35] ===== [PASSED] ttm_bo_validate_move_fence_not_signaled =====
[11:13:35] [PASSED] ttm_bo_validate_swapout
[11:13:35] [PASSED] ttm_bo_validate_happy_evict
[11:13:35] [PASSED] ttm_bo_validate_all_pinned_evict
[11:13:35] [PASSED] ttm_bo_validate_allowed_only_evict
[11:13:35] [PASSED] ttm_bo_validate_deleted_evict
[11:13:35] [PASSED] ttm_bo_validate_busy_domain_evict
[11:13:35] [PASSED] ttm_bo_validate_evict_gutting
[11:13:35] [PASSED] ttm_bo_validate_recrusive_evict
[11:13:35] ================= [PASSED] ttm_bo_validate =================
[11:13:35] ============================================================
[11:13:35] Testing complete. Ran 102 tests: passed: 102
[11:13:35] Elapsed time: 11.663s total, 1.771s configuring, 9.677s building, 0.187s running

+ cleanup
++ stat -c %u:%g /kernel
+ chown -R 1003:1003 /kernel

✗ Xe.CI.BAT: failure for drm/{i915, xe}: display (runtime) suspend/resume/shutdown unification

[Patchwork]

[-- Attachment #1: Type: text/plain, Size: 1743 bytes --]

== Series Details ==

Series: drm/{i915, xe}: display (runtime) suspend/resume/shutdown unification
URL   : https://patchwork.freedesktop.org/series/167536/
State : failure

== Summary ==

CI Bug Log - changes from xe-5157-0da1169d23e072343c8076d30551993343d1050e_BAT -> xe-pw-167536v1_BAT
====================================================

Summary
-------

  **FAILURE**

  Serious unknown changes coming with xe-pw-167536v1_BAT absolutely need to be
  verified manually.
  
  If you think the reported changes have nothing to do with the changes
  introduced in xe-pw-167536v1_BAT, please notify your bug team (I915-ci-infra@lists.freedesktop.org) to allow them
  to document this new failure mode, which will reduce false positives in CI.

  

Participating hosts (13 -> 13)
------------------------------

  No changes in participating hosts

Possible new issues
-------------------

  Here are the unknown changes that may have been introduced in xe-pw-167536v1_BAT:

### IGT changes ###

#### Possible regressions ####

  * igt@xe_query@multigpu-query-topology:
    - bat-bmg-3:          [PASS][1] -> [ABORT][2]
   [1]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-5157-0da1169d23e072343c8076d30551993343d1050e/bat-bmg-3/igt@xe_query@multigpu-query-topology.html
   [2]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-pw-167536v1/bat-bmg-3/igt@xe_query@multigpu-query-topology.html

  


Build changes
-------------

  * Linux: xe-5157-0da1169d23e072343c8076d30551993343d1050e -> xe-pw-167536v1

  IGT_8943: 8943
  xe-5157-0da1169d23e072343c8076d30551993343d1050e: 0da1169d23e072343c8076d30551993343d1050e
  xe-pw-167536v1: 167536v1

== Logs ==

For more details see: https://intel-gfx-ci.01.org/tree/intel-xe/xe-pw-167536v1/index.html

[-- Attachment #2: Type: text/html, Size: 2328 bytes --]

✗ i915.CI.BAT: failure for drm/{i915, xe}: display (runtime) suspend/resume/shutdown unification

[Patchwork]

[-- Attachment #1: Type: text/plain, Size: 1835 bytes --]

== Series Details ==

Series: drm/{i915, xe}: display (runtime) suspend/resume/shutdown unification
URL   : https://patchwork.freedesktop.org/series/167535/
State : failure

== Summary ==

CI Bug Log - changes from CI_DRM_18582 -> Patchwork_167535v1
====================================================

Summary
-------

  **FAILURE**

  Serious unknown changes coming with Patchwork_167535v1 absolutely need to be
  verified manually.
  
  If you think the reported changes have nothing to do with the changes
  introduced in Patchwork_167535v1, please notify your bug team (I915-ci-infra@lists.freedesktop.org) 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_167535v1/index.html

Participating hosts (42 -> 39)
------------------------------

  Missing    (3): bat-dg2-13 fi-snb-2520m bat-twl-2 

Possible new issues
-------------------

  Here are the unknown changes that may have been introduced in Patchwork_167535v1:

### IGT changes ###

#### Possible regressions ####

  * igt@i915_pm_rpm@module-reload:
    - bat-atsm-1:         [PASS][1] -> [SKIP][2]
   [1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_18582/bat-atsm-1/igt@i915_pm_rpm@module-reload.html
   [2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_167535v1/bat-atsm-1/igt@i915_pm_rpm@module-reload.html

  


Build changes
-------------

  * Linux: CI_DRM_18582 -> Patchwork_167535v1

  CI-20190529: 20190529
  CI_DRM_18582: 8771b84f729f96c7709cf5fe96773ae5b21a9162 @ git://anongit.freedesktop.org/gfx-ci/linux
  IGT_8943: 8943
  Patchwork_167535v1: 8771b84f729f96c7709cf5fe96773ae5b21a9162 @ git://anongit.freedesktop.org/gfx-ci/linux

== Logs ==

For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_167535v1/index.html

[-- Attachment #2: Type: text/html, Size: 2437 bytes --]

Re: [PATCH 03/24] drm/i915: add flush_workqueue(display->wq.cleanup) on shutdown

[Ville Syrjälä]

On Fri, May 29, 2026 at 02:03:47PM +0300, Jani Nikula wrote:
> We're missing the cleanup workqueue flush on the shutdown path. Add it.
> 
> Unfortunately have to briefly include intel_display_core.c here. To be
> removed later.
> 
> Link: https://lore.kernel.org/r/agRp6Was9FCQbKee@intel.com
> Suggested-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
> Signed-off-by: Jani Nikula <jani.nikula@intel.com>
> ---
>  drivers/gpu/drm/i915/i915_driver.c | 3 +++
>  1 file changed, 3 insertions(+)
> 
> diff --git a/drivers/gpu/drm/i915/i915_driver.c b/drivers/gpu/drm/i915/i915_driver.c
> index 93940cfe91a0..60d5e06675ab 100644
> --- a/drivers/gpu/drm/i915/i915_driver.c
> +++ b/drivers/gpu/drm/i915/i915_driver.c
> @@ -54,6 +54,7 @@
>  #include "display/intel_bw.h"
>  #include "display/intel_cdclk.h"
>  #include "display/intel_crtc.h"
> +#include "display/intel_display_core.h"
>  #include "display/intel_display_device.h"
>  #include "display/intel_display_driver.h"
>  #include "display/intel_display_power.h"
> @@ -1053,6 +1054,8 @@ void i915_driver_shutdown(struct drm_i915_private *i915)
>  		drm_atomic_helper_shutdown(&i915->drm);
>  	}
>  
> +	flush_workqueue(display->wq.cleanup);

The suspend case explicitly needed this for the DPT eviction.
Not sure why xe needs it for shutdown, but doing it the same
way for suspend vs. shutdown doesn't seem like a particularly
bad idea regardless.

Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>

> +
>  	intel_dp_mst_suspend(display);
>  
>  	intel_encoder_block_all_hpds(display);
> -- 
> 2.47.3

-- 
Ville Syrjälä
Intel

Re: [PATCH 04/24] drm/xe/display: remove intel_display_flush_cleanup_work() calls on suspend/shutdown

[Ville Syrjälä]

On Fri, May 29, 2026 at 02:03:48PM +0300, Jani Nikula wrote:
> intel_display_driver_suspend() already has drm_atomic_helper_suspend()
> and cleanup workqueue flush. The intel_display_flush_cleanup_work()
> calls on suspend/shutdown should be redundant. Remove.
> 
> Link: https://lore.kernel.org/r/agRp6Was9FCQbKee@intel.com
> Suggested-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
> Signed-off-by: Jani Nikula <jani.nikula@intel.com>
> ---
>  drivers/gpu/drm/xe/display/xe_display.c | 3 ---
>  1 file changed, 3 deletions(-)
> 
> diff --git a/drivers/gpu/drm/xe/display/xe_display.c b/drivers/gpu/drm/xe/display/xe_display.c
> index c0d3e7d12823..6e82dc70ca89 100644
> --- a/drivers/gpu/drm/xe/display/xe_display.c
> +++ b/drivers/gpu/drm/xe/display/xe_display.c
> @@ -312,8 +312,6 @@ void xe_display_pm_suspend(struct xe_device *xe)
>  		intel_display_driver_suspend(display);
>  	}
>  
> -	intel_display_flush_cleanup_work(display);
> -
>  	intel_encoder_block_all_hpds(display);
>  
>  	intel_hpd_cancel_work(display);
> @@ -344,7 +342,6 @@ void xe_display_pm_shutdown(struct xe_device *xe)
>  		intel_display_driver_suspend(display);
>  	}
>  
> -	intel_display_flush_cleanup_work(display);

Hmm, apparently the super funky d3cold path still has one call
remaining so can't remove it completely quite yet. Oh well, at
least we're moving to a better direction.

Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>

>  	intel_dp_mst_suspend(display);
>  	intel_encoder_block_all_hpds(display);
>  	intel_hpd_cancel_work(display);
> -- 
> 2.47.3

-- 
Ville Syrjälä
Intel

Re: [PATCH 05/24] drm/xe/display: drop duplicate intel_dp_mst_suspend() call

[Ville Syrjälä]

On Fri, May 29, 2026 at 02:03:49PM +0300, Jani Nikula wrote:
> intel_display_driver_suspend() already calls
> intel_dp_mst_suspend(). Remove the duplicate call.
> 
> Signed-off-by: Jani Nikula <jani.nikula@intel.com>

Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>

> ---
>  drivers/gpu/drm/xe/display/xe_display.c | 1 -
>  1 file changed, 1 deletion(-)
> 
> diff --git a/drivers/gpu/drm/xe/display/xe_display.c b/drivers/gpu/drm/xe/display/xe_display.c
> index 6e82dc70ca89..8d55e7a37d6d 100644
> --- a/drivers/gpu/drm/xe/display/xe_display.c
> +++ b/drivers/gpu/drm/xe/display/xe_display.c
> @@ -342,7 +342,6 @@ void xe_display_pm_shutdown(struct xe_device *xe)
>  		intel_display_driver_suspend(display);
>  	}
>  
> -	intel_dp_mst_suspend(display);
>  	intel_encoder_block_all_hpds(display);
>  	intel_hpd_cancel_work(display);
>  
> -- 
> 2.47.3

-- 
Ville Syrjälä
Intel

Re: [PATCH 06/24] drm/i915/display: add "pm" to intel_display_driver_{suspend,resume}() names

[Ville Syrjälä]

On Fri, May 29, 2026 at 02:03:50PM +0300, Jani Nikula wrote:
> Start naming the functions that are supposed to be called from the
> struct dem_pm_ops hooks with intel_display_driver_pm_*() to distinguish
> them better from the rest.

I guess this slightly conflicts with the i915 approach where the
_pm_ naming was restricted to the functions that directly
implement the pm ops, and the stuff they call didn't have the
_pm_ and instead used _drm_ naming, perhaps because they also
get called from the switcheroo paths. But the switcheroo stuff
should really just use be part of the normal device pm framework
so the _pm_ naming there wouldn't be wrong in my book either.

Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>

> 
> Signed-off-by: Jani Nikula <jani.nikula@intel.com>
> ---
>  drivers/gpu/drm/i915/display/intel_display_driver.c |  4 ++--
>  drivers/gpu/drm/i915/display/intel_display_driver.h |  5 +++--
>  drivers/gpu/drm/i915/i915_driver.c                  | 12 ++++++------
>  drivers/gpu/drm/xe/display/xe_display.c             |  6 +++---
>  4 files changed, 14 insertions(+), 13 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/display/intel_display_driver.c b/drivers/gpu/drm/i915/display/intel_display_driver.c
> index d0729936f681..9be4c94740dc 100644
> --- a/drivers/gpu/drm/i915/display/intel_display_driver.c
> +++ b/drivers/gpu/drm/i915/display/intel_display_driver.c
> @@ -678,7 +678,7 @@ void intel_display_driver_unregister(struct intel_display *display)
>   * turn all crtc's off, but do not adjust state
>   * This has to be paired with a call to intel_modeset_setup_hw_state.
>   */
> -int intel_display_driver_suspend(struct intel_display *display)
> +int intel_display_driver_pm_suspend(struct intel_display *display)
>  {
>  	struct drm_atomic_commit *state;
>  	int ret;
> @@ -741,7 +741,7 @@ __intel_display_driver_resume(struct intel_display *display,
>  	return ret;
>  }
>  
> -void intel_display_driver_resume(struct intel_display *display)
> +void intel_display_driver_pm_resume(struct intel_display *display)
>  {
>  	struct drm_atomic_commit *state = display->restore.modeset_state;
>  	struct drm_modeset_acquire_ctx ctx;
> diff --git a/drivers/gpu/drm/i915/display/intel_display_driver.h b/drivers/gpu/drm/i915/display/intel_display_driver.h
> index 5270c26a32e0..d8a08ca68d4e 100644
> --- a/drivers/gpu/drm/i915/display/intel_display_driver.h
> +++ b/drivers/gpu/drm/i915/display/intel_display_driver.h
> @@ -24,8 +24,9 @@ void intel_display_driver_remove(struct intel_display *display);
>  void intel_display_driver_remove_noirq(struct intel_display *display);
>  void intel_display_driver_remove_nogem(struct intel_display *display);
>  void intel_display_driver_unregister(struct intel_display *display);
> -int intel_display_driver_suspend(struct intel_display *display);
> -void intel_display_driver_resume(struct intel_display *display);
> +
> +int intel_display_driver_pm_suspend(struct intel_display *display);
> +void intel_display_driver_pm_resume(struct intel_display *display);
>  
>  /* interface for intel_display_reset.c */
>  int __intel_display_driver_resume(struct intel_display *display,
> diff --git a/drivers/gpu/drm/i915/i915_driver.c b/drivers/gpu/drm/i915/i915_driver.c
> index 60d5e06675ab..bd73d64c1ccb 100644
> --- a/drivers/gpu/drm/i915/i915_driver.c
> +++ b/drivers/gpu/drm/i915/i915_driver.c
> @@ -1114,10 +1114,10 @@ static int i915_drm_prepare(struct drm_device *dev)
>  	intel_pxp_suspend_prepare(i915->pxp);
>  
>  	/*
> -	 * NB intel_display_driver_suspend() may issue new requests after we've
> -	 * ostensibly marked the GPU as ready-to-sleep here. We need to
> -	 * split out that work and pull it forward so that after point,
> -	 * the GPU is not woken again.
> +	 * NB intel_display_driver_pm_suspend() may issue new requests after
> +	 * we've ostensibly marked the GPU as ready-to-sleep here. We need to
> +	 * split out that work and pull it forward so that after point, the GPU
> +	 * is not woken again.
>  	 */
>  	return i915_gem_backup_suspend(i915);
>  }
> @@ -1139,7 +1139,7 @@ static int i915_drm_suspend(struct drm_device *dev)
>  		intel_display_driver_disable_user_access(display);
>  	}
>  
> -	intel_display_driver_suspend(display);
> +	intel_display_driver_pm_suspend(display);
>  
>  	intel_encoder_block_all_hpds(display);
>  
> @@ -1325,7 +1325,7 @@ static int i915_drm_resume(struct drm_device *dev)
>  
>  	intel_encoder_unblock_all_hpds(display);
>  
> -	intel_display_driver_resume(display);
> +	intel_display_driver_pm_resume(display);
>  
>  	if (intel_display_device_present(display)) {
>  		intel_display_driver_enable_user_access(display);
> diff --git a/drivers/gpu/drm/xe/display/xe_display.c b/drivers/gpu/drm/xe/display/xe_display.c
> index 8d55e7a37d6d..d1c450a18713 100644
> --- a/drivers/gpu/drm/xe/display/xe_display.c
> +++ b/drivers/gpu/drm/xe/display/xe_display.c
> @@ -309,7 +309,7 @@ void xe_display_pm_suspend(struct xe_device *xe)
>  	if (intel_display_device_present(display)) {
>  		drm_kms_helper_poll_disable(&xe->drm);
>  		intel_display_driver_disable_user_access(display);
> -		intel_display_driver_suspend(display);
> +		intel_display_driver_pm_suspend(display);
>  	}
>  
>  	intel_encoder_block_all_hpds(display);
> @@ -339,7 +339,7 @@ void xe_display_pm_shutdown(struct xe_device *xe)
>  	if (intel_display_device_present(display)) {
>  		drm_kms_helper_poll_disable(&xe->drm);
>  		intel_display_driver_disable_user_access(display);
> -		intel_display_driver_suspend(display);
> +		intel_display_driver_pm_suspend(display);
>  	}
>  
>  	intel_encoder_block_all_hpds(display);
> @@ -447,7 +447,7 @@ void xe_display_pm_resume(struct xe_device *xe)
>  	intel_encoder_unblock_all_hpds(display);
>  
>  	if (intel_display_device_present(display)) {
> -		intel_display_driver_resume(display);
> +		intel_display_driver_pm_resume(display);
>  		intel_display_driver_enable_user_access(display);
>  		drm_kms_helper_poll_enable(&xe->drm);
>  	}
> -- 
> 2.47.3

-- 
Ville Syrjälä
Intel

Re: [PATCH 07/24] drm/xe/display: rename xe_display_pm_shutdown*() to xe_display_shutdown*()

[Ville Syrjälä]

On Fri, May 29, 2026 at 02:03:51PM +0300, Jani Nikula wrote:
> The shutdown functions get called from the struct pci_driver .shutdown
> hook, not through the struct dev_pm_ops hooks. Name accordingly,
> dropping the "pm" from the name, even if shutdown has a lot of
> similarities with suspend.
> 
> Signed-off-by: Jani Nikula <jani.nikula@intel.com>

Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>

> ---
>  drivers/gpu/drm/xe/display/xe_display.c |  4 ++--
>  drivers/gpu/drm/xe/display/xe_display.h | 10 ++++++----
>  drivers/gpu/drm/xe/xe_device.c          |  4 ++--
>  3 files changed, 10 insertions(+), 8 deletions(-)
> 
> diff --git a/drivers/gpu/drm/xe/display/xe_display.c b/drivers/gpu/drm/xe/display/xe_display.c
> index d1c450a18713..3567b3018083 100644
> --- a/drivers/gpu/drm/xe/display/xe_display.c
> +++ b/drivers/gpu/drm/xe/display/xe_display.c
> @@ -326,7 +326,7 @@ void xe_display_pm_suspend(struct xe_device *xe)
>  	intel_dmc_suspend(display);
>  }
>  
> -void xe_display_pm_shutdown(struct xe_device *xe)
> +void xe_display_shutdown(struct xe_device *xe)
>  {
>  	struct intel_display *display = xe->display;
>  
> @@ -400,7 +400,7 @@ void xe_display_pm_runtime_suspend_late(struct xe_device *xe)
>  	intel_dmc_wl_flush_release_work(display);
>  }
>  
> -void xe_display_pm_shutdown_late(struct xe_device *xe)
> +void xe_display_shutdown_late(struct xe_device *xe)
>  {
>  	struct intel_display *display = xe->display;
>  
> diff --git a/drivers/gpu/drm/xe/display/xe_display.h b/drivers/gpu/drm/xe/display/xe_display.h
> index 60291cb154df..e5f9aed93206 100644
> --- a/drivers/gpu/drm/xe/display/xe_display.h
> +++ b/drivers/gpu/drm/xe/display/xe_display.h
> @@ -29,15 +29,16 @@ int xe_display_init(struct xe_device *xe);
>  void xe_display_register(struct xe_device *xe);
>  void xe_display_unregister(struct xe_device *xe);
>  
> +void xe_display_shutdown(struct xe_device *xe);
> +void xe_display_shutdown_late(struct xe_device *xe);
> +
>  void xe_display_irq_handler(struct xe_device *xe, u32 master_ctl);
>  void xe_display_irq_enable(struct xe_device *xe, u32 gu_misc_iir);
>  void xe_display_irq_reset(struct xe_device *xe);
>  void xe_display_irq_postinstall(struct xe_device *xe);
>  
>  void xe_display_pm_suspend(struct xe_device *xe);
> -void xe_display_pm_shutdown(struct xe_device *xe);
>  void xe_display_pm_suspend_late(struct xe_device *xe);
> -void xe_display_pm_shutdown_late(struct xe_device *xe);
>  void xe_display_pm_resume_early(struct xe_device *xe);
>  void xe_display_pm_resume(struct xe_device *xe);
>  void xe_display_pm_runtime_suspend(struct xe_device *xe);
> @@ -65,15 +66,16 @@ static inline int xe_display_init(struct xe_device *xe) { return 0; }
>  static inline void xe_display_register(struct xe_device *xe) {}
>  static inline void xe_display_unregister(struct xe_device *xe) {}
>  
> +static inline void xe_display_shutdown(struct xe_device *xe) {}
> +static inline void xe_display_shutdown_late(struct xe_device *xe) {}
> +
>  static inline void xe_display_irq_handler(struct xe_device *xe, u32 master_ctl) {}
>  static inline void xe_display_irq_enable(struct xe_device *xe, u32 gu_misc_iir) {}
>  static inline void xe_display_irq_reset(struct xe_device *xe) {}
>  static inline void xe_display_irq_postinstall(struct xe_device *xe) {}
>  
>  static inline void xe_display_pm_suspend(struct xe_device *xe) {}
> -static inline void xe_display_pm_shutdown(struct xe_device *xe) {}
>  static inline void xe_display_pm_suspend_late(struct xe_device *xe) {}
> -static inline void xe_display_pm_shutdown_late(struct xe_device *xe) {}
>  static inline void xe_display_pm_resume_early(struct xe_device *xe) {}
>  static inline void xe_display_pm_resume(struct xe_device *xe) {}
>  static inline void xe_display_pm_runtime_suspend(struct xe_device *xe) {}
> diff --git a/drivers/gpu/drm/xe/xe_device.c b/drivers/gpu/drm/xe/xe_device.c
> index d224861b6f6f..ec065b168bb9 100644
> --- a/drivers/gpu/drm/xe/xe_device.c
> +++ b/drivers/gpu/drm/xe/xe_device.c
> @@ -1128,14 +1128,14 @@ void xe_device_shutdown(struct xe_device *xe)
>  
>  	drm_dbg(&xe->drm, "Shutting down device\n");
>  
> -	xe_display_pm_shutdown(xe);
> +	xe_display_shutdown(xe);
>  
>  	xe_irq_suspend(xe);
>  
>  	for_each_gt(gt, xe, id)
>  		xe_gt_shutdown(gt);
>  
> -	xe_display_pm_shutdown_late(xe);
> +	xe_display_shutdown_late(xe);
>  
>  	if (!xe_driver_flr_disabled(xe)) {
>  		/* BOOM! */
> -- 
> 2.47.3

-- 
Ville Syrjälä
Intel

Re: [PATCH 10/24] drm/{i915,xe}: move more calls inside intel_display_driver_pm_suspend()

[Ville Syrjälä]

On Fri, May 29, 2026 at 02:03:54PM +0300, Jani Nikula wrote:
> The intel_display_driver_pm_suspend() calls are surrounded by near
> identical display calls. Move the calls inside
> intel_display_driver_pm_suspend().
> 
> There's a slight functional change in that
> intel_display_driver_pm_suspend() returns early for
> !HAS_DISPLAY(). Assume this is what we want, and there are no cases
> where display engine is present but all pipes have been fused off.
> 
> Signed-off-by: Jani Nikula <jani.nikula@intel.com>

Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>

> ---
>  .../drm/i915/display/intel_display_driver.c   | 11 ++++++++++
>  drivers/gpu/drm/i915/i915_driver.c            |  9 --------
>  drivers/gpu/drm/xe/display/xe_display.c       | 22 ++-----------------
>  3 files changed, 13 insertions(+), 29 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/display/intel_display_driver.c b/drivers/gpu/drm/i915/display/intel_display_driver.c
> index 9be4c94740dc..41a2244985fa 100644
> --- a/drivers/gpu/drm/i915/display/intel_display_driver.c
> +++ b/drivers/gpu/drm/i915/display/intel_display_driver.c
> @@ -686,6 +686,17 @@ int intel_display_driver_pm_suspend(struct intel_display *display)
>  	if (!HAS_DISPLAY(display))
>  		return 0;
>  
> +	/*
> +	 * We do a lot of poking in a lot of registers, make sure they work
> +	 * properly.
> +	 */
> +	intel_display_power_disable(display);
> +
> +	drm_client_dev_suspend(display->drm);
> +
> +	drm_kms_helper_poll_disable(display->drm);
> +	intel_display_driver_disable_user_access(display);
> +
>  	state = drm_atomic_helper_suspend(display->drm);
>  	ret = PTR_ERR_OR_ZERO(state);
>  	if (ret)
> diff --git a/drivers/gpu/drm/i915/i915_driver.c b/drivers/gpu/drm/i915/i915_driver.c
> index bd73d64c1ccb..f161723f653e 100644
> --- a/drivers/gpu/drm/i915/i915_driver.c
> +++ b/drivers/gpu/drm/i915/i915_driver.c
> @@ -1130,15 +1130,6 @@ static int i915_drm_suspend(struct drm_device *dev)
>  
>  	disable_rpm_wakeref_asserts(&dev_priv->runtime_pm);
>  
> -	/* We do a lot of poking in a lot of registers, make sure they work
> -	 * properly. */
> -	intel_display_power_disable(display);
> -	drm_client_dev_suspend(dev);
> -	if (intel_display_device_present(display)) {
> -		drm_kms_helper_poll_disable(dev);
> -		intel_display_driver_disable_user_access(display);
> -	}
> -
>  	intel_display_driver_pm_suspend(display);
>  
>  	intel_encoder_block_all_hpds(display);
> diff --git a/drivers/gpu/drm/xe/display/xe_display.c b/drivers/gpu/drm/xe/display/xe_display.c
> index 38ebcc2b712a..027db7b6ceb5 100644
> --- a/drivers/gpu/drm/xe/display/xe_display.c
> +++ b/drivers/gpu/drm/xe/display/xe_display.c
> @@ -198,14 +198,7 @@ void xe_display_shutdown(struct xe_device *xe)
>  	if (!xe->info.probe_display)
>  		return;
>  
> -	intel_display_power_disable(display);
> -	drm_client_dev_suspend(&xe->drm);
> -
> -	if (intel_display_device_present(display)) {
> -		drm_kms_helper_poll_disable(&xe->drm);
> -		intel_display_driver_disable_user_access(display);
> -		intel_display_driver_pm_suspend(display);
> -	}
> +	intel_display_driver_pm_suspend(display);
>  
>  	intel_encoder_block_all_hpds(display);
>  	intel_hpd_cancel_work(display);
> @@ -297,18 +290,7 @@ void xe_display_pm_suspend(struct xe_device *xe)
>  	if (!xe->info.probe_display)
>  		return;
>  
> -	/*
> -	 * We do a lot of poking in a lot of registers, make sure they work
> -	 * properly.
> -	 */
> -	intel_display_power_disable(display);
> -	drm_client_dev_suspend(&xe->drm);
> -
> -	if (intel_display_device_present(display)) {
> -		drm_kms_helper_poll_disable(&xe->drm);
> -		intel_display_driver_disable_user_access(display);
> -		intel_display_driver_pm_suspend(display);
> -	}
> +	intel_display_driver_pm_suspend(display);
>  
>  	intel_encoder_block_all_hpds(display);
>  
> -- 
> 2.47.3

-- 
Ville Syrjälä
Intel

Re: [PATCH 11/24] drm/{i915,xe}: move more calls inside intel_display_driver_pm_resume()

[Ville Syrjälä]

On Fri, May 29, 2026 at 02:03:55PM +0300, Jani Nikula wrote:
> The intel_display_driver_pm_resume() calls are surrounded by near
> identical display calls. Move the calls inside
> intel_display_driver_pm_resume().
> 
> There's a slight functional change in that
> intel_display_driver_pm_resume() returns early for
> !HAS_DISPLAY(). Assume this is what we want, and there are no cases
> where display engine is present but all pipes have been fused off.
> 
> Signed-off-by: Jani Nikula <jani.nikula@intel.com>

Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>

> ---
>  .../drm/i915/display/intel_display_driver.c   | 18 +++++++++++++++
>  drivers/gpu/drm/i915/i915_driver.c            | 19 ----------------
>  drivers/gpu/drm/xe/display/xe_display.c       | 22 +------------------
>  3 files changed, 19 insertions(+), 40 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/display/intel_display_driver.c b/drivers/gpu/drm/i915/display/intel_display_driver.c
> index 41a2244985fa..f362532c6834 100644
> --- a/drivers/gpu/drm/i915/display/intel_display_driver.c
> +++ b/drivers/gpu/drm/i915/display/intel_display_driver.c
> @@ -43,6 +43,7 @@
>  #include "intel_dp_tunnel.h"
>  #include "intel_dpll.h"
>  #include "intel_dpll_mgr.h"
> +#include "intel_encoder.h"
>  #include "intel_fb.h"
>  #include "intel_fbc.h"
>  #include "intel_fbdev.h"
> @@ -761,6 +762,12 @@ void intel_display_driver_pm_resume(struct intel_display *display)
>  	if (!HAS_DISPLAY(display))
>  		return;
>  
> +	intel_display_driver_resume_access(display);
> +
> +	intel_hpd_init(display);
> +
> +	intel_encoder_unblock_all_hpds(display);
> +
>  	/* MST sideband requires HPD interrupts enabled */
>  	intel_dp_mst_resume(display);
>  
> @@ -790,4 +797,15 @@ void intel_display_driver_pm_resume(struct intel_display *display)
>  			"Restoring old state failed with %i\n", ret);
>  	if (state)
>  		drm_atomic_commit_put(state);
> +
> +	intel_display_driver_enable_user_access(display);
> +	drm_kms_helper_poll_enable(display->drm);
> +
> +	intel_hpd_poll_disable(display);
> +
> +	intel_opregion_resume(display);
> +
> +	drm_client_dev_resume(display->drm);
> +
> +	intel_display_power_enable(display);
>  }
> diff --git a/drivers/gpu/drm/i915/i915_driver.c b/drivers/gpu/drm/i915/i915_driver.c
> index f161723f653e..063d4bdec2d9 100644
> --- a/drivers/gpu/drm/i915/i915_driver.c
> +++ b/drivers/gpu/drm/i915/i915_driver.c
> @@ -1309,27 +1309,8 @@ static int i915_drm_resume(struct drm_device *dev)
>  
>  	intel_clock_gating_init(&dev_priv->drm);
>  
> -	if (intel_display_device_present(display))
> -		intel_display_driver_resume_access(display);
> -
> -	intel_hpd_init(display);
> -
> -	intel_encoder_unblock_all_hpds(display);
> -
>  	intel_display_driver_pm_resume(display);
>  
> -	if (intel_display_device_present(display)) {
> -		intel_display_driver_enable_user_access(display);
> -		drm_kms_helper_poll_enable(dev);
> -	}
> -	intel_hpd_poll_disable(display);
> -
> -	intel_opregion_resume(display);
> -
> -	drm_client_dev_resume(dev);
> -
> -	intel_display_power_enable(display);
> -
>  	intel_gvt_resume(dev_priv);
>  
>  	enable_rpm_wakeref_asserts(&dev_priv->runtime_pm);
> diff --git a/drivers/gpu/drm/xe/display/xe_display.c b/drivers/gpu/drm/xe/display/xe_display.c
> index 027db7b6ceb5..f34a9d2ffc16 100644
> --- a/drivers/gpu/drm/xe/display/xe_display.c
> +++ b/drivers/gpu/drm/xe/display/xe_display.c
> @@ -341,27 +341,7 @@ void xe_display_pm_resume(struct xe_device *xe)
>  
>  	intel_display_driver_init_hw(display);
>  
> -	if (intel_display_device_present(display))
> -		intel_display_driver_resume_access(display);
> -
> -	intel_hpd_init(display);
> -
> -	intel_encoder_unblock_all_hpds(display);
> -
> -	if (intel_display_device_present(display)) {
> -		intel_display_driver_pm_resume(display);
> -		intel_display_driver_enable_user_access(display);
> -		drm_kms_helper_poll_enable(&xe->drm);
> -	}
> -
> -	if (intel_display_device_present(display))
> -		intel_hpd_poll_disable(display);
> -
> -	intel_opregion_resume(display);
> -
> -	drm_client_dev_resume(&xe->drm);
> -
> -	intel_display_power_enable(display);
> +	intel_display_driver_pm_resume(display);
>  }
>  
>  static void xe_display_enable_d3cold(struct xe_device *xe)
> -- 
> 2.47.3

-- 
Ville Syrjälä
Intel

Re: [PATCH 12/24] drm/{i915,xe}: add intel_display_driver_pm_{suspend_late,resume_early}()

[Ville Syrjälä]

On Fri, May 29, 2026 at 02:03:56PM +0300, Jani Nikula wrote:
> Add new functions intel_display_driver_pm_suspend_late() and
> intel_display_driver_pm_resume_early(), to be called from the
> corresponding struct dev_pm_ops hooks.
> 
> There's a slight functional change for !HAS_DISPLAY() in that the new
> functions return early. Assume this is what we want, and there are no
> cases where display engine is present but all pipes have been fused off.
> 
> Signed-off-by: Jani Nikula <jani.nikula@intel.com>

Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>

> ---
>  .../gpu/drm/i915/display/intel_display_driver.c  | 16 ++++++++++++++++
>  .../gpu/drm/i915/display/intel_display_driver.h  |  2 ++
>  drivers/gpu/drm/i915/i915_driver.c               |  6 +++---
>  drivers/gpu/drm/xe/display/xe_display.c          |  4 ++--
>  4 files changed, 23 insertions(+), 5 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/display/intel_display_driver.c b/drivers/gpu/drm/i915/display/intel_display_driver.c
> index f362532c6834..77fa4497b442 100644
> --- a/drivers/gpu/drm/i915/display/intel_display_driver.c
> +++ b/drivers/gpu/drm/i915/display/intel_display_driver.c
> @@ -714,6 +714,22 @@ int intel_display_driver_pm_suspend(struct intel_display *display)
>  	return ret;
>  }
>  
> +void intel_display_driver_pm_suspend_late(struct intel_display *display, bool s2idle)
> +{
> +	if (!HAS_DISPLAY(display))
> +		return;
> +
> +	intel_display_power_suspend_late(display, s2idle);
> +}
> +
> +void intel_display_driver_pm_resume_early(struct intel_display *display)
> +{
> +	if (!HAS_DISPLAY(display))
> +		return;
> +
> +	intel_display_power_resume_early(display);
> +}
> +
>  int
>  __intel_display_driver_resume(struct intel_display *display,
>  			      struct drm_atomic_commit *state,
> diff --git a/drivers/gpu/drm/i915/display/intel_display_driver.h b/drivers/gpu/drm/i915/display/intel_display_driver.h
> index d8a08ca68d4e..adfde02465ea 100644
> --- a/drivers/gpu/drm/i915/display/intel_display_driver.h
> +++ b/drivers/gpu/drm/i915/display/intel_display_driver.h
> @@ -26,6 +26,8 @@ void intel_display_driver_remove_nogem(struct intel_display *display);
>  void intel_display_driver_unregister(struct intel_display *display);
>  
>  int intel_display_driver_pm_suspend(struct intel_display *display);
> +void intel_display_driver_pm_suspend_late(struct intel_display *display, bool s2idle);
> +void intel_display_driver_pm_resume_early(struct intel_display *display);
>  void intel_display_driver_pm_resume(struct intel_display *display);
>  
>  /* interface for intel_display_reset.c */
> diff --git a/drivers/gpu/drm/i915/i915_driver.c b/drivers/gpu/drm/i915/i915_driver.c
> index 063d4bdec2d9..6fd3e8b155b1 100644
> --- a/drivers/gpu/drm/i915/i915_driver.c
> +++ b/drivers/gpu/drm/i915/i915_driver.c
> @@ -1181,12 +1181,12 @@ 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_display_power_suspend_late(display, s2idle);
> +	intel_display_driver_pm_suspend_late(display, s2idle);
>  
>  	ret = vlv_suspend_complete(dev_priv);
>  	if (ret) {
>  		drm_err(&dev_priv->drm, "Suspend complete failed: %d\n", ret);
> -		intel_display_power_resume_early(display);
> +		intel_display_driver_pm_resume_early(display);
>  	}
>  
>  	enable_rpm_wakeref_asserts(rpm);
> @@ -1345,7 +1345,7 @@ static int i915_drm_resume_early(struct drm_device *dev)
>  	for_each_gt(gt, dev_priv, i)
>  		intel_gt_resume_early(gt);
>  
> -	intel_display_power_resume_early(display);
> +	intel_display_driver_pm_resume_early(display);
>  
>  	enable_rpm_wakeref_asserts(&dev_priv->runtime_pm);
>  
> diff --git a/drivers/gpu/drm/xe/display/xe_display.c b/drivers/gpu/drm/xe/display/xe_display.c
> index f34a9d2ffc16..bbd4f527d5e3 100644
> --- a/drivers/gpu/drm/xe/display/xe_display.c
> +++ b/drivers/gpu/drm/xe/display/xe_display.c
> @@ -314,7 +314,7 @@ void xe_display_pm_suspend_late(struct xe_device *xe)
>  	if (!xe->info.probe_display)
>  		return;
>  
> -	intel_display_power_suspend_late(display, s2idle);
> +	intel_display_driver_pm_suspend_late(display, s2idle);
>  }
>  
>  void xe_display_pm_resume_early(struct xe_device *xe)
> @@ -324,7 +324,7 @@ void xe_display_pm_resume_early(struct xe_device *xe)
>  	if (!xe->info.probe_display)
>  		return;
>  
> -	intel_display_power_resume_early(display);
> +	intel_display_driver_pm_resume_early(display);
>  }
>  
>  void xe_display_pm_resume(struct xe_device *xe)
> -- 
> 2.47.3

-- 
Ville Syrjälä
Intel

Re: [PATCH 13/24] drm/{i915,xe}: move more calls inside intel_display_driver_{register,unregister}()

[Ville Syrjälä]

On Fri, May 29, 2026 at 02:03:57PM +0300, Jani Nikula wrote:
> The intel_display_driver_register() and
> intel_display_driver_unregister() calls are followed and preceded by
> intel_display_power_enable() and intel_display_power_disable() calls,
> respectively. Move them inside the register/unregister calls.
> 
> Semantically, this is a weird location, as there's nothing really
> "register" or "unregister" about them, but they retain the existing
> sequence. Add comments to note that.
> 
> There's a slight functional change for !HAS_DISPLAY() in that
> register/unregister return early. Assume this is what we want, and there
> are no cases where display engine is present but all pipes have been
> fused off.
> 
> Signed-off-by: Jani Nikula <jani.nikula@intel.com>
> ---
>  drivers/gpu/drm/i915/display/intel_display_driver.c | 6 ++++++
>  drivers/gpu/drm/i915/i915_driver.c                  | 2 --
>  drivers/gpu/drm/xe/display/xe_display.c             | 2 --
>  3 files changed, 6 insertions(+), 4 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/display/intel_display_driver.c b/drivers/gpu/drm/i915/display/intel_display_driver.c
> index 77fa4497b442..7fee9ef88224 100644
> --- a/drivers/gpu/drm/i915/display/intel_display_driver.c
> +++ b/drivers/gpu/drm/i915/display/intel_display_driver.c
> @@ -578,6 +578,9 @@ void intel_display_driver_register(struct intel_display *display)
>  					DISPLAY_RUNTIME_INFO(display), &p);
>  
>  	intel_register_dsm_handler();
> +
> +	/* Semantically out of place, just for the sequence */
> +	intel_display_power_enable(display);
>  }
>  
>  /* part #1: call before irq uninstall */
> @@ -652,6 +655,9 @@ void intel_display_driver_unregister(struct intel_display *display)
>  	if (!HAS_DISPLAY(display))
>  		return;
>  
> +	/* Semantically out of place, just for the sequence */
> +	intel_display_power_disable(display);
> +
>  	intel_unregister_dsm_handler();
>  
>  	drm_client_dev_unregister(display->drm);
> diff --git a/drivers/gpu/drm/i915/i915_driver.c b/drivers/gpu/drm/i915/i915_driver.c
> index 6fd3e8b155b1..b637c4dedf1b 100644
> --- a/drivers/gpu/drm/i915/i915_driver.c
> +++ b/drivers/gpu/drm/i915/i915_driver.c
> @@ -661,7 +661,6 @@ static int i915_driver_register(struct drm_i915_private *dev_priv)
>  
>  	intel_display_driver_register(display);
>  
> -	intel_display_power_enable(display);

Maybe these deserve their own display_driver_runtime_pm_{en,dis}able()
things.

Although I'm not sure why we even do this so late. We could probably
do this as soon as the readout is done. And I think ideally we wouldn't
even use the INIT domain for this and would just do something to keep
the already enabled power wells enabled until the readout is done.
But that's a whole different can of worms.

>  	intel_runtime_pm_enable(&dev_priv->runtime_pm);
>  
>  	if (i915_switcheroo_register(dev_priv))
> @@ -683,7 +682,6 @@ static void i915_driver_unregister(struct drm_i915_private *dev_priv)
>  	i915_switcheroo_unregister(dev_priv);
>  
>  	intel_runtime_pm_disable(&dev_priv->runtime_pm);
> -	intel_display_power_disable(display);
>  
>  	intel_display_driver_unregister(display);
>  
> diff --git a/drivers/gpu/drm/xe/display/xe_display.c b/drivers/gpu/drm/xe/display/xe_display.c
> index bbd4f527d5e3..e17e05a8854c 100644
> --- a/drivers/gpu/drm/xe/display/xe_display.c
> +++ b/drivers/gpu/drm/xe/display/xe_display.c
> @@ -177,7 +177,6 @@ void xe_display_register(struct xe_device *xe)
>  		return;
>  
>  	intel_display_driver_register(display);
> -	intel_display_power_enable(display);
>  }
>  
>  void xe_display_unregister(struct xe_device *xe)
> @@ -187,7 +186,6 @@ void xe_display_unregister(struct xe_device *xe)
>  	if (!xe->info.probe_display)
>  		return;
>  
> -	intel_display_power_disable(display);
>  	intel_display_driver_unregister(display);
>  }
>  
> -- 
> 2.47.3

-- 
Ville Syrjälä
Intel

Re: [PATCH 14/24] drm/{i915,xe}: add intel_display_driver_shutdown_late()

[Ville Syrjälä]

On Fri, May 29, 2026 at 02:03:58PM +0300, Jani Nikula wrote:
> Add new function intel_display_driver_shutdown_late() to be called
> "later" in the struct pci_driver .shutdown hook.
> 
> There's a slight functional change in that
> intel_display_driver_shutdown_late() returns early for
> !HAS_DISPLAY(). Assume this is what we want, and there are no cases
> where display engine is present but all pipes have been fused off.
> 
> Signed-off-by: Jani Nikula <jani.nikula@intel.com>

Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>

> ---
>  drivers/gpu/drm/i915/display/intel_display_driver.c | 13 +++++++++++++
>  drivers/gpu/drm/i915/display/intel_display_driver.h |  1 +
>  drivers/gpu/drm/i915/i915_driver.c                  |  7 ++-----
>  drivers/gpu/drm/xe/display/xe_display.c             |  7 +------
>  4 files changed, 17 insertions(+), 11 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/display/intel_display_driver.c b/drivers/gpu/drm/i915/display/intel_display_driver.c
> index 7fee9ef88224..7f2d191b9ef0 100644
> --- a/drivers/gpu/drm/i915/display/intel_display_driver.c
> +++ b/drivers/gpu/drm/i915/display/intel_display_driver.c
> @@ -681,6 +681,19 @@ void intel_display_driver_unregister(struct intel_display *display)
>  	intel_vga_unregister(display);
>  }
>  
> +void intel_display_driver_shutdown_late(struct intel_display *display)
> +{
> +	if (!HAS_DISPLAY(display))
> +		return;
> +
> +	/*
> +	 * The only requirement is to reboot with display DC states disabled,
> +	 * for now leaving all display power wells in the INIT power domain
> +	 * enabled.
> +	 */
> +	intel_display_power_driver_remove(display);
> +}
> +
>  /*
>   * turn all crtc's off, but do not adjust state
>   * This has to be paired with a call to intel_modeset_setup_hw_state.
> diff --git a/drivers/gpu/drm/i915/display/intel_display_driver.h b/drivers/gpu/drm/i915/display/intel_display_driver.h
> index adfde02465ea..61515577758b 100644
> --- a/drivers/gpu/drm/i915/display/intel_display_driver.h
> +++ b/drivers/gpu/drm/i915/display/intel_display_driver.h
> @@ -24,6 +24,7 @@ void intel_display_driver_remove(struct intel_display *display);
>  void intel_display_driver_remove_noirq(struct intel_display *display);
>  void intel_display_driver_remove_nogem(struct intel_display *display);
>  void intel_display_driver_unregister(struct intel_display *display);
> +void intel_display_driver_shutdown_late(struct intel_display *display);
>  
>  int intel_display_driver_pm_suspend(struct intel_display *display);
>  void intel_display_driver_pm_suspend_late(struct intel_display *display, bool s2idle);
> diff --git a/drivers/gpu/drm/i915/i915_driver.c b/drivers/gpu/drm/i915/i915_driver.c
> index b637c4dedf1b..140c562a8627 100644
> --- a/drivers/gpu/drm/i915/i915_driver.c
> +++ b/drivers/gpu/drm/i915/i915_driver.c
> @@ -1073,17 +1073,14 @@ void i915_driver_shutdown(struct drm_i915_private *i915)
>  	i915_gem_suspend(i915);
>  
>  	/*
> -	 * The only requirement is to reboot with display DC states disabled,
> -	 * for now leaving all display power wells in the INIT power domain
> -	 * enabled.
> -	 *
>  	 * TODO:
>  	 * - unify the pci_driver::shutdown sequence here with the
>  	 *   pci_driver.driver.pm.poweroff,poweroff_late sequence.
>  	 * - unify the driver remove and system/runtime suspend sequences with
>  	 *   the above unified shutdown/poweroff sequence.
>  	 */
> -	intel_display_power_driver_remove(display);
> +
> +	intel_display_driver_shutdown_late(display);
>  	enable_rpm_wakeref_asserts(&i915->runtime_pm);
>  
>  	intel_runtime_pm_driver_last_release(&i915->runtime_pm);
> diff --git a/drivers/gpu/drm/xe/display/xe_display.c b/drivers/gpu/drm/xe/display/xe_display.c
> index e17e05a8854c..fdc999c62bc9 100644
> --- a/drivers/gpu/drm/xe/display/xe_display.c
> +++ b/drivers/gpu/drm/xe/display/xe_display.c
> @@ -219,12 +219,7 @@ void xe_display_shutdown_late(struct xe_device *xe)
>  	if (!xe->info.probe_display)
>  		return;
>  
> -	/*
> -	 * The only requirement is to reboot with display DC states disabled,
> -	 * for now leaving all display power wells in the INIT power domain
> -	 * enabled.
> -	 */
> -	intel_display_power_driver_remove(display);
> +	intel_display_driver_shutdown_late(display);
>  }
>  
>  /* IRQ-related functions */
> -- 
> 2.47.3

-- 
Ville Syrjälä
Intel

✗ Xe.CI.FULL: failure for drm/{i915, xe}: display (runtime) suspend/resume/shutdown unification

[Patchwork]

[-- Attachment #1: Type: text/plain, Size: 28391 bytes --]

== Series Details ==

Series: drm/{i915, xe}: display (runtime) suspend/resume/shutdown unification
URL   : https://patchwork.freedesktop.org/series/167536/
State : failure

== Summary ==

CI Bug Log - changes from xe-5157-0da1169d23e072343c8076d30551993343d1050e_FULL -> xe-pw-167536v1_FULL
====================================================

Summary
-------

  **FAILURE**

  Serious unknown changes coming with xe-pw-167536v1_FULL absolutely need to be
  verified manually.
  
  If you think the reported changes have nothing to do with the changes
  introduced in xe-pw-167536v1_FULL, please notify your bug team (I915-ci-infra@lists.freedesktop.org) to allow them
  to document this new failure mode, which will reduce false positives in CI.

  

Participating hosts (2 -> 2)
------------------------------

  No changes in participating hosts

Possible new issues
-------------------

  Here are the unknown changes that may have been introduced in xe-pw-167536v1_FULL:

### IGT changes ###

#### Possible regressions ####

  * igt@kms_big_fb@linear-8bpp-rotate-180:
    - shard-bmg:          NOTRUN -> [FAIL][1]
   [1]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-pw-167536v1/shard-bmg-8/igt@kms_big_fb@linear-8bpp-rotate-180.html

  * igt@kms_pm_rpm@dpms-lpsp:
    - shard-bmg:          NOTRUN -> [ABORT][2] +2 other tests abort
   [2]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-pw-167536v1/shard-bmg-8/igt@kms_pm_rpm@dpms-lpsp.html

  * igt@kms_pm_rpm@package-g7:
    - shard-lnl:          NOTRUN -> [ABORT][3] +1 other test abort
   [3]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-pw-167536v1/shard-lnl-1/igt@kms_pm_rpm@package-g7.html

  * igt@xe_pm@d3hot-mocs:
    - shard-bmg:          [PASS][4] -> [ABORT][5] +12 other tests abort
   [4]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-5157-0da1169d23e072343c8076d30551993343d1050e/shard-bmg-4/igt@xe_pm@d3hot-mocs.html
   [5]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-pw-167536v1/shard-bmg-7/igt@xe_pm@d3hot-mocs.html

  * igt@xe_pxp@pxp-termination-key-update-post-rpm:
    - shard-lnl:          [PASS][6] -> [ABORT][7] +16 other tests abort
   [6]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-5157-0da1169d23e072343c8076d30551993343d1050e/shard-lnl-6/igt@xe_pxp@pxp-termination-key-update-post-rpm.html
   [7]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-pw-167536v1/shard-lnl-6/igt@xe_pxp@pxp-termination-key-update-post-rpm.html

  
#### Warnings ####

  * igt@kms_pm_dc@deep-pkgc:
    - shard-lnl:          [FAIL][8] ([Intel XE#2029] / [Intel XE#7395]) -> [ABORT][9]
   [8]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-5157-0da1169d23e072343c8076d30551993343d1050e/shard-lnl-6/igt@kms_pm_dc@deep-pkgc.html
   [9]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-pw-167536v1/shard-lnl-6/igt@kms_pm_dc@deep-pkgc.html

  * igt@kms_pm_rpm@dpms-mode-unset-lpsp:
    - shard-bmg:          [SKIP][10] ([Intel XE#1439] / [Intel XE#7402] / [Intel XE#836]) -> [ABORT][11]
   [10]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-5157-0da1169d23e072343c8076d30551993343d1050e/shard-bmg-9/igt@kms_pm_rpm@dpms-mode-unset-lpsp.html
   [11]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-pw-167536v1/shard-bmg-3/igt@kms_pm_rpm@dpms-mode-unset-lpsp.html

  * igt@kms_pm_rpm@modeset-non-lpsp-stress:
    - shard-lnl:          [SKIP][12] ([Intel XE#1439] / [Intel XE#3141] / [Intel XE#7383]) -> [ABORT][13] +1 other test abort
   [12]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-5157-0da1169d23e072343c8076d30551993343d1050e/shard-lnl-3/igt@kms_pm_rpm@modeset-non-lpsp-stress.html
   [13]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-pw-167536v1/shard-lnl-8/igt@kms_pm_rpm@modeset-non-lpsp-stress.html

  * igt@kms_pm_rpm@package-g7:
    - shard-bmg:          [SKIP][14] ([Intel XE#6814] / [Intel XE#7428]) -> [ABORT][15]
   [14]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-5157-0da1169d23e072343c8076d30551993343d1050e/shard-bmg-7/igt@kms_pm_rpm@package-g7.html
   [15]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-pw-167536v1/shard-bmg-1/igt@kms_pm_rpm@package-g7.html

  * igt@xe_pm@d3cold-basic:
    - shard-lnl:          [SKIP][16] ([Intel XE#2284] / [Intel XE#366] / [Intel XE#7370]) -> [ABORT][17] +1 other test abort
   [16]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-5157-0da1169d23e072343c8076d30551993343d1050e/shard-lnl-2/igt@xe_pm@d3cold-basic.html
   [17]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-pw-167536v1/shard-lnl-1/igt@xe_pm@d3cold-basic.html
    - shard-bmg:          [SKIP][18] ([Intel XE#2284] / [Intel XE#7370]) -> [ABORT][19] +4 other tests abort
   [18]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-5157-0da1169d23e072343c8076d30551993343d1050e/shard-bmg-10/igt@xe_pm@d3cold-basic.html
   [19]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-pw-167536v1/shard-bmg-10/igt@xe_pm@d3cold-basic.html

  * igt@xe_pm@d3cold-mocs:
    - shard-lnl:          [SKIP][20] ([Intel XE#2284] / [Intel XE#7370]) -> [ABORT][21]
   [20]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-5157-0da1169d23e072343c8076d30551993343d1050e/shard-lnl-7/igt@xe_pm@d3cold-mocs.html
   [21]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-pw-167536v1/shard-lnl-7/igt@xe_pm@d3cold-mocs.html

  * igt@xe_pm@d3hot-i2c:
    - shard-lnl:          [SKIP][22] ([Intel XE#5742] / [Intel XE#7328] / [Intel XE#7400]) -> [ABORT][23]
   [22]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-5157-0da1169d23e072343c8076d30551993343d1050e/shard-lnl-7/igt@xe_pm@d3hot-i2c.html
   [23]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-pw-167536v1/shard-lnl-3/igt@xe_pm@d3hot-i2c.html
    - shard-bmg:          [SKIP][24] ([Intel XE#5742] / [Intel XE#7328] / [Intel XE#7400]) -> [ABORT][25]
   [24]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-5157-0da1169d23e072343c8076d30551993343d1050e/shard-bmg-6/igt@xe_pm@d3hot-i2c.html
   [25]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-pw-167536v1/shard-bmg-6/igt@xe_pm@d3hot-i2c.html

  
Known issues
------------

  Here are the changes found in xe-pw-167536v1_FULL that come from known issues:

### IGT changes ###

#### Issues hit ####

  * igt@kms_big_fb@linear-64bpp-rotate-90:
    - shard-lnl:          NOTRUN -> [SKIP][26] ([Intel XE#1407])
   [26]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-pw-167536v1/shard-lnl-2/igt@kms_big_fb@linear-64bpp-rotate-90.html

  * igt@kms_big_fb@yf-tiled-8bpp-rotate-0:
    - shard-lnl:          NOTRUN -> [SKIP][27] ([Intel XE#1124]) +1 other test skip
   [27]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-pw-167536v1/shard-lnl-2/igt@kms_big_fb@yf-tiled-8bpp-rotate-0.html

  * igt@kms_ccs@crc-primary-suspend-4-tiled-bmg-ccs:
    - shard-bmg:          [PASS][28] -> [INCOMPLETE][29] ([Intel XE#7084] / [Intel XE#8150]) +1 other test incomplete
   [28]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-5157-0da1169d23e072343c8076d30551993343d1050e/shard-bmg-5/igt@kms_ccs@crc-primary-suspend-4-tiled-bmg-ccs.html
   [29]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-pw-167536v1/shard-bmg-10/igt@kms_ccs@crc-primary-suspend-4-tiled-bmg-ccs.html

  * igt@kms_ccs@crc-sprite-planes-basic-y-tiled-gen12-rc-ccs-cc:
    - shard-lnl:          NOTRUN -> [SKIP][30] ([Intel XE#2887]) +2 other tests skip
   [30]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-pw-167536v1/shard-lnl-2/igt@kms_ccs@crc-sprite-planes-basic-y-tiled-gen12-rc-ccs-cc.html

  * igt@kms_ccs@missing-ccs-buffer-y-tiled-gen12-rc-ccs:
    - shard-bmg:          NOTRUN -> [SKIP][31] ([Intel XE#2887]) +1 other test skip
   [31]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-pw-167536v1/shard-bmg-8/igt@kms_ccs@missing-ccs-buffer-y-tiled-gen12-rc-ccs.html

  * igt@kms_chamelium_edid@dp-edid-change-during-suspend:
    - shard-lnl:          NOTRUN -> [SKIP][32] ([Intel XE#373])
   [32]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-pw-167536v1/shard-lnl-2/igt@kms_chamelium_edid@dp-edid-change-during-suspend.html

  * igt@kms_chamelium_frames@dp-crc-multiple:
    - shard-bmg:          NOTRUN -> [SKIP][33] ([Intel XE#2252])
   [33]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-pw-167536v1/shard-bmg-7/igt@kms_chamelium_frames@dp-crc-multiple.html

  * igt@kms_content_protection@lic-type-0-hdcp14:
    - shard-lnl:          NOTRUN -> [SKIP][34] ([Intel XE#7642])
   [34]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-pw-167536v1/shard-lnl-2/igt@kms_content_protection@lic-type-0-hdcp14.html

  * igt@kms_cursor_crc@cursor-sliding-max-size:
    - shard-lnl:          NOTRUN -> [SKIP][35] ([Intel XE#1424]) +1 other test skip
   [35]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-pw-167536v1/shard-lnl-2/igt@kms_cursor_crc@cursor-sliding-max-size.html

  * igt@kms_cursor_legacy@2x-long-flip-vs-cursor-atomic:
    - shard-lnl:          NOTRUN -> [SKIP][36] ([Intel XE#309] / [Intel XE#7343]) +1 other test skip
   [36]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-pw-167536v1/shard-lnl-2/igt@kms_cursor_legacy@2x-long-flip-vs-cursor-atomic.html

  * igt@kms_dsc@dsc-fractional-bpp:
    - shard-lnl:          NOTRUN -> [SKIP][37] ([Intel XE#2244])
   [37]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-pw-167536v1/shard-lnl-2/igt@kms_dsc@dsc-fractional-bpp.html

  * igt@kms_dsc@dsc-with-bpc:
    - shard-bmg:          NOTRUN -> [SKIP][38] ([Intel XE#2244])
   [38]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-pw-167536v1/shard-bmg-7/igt@kms_dsc@dsc-with-bpc.html

  * igt@kms_fbc_dirty_rect@fbc-dirty-rectangle-out-visible-area:
    - shard-bmg:          NOTRUN -> [SKIP][39] ([Intel XE#4422] / [Intel XE#7442])
   [39]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-pw-167536v1/shard-bmg-8/igt@kms_fbc_dirty_rect@fbc-dirty-rectangle-out-visible-area.html

  * igt@kms_flip@2x-single-buffer-flip-vs-dpms-off-vs-modeset:
    - shard-lnl:          NOTRUN -> [SKIP][40] ([Intel XE#1421]) +1 other test skip
   [40]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-pw-167536v1/shard-lnl-2/igt@kms_flip@2x-single-buffer-flip-vs-dpms-off-vs-modeset.html

  * igt@kms_flip_scaled_crc@flip-32bpp-ytile-to-32bpp-ytileccs-downscaling:
    - shard-lnl:          NOTRUN -> [SKIP][41] ([Intel XE#7178] / [Intel XE#7351])
   [41]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-pw-167536v1/shard-lnl-2/igt@kms_flip_scaled_crc@flip-32bpp-ytile-to-32bpp-ytileccs-downscaling.html

  * igt@kms_flip_scaled_crc@flip-p016-linear-to-p016-linear-reflect-x:
    - shard-bmg:          NOTRUN -> [SKIP][42] ([Intel XE#7179])
   [42]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-pw-167536v1/shard-bmg-7/igt@kms_flip_scaled_crc@flip-p016-linear-to-p016-linear-reflect-x.html

  * igt@kms_frontbuffer_tracking@drrshdr-2p-primscrn-pri-indfb-draw-blt:
    - shard-lnl:          NOTRUN -> [SKIP][43] ([Intel XE#7905]) +6 other tests skip
   [43]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-pw-167536v1/shard-lnl-2/igt@kms_frontbuffer_tracking@drrshdr-2p-primscrn-pri-indfb-draw-blt.html

  * igt@kms_frontbuffer_tracking@fbc-2p-scndscrn-pri-shrfb-draw-blt:
    - shard-bmg:          NOTRUN -> [SKIP][44] ([Intel XE#4141])
   [44]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-pw-167536v1/shard-bmg-7/igt@kms_frontbuffer_tracking@fbc-2p-scndscrn-pri-shrfb-draw-blt.html

  * igt@kms_frontbuffer_tracking@fbc-argb161616f-draw-mmap-wc:
    - shard-lnl:          NOTRUN -> [SKIP][45] ([Intel XE#7061] / [Intel XE#7356])
   [45]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-pw-167536v1/shard-lnl-2/igt@kms_frontbuffer_tracking@fbc-argb161616f-draw-mmap-wc.html

  * igt@kms_frontbuffer_tracking@fbcdrrs-1p-primscrn-spr-indfb-draw-mmap-wc:
    - shard-bmg:          NOTRUN -> [SKIP][46] ([Intel XE#2311]) +3 other tests skip
   [46]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-pw-167536v1/shard-bmg-7/igt@kms_frontbuffer_tracking@fbcdrrs-1p-primscrn-spr-indfb-draw-mmap-wc.html

  * igt@kms_frontbuffer_tracking@fbcdrrs-tiling-y:
    - shard-lnl:          NOTRUN -> [SKIP][47] ([Intel XE#1469] / [Intel XE#7399])
   [47]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-pw-167536v1/shard-lnl-1/igt@kms_frontbuffer_tracking@fbcdrrs-tiling-y.html

  * igt@kms_frontbuffer_tracking@fbcdrrshdr-modesetfrombusy:
    - shard-lnl:          NOTRUN -> [SKIP][48] ([Intel XE#6312]) +1 other test skip
   [48]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-pw-167536v1/shard-lnl-2/igt@kms_frontbuffer_tracking@fbcdrrshdr-modesetfrombusy.html

  * igt@kms_frontbuffer_tracking@fbcpsr-2p-scndscrn-spr-indfb-draw-blt:
    - shard-lnl:          NOTRUN -> [SKIP][49] ([Intel XE#656] / [Intel XE#7905]) +5 other tests skip
   [49]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-pw-167536v1/shard-lnl-1/igt@kms_frontbuffer_tracking@fbcpsr-2p-scndscrn-spr-indfb-draw-blt.html

  * igt@kms_frontbuffer_tracking@fbcpsrhdr-argb161616f-draw-blt:
    - shard-lnl:          NOTRUN -> [SKIP][50] ([Intel XE#7061])
   [50]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-pw-167536v1/shard-lnl-2/igt@kms_frontbuffer_tracking@fbcpsrhdr-argb161616f-draw-blt.html

  * igt@kms_frontbuffer_tracking@psr-2p-scndscrn-shrfb-msflip-blt:
    - shard-bmg:          NOTRUN -> [SKIP][51] ([Intel XE#2313]) +4 other tests skip
   [51]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-pw-167536v1/shard-bmg-7/igt@kms_frontbuffer_tracking@psr-2p-scndscrn-shrfb-msflip-blt.html

  * igt@kms_frontbuffer_tracking@psrhdr-suspend:
    - shard-lnl:          NOTRUN -> [SKIP][52] ([Intel XE#7865]) +2 other tests skip
   [52]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-pw-167536v1/shard-lnl-1/igt@kms_frontbuffer_tracking@psrhdr-suspend.html

  * igt@kms_hdr@static-toggle@pipe-a-hdmi-a-3-xrgb16161616f:
    - shard-bmg:          [PASS][53] -> [SKIP][54] ([Intel XE#7915]) +1 other test skip
   [53]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-5157-0da1169d23e072343c8076d30551993343d1050e/shard-bmg-4/igt@kms_hdr@static-toggle@pipe-a-hdmi-a-3-xrgb16161616f.html
   [54]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-pw-167536v1/shard-bmg-1/igt@kms_hdr@static-toggle@pipe-a-hdmi-a-3-xrgb16161616f.html

  * igt@kms_joiner@basic-big-joiner:
    - shard-bmg:          NOTRUN -> [SKIP][55] ([Intel XE#6901])
   [55]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-pw-167536v1/shard-bmg-7/igt@kms_joiner@basic-big-joiner.html

  * igt@kms_plane@pixel-format-y-tiled-modifier:
    - shard-lnl:          NOTRUN -> [SKIP][56] ([Intel XE#7283])
   [56]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-pw-167536v1/shard-lnl-1/igt@kms_plane@pixel-format-y-tiled-modifier.html

  * igt@kms_plane@pixel-format-yf-tiled-modifier-source-clamping:
    - shard-bmg:          NOTRUN -> [SKIP][57] ([Intel XE#7283])
   [57]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-pw-167536v1/shard-bmg-7/igt@kms_plane@pixel-format-yf-tiled-modifier-source-clamping.html

  * igt@kms_psr2_sf@fbc-psr2-overlay-plane-move-continuous-exceed-sf:
    - shard-bmg:          NOTRUN -> [SKIP][58] ([Intel XE#1489])
   [58]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-pw-167536v1/shard-bmg-7/igt@kms_psr2_sf@fbc-psr2-overlay-plane-move-continuous-exceed-sf.html

  * igt@kms_setmode@invalid-clone-exclusive-crtc:
    - shard-lnl:          NOTRUN -> [SKIP][59] ([Intel XE#1435])
   [59]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-pw-167536v1/shard-lnl-1/igt@kms_setmode@invalid-clone-exclusive-crtc.html

  * igt@kms_vrr@flipline:
    - shard-bmg:          NOTRUN -> [SKIP][60] ([Intel XE#1499])
   [60]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-pw-167536v1/shard-bmg-7/igt@kms_vrr@flipline.html

  * igt@xe_eudebug_online@pagefault-write-stress:
    - shard-lnl:          NOTRUN -> [SKIP][61] ([Intel XE#7636]) +1 other test skip
   [61]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-pw-167536v1/shard-lnl-2/igt@xe_eudebug_online@pagefault-write-stress.html

  * igt@xe_eudebug_sriov@deny-eudebug:
    - shard-lnl:          NOTRUN -> [SKIP][62] ([Intel XE#4518] / [Intel XE#7404])
   [62]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-pw-167536v1/shard-lnl-2/igt@xe_eudebug_sriov@deny-eudebug.html

  * igt@xe_evict@evict-large-multi-vm:
    - shard-lnl:          NOTRUN -> [SKIP][63] ([Intel XE#6540] / [Intel XE#688]) +1 other test skip
   [63]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-pw-167536v1/shard-lnl-1/igt@xe_evict@evict-large-multi-vm.html

  * igt@xe_exec_balancer@many-execqueues-virtual-userptr-rebind:
    - shard-lnl:          NOTRUN -> [SKIP][64] ([Intel XE#7482]) +1 other test skip
   [64]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-pw-167536v1/shard-lnl-2/igt@xe_exec_balancer@many-execqueues-virtual-userptr-rebind.html

  * igt@xe_exec_basic@multigpu-once-null-defer-bind:
    - shard-lnl:          NOTRUN -> [SKIP][65] ([Intel XE#1392]) +1 other test skip
   [65]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-pw-167536v1/shard-lnl-2/igt@xe_exec_basic@multigpu-once-null-defer-bind.html

  * igt@xe_exec_fault_mode@many-execqueues-multi-queue-imm:
    - shard-bmg:          NOTRUN -> [SKIP][66] ([Intel XE#7136])
   [66]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-pw-167536v1/shard-bmg-7/igt@xe_exec_fault_mode@many-execqueues-multi-queue-imm.html

  * igt@xe_exec_fault_mode@once-multi-queue-prefetch:
    - shard-lnl:          NOTRUN -> [SKIP][67] ([Intel XE#7136]) +1 other test skip
   [67]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-pw-167536v1/shard-lnl-2/igt@xe_exec_fault_mode@once-multi-queue-prefetch.html

  * igt@xe_exec_multi_queue@few-execs-dyn-priority-smem:
    - shard-lnl:          NOTRUN -> [SKIP][68] ([Intel XE#6874]) +4 other tests skip
   [68]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-pw-167536v1/shard-lnl-2/igt@xe_exec_multi_queue@few-execs-dyn-priority-smem.html

  * igt@xe_exec_multi_queue@max-queues-preempt-mode-priority:
    - shard-bmg:          NOTRUN -> [SKIP][69] ([Intel XE#6874]) +1 other test skip
   [69]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-pw-167536v1/shard-bmg-7/igt@xe_exec_multi_queue@max-queues-preempt-mode-priority.html

  * igt@xe_exec_reset@cm-multi-queue-close-fd:
    - shard-lnl:          NOTRUN -> [SKIP][70] ([Intel XE#7866])
   [70]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-pw-167536v1/shard-lnl-2/igt@xe_exec_reset@cm-multi-queue-close-fd.html

  * igt@xe_exec_reset@multi-queue-close-execqueues:
    - shard-bmg:          NOTRUN -> [SKIP][71] ([Intel XE#7866])
   [71]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-pw-167536v1/shard-bmg-7/igt@xe_exec_reset@multi-queue-close-execqueues.html

  * igt@xe_exec_threads@threads-multi-queue-mixed-shared-vm-userptr:
    - shard-lnl:          NOTRUN -> [SKIP][72] ([Intel XE#7138]) +3 other tests skip
   [72]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-pw-167536v1/shard-lnl-1/igt@xe_exec_threads@threads-multi-queue-mixed-shared-vm-userptr.html

  * igt@xe_exec_threads@threads-multi-queue-mixed-userptr-invalidate:
    - shard-bmg:          NOTRUN -> [SKIP][73] ([Intel XE#7138]) +1 other test skip
   [73]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-pw-167536v1/shard-bmg-7/igt@xe_exec_threads@threads-multi-queue-mixed-userptr-invalidate.html

  * igt@xe_multigpu_svm@mgpu-pagefault-basic:
    - shard-bmg:          NOTRUN -> [SKIP][74] ([Intel XE#6964])
   [74]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-pw-167536v1/shard-bmg-7/igt@xe_multigpu_svm@mgpu-pagefault-basic.html

  * igt@xe_pat@pat-index-xehpc:
    - shard-lnl:          NOTRUN -> [SKIP][75] ([Intel XE#1420] / [Intel XE#2838] / [Intel XE#7590])
   [75]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-pw-167536v1/shard-lnl-1/igt@xe_pat@pat-index-xehpc.html

  * igt@xe_prefetch_fault@prefetch-fault:
    - shard-bmg:          NOTRUN -> [SKIP][76] ([Intel XE#7599])
   [76]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-pw-167536v1/shard-bmg-7/igt@xe_prefetch_fault@prefetch-fault.html

  * igt@xe_wedged@wedged-mode-toggle:
    - shard-bmg:          [PASS][77] -> [ABORT][78] ([Intel XE#8007])
   [77]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-5157-0da1169d23e072343c8076d30551993343d1050e/shard-bmg-3/igt@xe_wedged@wedged-mode-toggle.html
   [78]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-pw-167536v1/shard-bmg-9/igt@xe_wedged@wedged-mode-toggle.html

  
#### Possible fixes ####

  * igt@kms_flip@basic-flip-vs-wf_vblank:
    - shard-lnl:          [FAIL][79] ([Intel XE#3098]) -> [PASS][80] +1 other test pass
   [79]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-5157-0da1169d23e072343c8076d30551993343d1050e/shard-lnl-6/igt@kms_flip@basic-flip-vs-wf_vblank.html
   [80]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-pw-167536v1/shard-lnl-5/igt@kms_flip@basic-flip-vs-wf_vblank.html

  * igt@kms_flip@flip-vs-expired-vblank-interruptible@c-edp1:
    - shard-lnl:          [FAIL][81] ([Intel XE#301] / [Intel XE#3149]) -> [PASS][82]
   [81]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-5157-0da1169d23e072343c8076d30551993343d1050e/shard-lnl-4/igt@kms_flip@flip-vs-expired-vblank-interruptible@c-edp1.html
   [82]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-pw-167536v1/shard-lnl-5/igt@kms_flip@flip-vs-expired-vblank-interruptible@c-edp1.html

  * igt@kms_flip@flip-vs-expired-vblank-interruptible@d-hdmi-a3:
    - shard-bmg:          [FAIL][83] ([Intel XE#3149] / [Intel XE#3321]) -> [PASS][84] +1 other test pass
   [83]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-5157-0da1169d23e072343c8076d30551993343d1050e/shard-bmg-4/igt@kms_flip@flip-vs-expired-vblank-interruptible@d-hdmi-a3.html
   [84]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-pw-167536v1/shard-bmg-1/igt@kms_flip@flip-vs-expired-vblank-interruptible@d-hdmi-a3.html

  * igt@kms_vblank@query-forked-busy-hang:
    - shard-bmg:          [INCOMPLETE][85] -> [PASS][86] +1 other test pass
   [85]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-5157-0da1169d23e072343c8076d30551993343d1050e/shard-bmg-3/igt@kms_vblank@query-forked-busy-hang.html
   [86]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-pw-167536v1/shard-bmg-7/igt@kms_vblank@query-forked-busy-hang.html

  * igt@kms_vrr@seamless-rr-switch-virtual@pipe-a-edp-1:
    - shard-lnl:          [FAIL][87] ([Intel XE#2142]) -> [PASS][88] +1 other test pass
   [87]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-5157-0da1169d23e072343c8076d30551993343d1050e/shard-lnl-4/igt@kms_vrr@seamless-rr-switch-virtual@pipe-a-edp-1.html
   [88]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-pw-167536v1/shard-lnl-5/igt@kms_vrr@seamless-rr-switch-virtual@pipe-a-edp-1.html

  
#### Warnings ####

  * igt@kms_flip@flip-vs-expired-vblank-interruptible:
    - shard-lnl:          [FAIL][89] ([Intel XE#301] / [Intel XE#3149]) -> [FAIL][90] ([Intel XE#301])
   [89]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-5157-0da1169d23e072343c8076d30551993343d1050e/shard-lnl-4/igt@kms_flip@flip-vs-expired-vblank-interruptible.html
   [90]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-pw-167536v1/shard-lnl-5/igt@kms_flip@flip-vs-expired-vblank-interruptible.html

  
  [Intel XE#1124]: https://gitlab.freedesktop.org/drm/xe/kernel/issues/1124
  [Intel XE#1392]: https://gitlab.freedesktop.org/drm/xe/kernel/issues/1392
  [Intel XE#1407]: https://gitlab.freedesktop.org/drm/xe/kernel/issues/1407
  [Intel XE#1420]: https://gitlab.freedesktop.org/drm/xe/kernel/issues/1420
  [Intel XE#1421]: https://gitlab.freedesktop.org/drm/xe/kernel/issues/1421
  [Intel XE#1424]: https://gitlab.freedesktop.org/drm/xe/kernel/issues/1424
  [Intel XE#1435]: https://gitlab.freedesktop.org/drm/xe/kernel/issues/1435
  [Intel XE#1439]: https://gitlab.freedesktop.org/drm/xe/kernel/issues/1439
  [Intel XE#1469]: https://gitlab.freedesktop.org/drm/xe/kernel/issues/1469
  [Intel XE#1489]: https://gitlab.freedesktop.org/drm/xe/kernel/issues/1489
  [Intel XE#1499]: https://gitlab.freedesktop.org/drm/xe/kernel/issues/1499
  [Intel XE#2029]: https://gitlab.freedesktop.org/drm/xe/kernel/issues/2029
  [Intel XE#2142]: https://gitlab.freedesktop.org/drm/xe/kernel/issues/2142
  [Intel XE#2244]: https://gitlab.freedesktop.org/drm/xe/kernel/issues/2244
  [Intel XE#2252]: https://gitlab.freedesktop.org/drm/xe/kernel/issues/2252
  [Intel XE#2284]: https://gitlab.freedesktop.org/drm/xe/kernel/issues/2284
  [Intel XE#2311]: https://gitlab.freedesktop.org/drm/xe/kernel/issues/2311
  [Intel XE#2313]: https://gitlab.freedesktop.org/drm/xe/kernel/issues/2313
  [Intel XE#2838]: https://gitlab.freedesktop.org/drm/xe/kernel/issues/2838
  [Intel XE#2887]: https://gitlab.freedesktop.org/drm/xe/kernel/issues/2887
  [Intel XE#301]: https://gitlab.freedesktop.org/drm/xe/kernel/issues/301
  [Intel XE#309]: https://gitlab.freedesktop.org/drm/xe/kernel/issues/309
  [Intel XE#3098]: https://gitlab.freedesktop.org/drm/xe/kernel/issues/3098
  [Intel XE#3141]: https://gitlab.freedesktop.org/drm/xe/kernel/issues/3141
  [Intel XE#3149]: https://gitlab.freedesktop.org/drm/xe/kernel/issues/3149
  [Intel XE#3321]: https://gitlab.freedesktop.org/drm/xe/kernel/issues/3321
  [Intel XE#366]: https://gitlab.freedesktop.org/drm/xe/kernel/issues/366
  [Intel XE#373]: https://gitlab.freedesktop.org/drm/xe/kernel/issues/373
  [Intel XE#4141]: https://gitlab.freedesktop.org/drm/xe/kernel/issues/4141
  [Intel XE#4422]: https://gitlab.freedesktop.org/drm/xe/kernel/issues/4422
  [Intel XE#4518]: https://gitlab.freedesktop.org/drm/xe/kernel/issues/4518
  [Intel XE#5742]: https://gitlab.freedesktop.org/drm/xe/kernel/issues/5742
  [Intel XE#6312]: https://gitlab.freedesktop.org/drm/xe/kernel/issues/6312
  [Intel XE#6540]: https://gitlab.freedesktop.org/drm/xe/kernel/issues/6540
  [Intel XE#656]: https://gitlab.freedesktop.org/drm/xe/kernel/issues/656
  [Intel XE#6814]: https://gitlab.freedesktop.org/drm/xe/kernel/issues/6814
  [Intel XE#6874]: https://gitlab.freedesktop.org/drm/xe/kernel/issues/6874
  [Intel XE#688]: https://gitlab.freedesktop.org/drm/xe/kernel/issues/688
  [Intel XE#6901]: https://gitlab.freedesktop.org/drm/xe/kernel/issues/6901
  [Intel XE#6964]: https://gitlab.freedesktop.org/drm/xe/kernel/issues/6964
  [Intel XE#7061]: https://gitlab.freedesktop.org/drm/xe/kernel/issues/7061
  [Intel XE#7084]: https://gitlab.freedesktop.org/drm/xe/kernel/issues/7084
  [Intel XE#7136]: https://gitlab.freedesktop.org/drm/xe/kernel/issues/7136
  [Intel XE#7138]: https://gitlab.freedesktop.org/drm/xe/kernel/issues/7138
  [Intel XE#7178]: https://gitlab.freedesktop.org/drm/xe/kernel/issues/7178
  [Intel XE#7179]: https://gitlab.freedesktop.org/drm/xe/kernel/issues/7179
  [Intel XE#7283]: https://gitlab.freedesktop.org/drm/xe/kernel/issues/7283
  [Intel XE#7328]: https://gitlab.freedesktop.org/drm/xe/kernel/issues/7328
  [Intel XE#7343]: https://gitlab.freedesktop.org/drm/xe/kernel/issues/7343
  [Intel XE#7351]: https://gitlab.freedesktop.org/drm/xe/kernel/issues/7351
  [Intel XE#7356]: https://gitlab.freedesktop.org/drm/xe/kernel/issues/7356
  [Intel XE#7370]: https://gitlab.freedesktop.org/drm/xe/kernel/issues/7370
  [Intel XE#7383]: https://gitlab.freedesktop.org/drm/xe/kernel/issues/7383
  [Intel XE#7395]: https://gitlab.freedesktop.org/drm/xe/kernel/issues/7395
  [Intel XE#7399]: https://gitlab.freedesktop.org/drm/xe/kernel/issues/7399
  [Intel XE#7400]: https://gitlab.freedesktop.org/drm/xe/kernel/issues/7400
  [Intel XE#7402]: https://gitlab.freedesktop.org/drm/xe/kernel/issues/7402
  [Intel XE#7404]: https://gitlab.freedesktop.org/drm/xe/kernel/issues/7404
  [Intel XE#7428]: https://gitlab.freedesktop.org/drm/xe/kernel/issues/7428
  [Intel XE#7442]: https://gitlab.freedesktop.org/drm/xe/kernel/issues/7442
  [Intel XE#7482]: https://gitlab.freedesktop.org/drm/xe/kernel/issues/7482
  [Intel XE#7590]: https://gitlab.freedesktop.org/drm/xe/kernel/issues/7590
  [Intel XE#7599]: https://gitlab.freedesktop.org/drm/xe/kernel/issues/7599
  [Intel XE#7636]: https://gitlab.freedesktop.org/drm/xe/kernel/issues/7636
  [Intel XE#7642]: https://gitlab.freedesktop.org/drm/xe/kernel/issues/7642
  [Intel XE#7865]: https://gitlab.freedesktop.org/drm/xe/kernel/issues/7865
  [Intel XE#7866]: https://gitlab.freedesktop.org/drm/xe/kernel/issues/7866
  [Intel XE#7905]: https://gitlab.freedesktop.org/drm/xe/kernel/issues/7905
  [Intel XE#7915]: https://gitlab.freedesktop.org/drm/xe/kernel/issues/7915
  [Intel XE#8007]: https://gitlab.freedesktop.org/drm/xe/kernel/issues/8007
  [Intel XE#8150]: https://gitlab.freedesktop.org/drm/xe/kernel/issues/8150
  [Intel XE#836]: https://gitlab.freedesktop.org/drm/xe/kernel/issues/836


Build changes
-------------

  * Linux: xe-5157-0da1169d23e072343c8076d30551993343d1050e -> xe-pw-167536v1

  IGT_8943: 8943
  xe-5157-0da1169d23e072343c8076d30551993343d1050e: 0da1169d23e072343c8076d30551993343d1050e
  xe-pw-167536v1: 167536v1

== Logs ==

For more details see: https://intel-gfx-ci.01.org/tree/intel-xe/xe-pw-167536v1/index.html

[-- Attachment #2: Type: text/html, Size: 31897 bytes --]

Re: [PATCH 19/24] drm/{i915,xe}: make intel_dmc_suspend() part of display suspend/shutdown calls

[Ville Syrjälä]

On Fri, May 29, 2026 at 02:04:03PM +0300, Jani Nikula wrote:
> Move the intel_dmc_suspend() calls from i915 and xe suspend and shutdown
> hooks all the way down to a shared location in
> __intel_display_driver_pm_suspend().
> 
> This is a change in the suspend/shutdown sequences, but hopefully one
> without problems.
> 
> Signed-off-by: Jani Nikula <jani.nikula@intel.com>
> ---
>  drivers/gpu/drm/i915/display/intel_display_driver.c | 2 ++
>  drivers/gpu/drm/i915/i915_driver.c                  | 4 ----
>  drivers/gpu/drm/xe/display/xe_display.c             | 4 ----
>  3 files changed, 2 insertions(+), 8 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/display/intel_display_driver.c b/drivers/gpu/drm/i915/display/intel_display_driver.c
> index bc632ac8c9b4..6cac36157bea 100644
> --- a/drivers/gpu/drm/i915/display/intel_display_driver.c
> +++ b/drivers/gpu/drm/i915/display/intel_display_driver.c
> @@ -755,6 +755,8 @@ static int __intel_display_driver_pm_suspend(struct intel_display *display, bool
>  
>  	intel_encoder_suspend_all(display);
>  
> +	intel_dmc_suspend(display);
> +
>  	return ret;
>  }
>  
> diff --git a/drivers/gpu/drm/i915/i915_driver.c b/drivers/gpu/drm/i915/i915_driver.c
> index 209ac512455d..40fc15017486 100644
> --- a/drivers/gpu/drm/i915/i915_driver.c
> +++ b/drivers/gpu/drm/i915/i915_driver.c
> @@ -1045,8 +1045,6 @@ void i915_driver_shutdown(struct drm_i915_private *i915)
>  
>  	intel_irq_suspend(i915);
>  
> -	intel_dmc_suspend(display);
> -

I wonder what we're even trying to achieve here. Just to make sure
the DMC firmware has been loaded before we system suspend? That might
be reasonable, but we now wait for the firmware load somewhere during
driver init due to flip queue needing it. So this all seems rather
redundant now.

>  	i915_gem_suspend(i915);
>  
>  	/*
> @@ -1117,8 +1115,6 @@ static int i915_drm_suspend(struct drm_device *dev)
>  
>  	dev_priv->suspend_count++;
>  
> -	intel_dmc_suspend(display);
> -
>  	enable_rpm_wakeref_asserts(&dev_priv->runtime_pm);
>  
>  	i915_gem_drain_freed_objects(dev_priv);
> diff --git a/drivers/gpu/drm/xe/display/xe_display.c b/drivers/gpu/drm/xe/display/xe_display.c
> index 561ec1ed6845..9416405667d8 100644
> --- a/drivers/gpu/drm/xe/display/xe_display.c
> +++ b/drivers/gpu/drm/xe/display/xe_display.c
> @@ -198,8 +198,6 @@ void xe_display_shutdown(struct xe_device *xe)
>  	intel_display_driver_shutdown(display);
>  
>  	intel_opregion_suspend(display, PCI_D3cold);
> -
> -	intel_dmc_suspend(display);
>  }
>  
>  void xe_display_shutdown_late(struct xe_device *xe)
> @@ -276,8 +274,6 @@ void xe_display_pm_suspend(struct xe_device *xe)
>  	intel_display_driver_pm_suspend(display);
>  
>  	intel_opregion_suspend(display, s2idle ? PCI_D1 : PCI_D3cold);
> -
> -	intel_dmc_suspend(display);
>  }
>  
>  void xe_display_pm_suspend_late(struct xe_device *xe)
> -- 
> 2.47.3

-- 
Ville Syrjälä
Intel

Re: [PATCH 20/24] drm/{i915,xe}: move intel_opregion_suspend() to intel_display_driver_pm_suspend_late()

[Ville Syrjälä]

On Fri, May 29, 2026 at 02:04:04PM +0300, Jani Nikula wrote:
> Try to unify the suspend paths and behaviour by moving the
> intel_opregion_suspend() calls to
> intel_display_driver_pm_suspend_late().
> 
> This is a change in the suspend sequences. The idea behind adding this
> to intel_display_driver_pm_suspend_late() is primarily based on not
> having to pass the s2idle parameter to more functions than that.
> 
> This also changes behaviour for i915 hibernation, going for PCI_D3cold
> instead of PCI_D1 on hibernate. It's probably the correct thing to do
> anyway, I don't think it should matter all that much, but fingers
> crossed.

acpi_target_system_state() should always return S4 for
hibernation. I'm not sure why we even check !hibernation
here... Looks like it's just a pointless thing left over
by commit c7b5abd3e030 ("drm/i915: Remove i915_drm_suspend_mode")

> 
> Signed-off-by: Jani Nikula <jani.nikula@intel.com>
> ---
>  drivers/gpu/drm/i915/display/intel_display_driver.c | 2 ++
>  drivers/gpu/drm/i915/i915_driver.c                  | 4 ----
>  drivers/gpu/drm/xe/display/xe_display.c             | 3 ---
>  3 files changed, 2 insertions(+), 7 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/display/intel_display_driver.c b/drivers/gpu/drm/i915/display/intel_display_driver.c
> index 6cac36157bea..1525ff7a1dc2 100644
> --- a/drivers/gpu/drm/i915/display/intel_display_driver.c
> +++ b/drivers/gpu/drm/i915/display/intel_display_driver.c
> @@ -770,6 +770,8 @@ void intel_display_driver_pm_suspend_late(struct intel_display *display, bool s2
>  	if (!HAS_DISPLAY(display))
>  		return;
>  
> +	intel_opregion_suspend(display, s2idle ? PCI_D1 : PCI_D3cold);
> +
>  	intel_display_power_suspend_late(display, s2idle);
>  }
>  
> diff --git a/drivers/gpu/drm/i915/i915_driver.c b/drivers/gpu/drm/i915/i915_driver.c
> index 40fc15017486..7d0f98cbf5d9 100644
> --- a/drivers/gpu/drm/i915/i915_driver.c
> +++ b/drivers/gpu/drm/i915/i915_driver.c
> @@ -1096,7 +1096,6 @@ static int i915_drm_suspend(struct drm_device *dev)
>  {
>  	struct drm_i915_private *dev_priv = to_i915(dev);
>  	struct intel_display *display = dev_priv->display;
> -	pci_power_t opregion_target_state;
>  
>  	disable_rpm_wakeref_asserts(&dev_priv->runtime_pm);
>  
> @@ -1110,9 +1109,6 @@ static int i915_drm_suspend(struct drm_device *dev)
>  
>  	i9xx_display_sr_save(display);
>  
> -	opregion_target_state = suspend_to_idle(dev_priv) ? PCI_D1 : PCI_D3cold;
> -	intel_opregion_suspend(display, opregion_target_state);
> -
>  	dev_priv->suspend_count++;
>  
>  	enable_rpm_wakeref_asserts(&dev_priv->runtime_pm);
> diff --git a/drivers/gpu/drm/xe/display/xe_display.c b/drivers/gpu/drm/xe/display/xe_display.c
> index 9416405667d8..73891b36341b 100644
> --- a/drivers/gpu/drm/xe/display/xe_display.c
> +++ b/drivers/gpu/drm/xe/display/xe_display.c
> @@ -266,14 +266,11 @@ static bool suspend_to_idle(void)
>  void xe_display_pm_suspend(struct xe_device *xe)
>  {
>  	struct intel_display *display = xe->display;
> -	bool s2idle = suspend_to_idle();
>  
>  	if (!xe->info.probe_display)
>  		return;
>  
>  	intel_display_driver_pm_suspend(display);
> -
> -	intel_opregion_suspend(display, s2idle ? PCI_D1 : PCI_D3cold);
>  }
>  
>  void xe_display_pm_suspend_late(struct xe_device *xe)
> -- 
> 2.47.3

-- 
Ville Syrjälä
Intel

Re: [PATCH 15/24] drm/i915: add intel_display_driver_shutdown()

[Ville Syrjälä]

On Fri, May 29, 2026 at 02:03:59PM +0300, Jani Nikula wrote:
> Add intel_display_driver_shutdown() to be called from the struct
> pci_driver .shutdown path. Initially, only migrate i915, as there are
> some subtle differences with xe that will be addressed later.
> 
> Pick up as much as we can at this point without making major functional
> changes.
> 
> There's a slight functional change in that
> intel_display_driver_shutdown() returns early for !HAS_DISPLAY(). Assume
> this is what we want, and there are no cases where display engine is
> present but all pipes have been fused off.
> 
> Signed-off-by: Jani Nikula <jani.nikula@intel.com>

Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>

> ---
>  .../drm/i915/display/intel_display_driver.c   | 28 +++++++++++++++++++
>  .../drm/i915/display/intel_display_driver.h   |  1 +
>  drivers/gpu/drm/i915/i915_driver.c            | 24 +---------------
>  3 files changed, 30 insertions(+), 23 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/display/intel_display_driver.c b/drivers/gpu/drm/i915/display/intel_display_driver.c
> index 7f2d191b9ef0..90b2a62798c1 100644
> --- a/drivers/gpu/drm/i915/display/intel_display_driver.c
> +++ b/drivers/gpu/drm/i915/display/intel_display_driver.c
> @@ -681,6 +681,34 @@ void intel_display_driver_unregister(struct intel_display *display)
>  	intel_vga_unregister(display);
>  }
>  
> +void intel_display_driver_shutdown(struct intel_display *display)
> +{
> +	if (!HAS_DISPLAY(display))
> +		return;
> +
> +	intel_display_power_disable(display);
> +
> +	drm_client_dev_suspend(display->drm);
> +	drm_kms_helper_poll_disable(display->drm);
> +
> +	intel_display_driver_disable_user_access(display);
> +
> +	drm_atomic_helper_shutdown(display->drm);
> +
> +	flush_workqueue(display->wq.cleanup);
> +
> +	intel_dp_mst_suspend(display);
> +
> +	intel_encoder_block_all_hpds(display);
> +
> +	intel_hpd_cancel_work(display);
> +
> +	intel_display_driver_suspend_access(display);
> +
> +	intel_encoder_suspend_all(display);
> +	intel_encoder_shutdown_all(display);
> +}
> +
>  void intel_display_driver_shutdown_late(struct intel_display *display)
>  {
>  	if (!HAS_DISPLAY(display))
> diff --git a/drivers/gpu/drm/i915/display/intel_display_driver.h b/drivers/gpu/drm/i915/display/intel_display_driver.h
> index 61515577758b..7eca3d17dd82 100644
> --- a/drivers/gpu/drm/i915/display/intel_display_driver.h
> +++ b/drivers/gpu/drm/i915/display/intel_display_driver.h
> @@ -24,6 +24,7 @@ void intel_display_driver_remove(struct intel_display *display);
>  void intel_display_driver_remove_noirq(struct intel_display *display);
>  void intel_display_driver_remove_nogem(struct intel_display *display);
>  void intel_display_driver_unregister(struct intel_display *display);
> +void intel_display_driver_shutdown(struct intel_display *display);
>  void intel_display_driver_shutdown_late(struct intel_display *display);
>  
>  int intel_display_driver_pm_suspend(struct intel_display *display);
> diff --git a/drivers/gpu/drm/i915/i915_driver.c b/drivers/gpu/drm/i915/i915_driver.c
> index 140c562a8627..80313ee07b07 100644
> --- a/drivers/gpu/drm/i915/i915_driver.c
> +++ b/drivers/gpu/drm/i915/i915_driver.c
> @@ -54,7 +54,6 @@
>  #include "display/intel_bw.h"
>  #include "display/intel_cdclk.h"
>  #include "display/intel_crtc.h"
> -#include "display/intel_display_core.h"
>  #include "display/intel_display_device.h"
>  #include "display/intel_display_driver.h"
>  #include "display/intel_display_power.h"
> @@ -1042,29 +1041,8 @@ void i915_driver_shutdown(struct drm_i915_private *i915)
>  
>  	disable_rpm_wakeref_asserts(&i915->runtime_pm);
>  	intel_runtime_pm_disable(&i915->runtime_pm);
> -	intel_display_power_disable(display);
>  
> -	drm_client_dev_suspend(&i915->drm);
> -	if (intel_display_device_present(display)) {
> -		drm_kms_helper_poll_disable(&i915->drm);
> -		intel_display_driver_disable_user_access(display);
> -
> -		drm_atomic_helper_shutdown(&i915->drm);
> -	}
> -
> -	flush_workqueue(display->wq.cleanup);
> -
> -	intel_dp_mst_suspend(display);
> -
> -	intel_encoder_block_all_hpds(display);
> -
> -	intel_hpd_cancel_work(display);
> -
> -	if (intel_display_device_present(display))
> -		intel_display_driver_suspend_access(display);
> -
> -	intel_encoder_suspend_all(display);
> -	intel_encoder_shutdown_all(display);
> +	intel_display_driver_shutdown(display);
>  
>  	intel_irq_suspend(i915);
>  
> -- 
> 2.47.3

-- 
Ville Syrjälä
Intel

Re: [PATCH 16/24] drm/i915/display: deduplicate suspend and shutdown a bit

[Ville Syrjälä]

On Fri, May 29, 2026 at 02:04:00PM +0300, Jani Nikula wrote:
> intel_display_driver_shutdown() and intel_display_driver_pm_suspend()
> are quite similar. Abstract a shared function to call from both.
> 
> This is intentionally just the first non-functional step. More gradual
> changes will follow.
> 
> Signed-off-by: Jani Nikula <jani.nikula@intel.com>

Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>

> ---
>  .../drm/i915/display/intel_display_driver.c   | 45 ++++++++++---------
>  1 file changed, 23 insertions(+), 22 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/display/intel_display_driver.c b/drivers/gpu/drm/i915/display/intel_display_driver.c
> index 90b2a62798c1..0dd0b15641eb 100644
> --- a/drivers/gpu/drm/i915/display/intel_display_driver.c
> +++ b/drivers/gpu/drm/i915/display/intel_display_driver.c
> @@ -66,6 +66,8 @@
>  #include "intel_wm.h"
>  #include "skl_watermark.h"
>  
> +static int __intel_display_driver_pm_suspend(struct intel_display *display, bool shutdown);
> +
>  bool intel_display_driver_probe_defer(struct pci_dev *pdev)
>  {
>  	struct drm_privacy_screen *privacy_screen;
> @@ -686,18 +688,7 @@ void intel_display_driver_shutdown(struct intel_display *display)
>  	if (!HAS_DISPLAY(display))
>  		return;
>  
> -	intel_display_power_disable(display);
> -
> -	drm_client_dev_suspend(display->drm);
> -	drm_kms_helper_poll_disable(display->drm);
> -
> -	intel_display_driver_disable_user_access(display);
> -
> -	drm_atomic_helper_shutdown(display->drm);
> -
> -	flush_workqueue(display->wq.cleanup);
> -
> -	intel_dp_mst_suspend(display);
> +	__intel_display_driver_pm_suspend(display, true);
>  
>  	intel_encoder_block_all_hpds(display);
>  
> @@ -726,10 +717,9 @@ void intel_display_driver_shutdown_late(struct intel_display *display)
>   * turn all crtc's off, but do not adjust state
>   * This has to be paired with a call to intel_modeset_setup_hw_state.
>   */
> -int intel_display_driver_pm_suspend(struct intel_display *display)
> +static int __intel_display_driver_pm_suspend(struct intel_display *display, bool shutdown)
>  {
> -	struct drm_atomic_commit *state;
> -	int ret;
> +	int ret = 0;
>  
>  	if (!HAS_DISPLAY(display))
>  		return 0;
> @@ -745,13 +735,19 @@ int intel_display_driver_pm_suspend(struct intel_display *display)
>  	drm_kms_helper_poll_disable(display->drm);
>  	intel_display_driver_disable_user_access(display);
>  
> -	state = drm_atomic_helper_suspend(display->drm);
> -	ret = PTR_ERR_OR_ZERO(state);
> -	if (ret)
> -		drm_err(display->drm, "Suspending crtc's failed with %i\n",
> -			ret);
> -	else
> -		display->restore.modeset_state = state;
> +	if (shutdown) {
> +		drm_atomic_helper_shutdown(display->drm);
> +	} else {
> +		struct drm_atomic_commit *state;
> +
> +		state = drm_atomic_helper_suspend(display->drm);
> +		ret = PTR_ERR_OR_ZERO(state);
> +		if (ret)
> +			drm_err(display->drm, "Suspending crtc's failed with %i\n",
> +				ret);
> +		else
> +			display->restore.modeset_state = state;
> +	}
>  
>  	/* ensure all DPT VMAs have been unpinned for intel_dpt_suspend() */
>  	flush_workqueue(display->wq.cleanup);
> @@ -761,6 +757,11 @@ int intel_display_driver_pm_suspend(struct intel_display *display)
>  	return ret;
>  }
>  
> +int intel_display_driver_pm_suspend(struct intel_display *display)
> +{
> +	return __intel_display_driver_pm_suspend(display, false);
> +}
> +
>  void intel_display_driver_pm_suspend_late(struct intel_display *display, bool s2idle)
>  {
>  	if (!HAS_DISPLAY(display))
> -- 
> 2.47.3

-- 
Ville Syrjälä
Intel

Re: [PATCH 17/24] drm/xe/display: use intel_display_driver_pm_shutdown()

[Ville Syrjälä]

On Fri, May 29, 2026 at 02:04:01PM +0300, Jani Nikula wrote:
> Replace direct intel_display_driver_pm_suspend() and additional calls
> with intel_display_driver_pm_shutdown(). This switches to use
                           ^^^

Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>

> drm_atomic_helper_shutdown() instead of drm_atomic_helper_suspend(),
> which is the more appropriate thing to do anyway.
> 
> Not calling intel_display_driver_pm_suspend() from the xe shutdown path
> unblocks further follow-up changes.
> 
> There's a slight functional change in that
> intel_display_driver_shutdown() returns early for !HAS_DISPLAY(). Assume
> this is what we want, and there are no cases where display engine is
> present but all pipes have been fused off.
> 
> Signed-off-by: Jani Nikula <jani.nikula@intel.com>
> ---
>  drivers/gpu/drm/xe/display/xe_display.c | 11 +----------
>  1 file changed, 1 insertion(+), 10 deletions(-)
> 
> diff --git a/drivers/gpu/drm/xe/display/xe_display.c b/drivers/gpu/drm/xe/display/xe_display.c
> index fdc999c62bc9..99bcaa49d11a 100644
> --- a/drivers/gpu/drm/xe/display/xe_display.c
> +++ b/drivers/gpu/drm/xe/display/xe_display.c
> @@ -196,16 +196,7 @@ void xe_display_shutdown(struct xe_device *xe)
>  	if (!xe->info.probe_display)
>  		return;
>  
> -	intel_display_driver_pm_suspend(display);
> -
> -	intel_encoder_block_all_hpds(display);
> -	intel_hpd_cancel_work(display);
> -
> -	if (intel_display_device_present(display))
> -		intel_display_driver_suspend_access(display);
> -
> -	intel_encoder_suspend_all(display);
> -	intel_encoder_shutdown_all(display);
> +	intel_display_driver_shutdown(display);
>  
>  	intel_opregion_suspend(display, PCI_D3cold);
>  
> -- 
> 2.47.3

-- 
Ville Syrjälä
Intel

Re: [PATCH 18/24] drm/{i915,xe}: move more stuff to __intel_display_driver_pm_suspend()

[Ville Syrjälä]

On Fri, May 29, 2026 at 02:04:02PM +0300, Jani Nikula wrote:
> The calls leading up to __intel_display_driver_pm_suspend() are
> surrounded by near identical display calls. Move the calls inside
> __intel_display_driver_pm_suspend() to clean up and deduplicate.
> 
> There's a slight functional change in that
> intel_display_driver_pm_suspend() returns early for
> !HAS_DISPLAY(). Assume this is what we want, and there are no cases
> where display engine is present but all pipes have been fused off.
> 
> Signed-off-by: Jani Nikula <jani.nikula@intel.com>

Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>

> ---
>  .../gpu/drm/i915/display/intel_display_driver.c   | 15 ++++++++-------
>  drivers/gpu/drm/i915/i915_driver.c                | 10 ----------
>  drivers/gpu/drm/xe/display/xe_display.c           | 10 ----------
>  3 files changed, 8 insertions(+), 27 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/display/intel_display_driver.c b/drivers/gpu/drm/i915/display/intel_display_driver.c
> index 0dd0b15641eb..bc632ac8c9b4 100644
> --- a/drivers/gpu/drm/i915/display/intel_display_driver.c
> +++ b/drivers/gpu/drm/i915/display/intel_display_driver.c
> @@ -690,13 +690,6 @@ void intel_display_driver_shutdown(struct intel_display *display)
>  
>  	__intel_display_driver_pm_suspend(display, true);
>  
> -	intel_encoder_block_all_hpds(display);
> -
> -	intel_hpd_cancel_work(display);
> -
> -	intel_display_driver_suspend_access(display);
> -
> -	intel_encoder_suspend_all(display);
>  	intel_encoder_shutdown_all(display);
>  }
>  
> @@ -754,6 +747,14 @@ static int __intel_display_driver_pm_suspend(struct intel_display *display, bool
>  
>  	intel_dp_mst_suspend(display);
>  
> +	intel_encoder_block_all_hpds(display);
> +
> +	intel_hpd_cancel_work(display);
> +
> +	intel_display_driver_suspend_access(display);
> +
> +	intel_encoder_suspend_all(display);
> +
>  	return ret;
>  }
>  
> diff --git a/drivers/gpu/drm/i915/i915_driver.c b/drivers/gpu/drm/i915/i915_driver.c
> index 80313ee07b07..209ac512455d 100644
> --- a/drivers/gpu/drm/i915/i915_driver.c
> +++ b/drivers/gpu/drm/i915/i915_driver.c
> @@ -61,7 +61,6 @@
>  #include "display/intel_dp.h"
>  #include "display/intel_dpt.h"
>  #include "display/intel_dram.h"
> -#include "display/intel_encoder.h"
>  #include "display/intel_fbdev.h"
>  #include "display/intel_gmbus.h"
>  #include "display/intel_hotplug.h"
> @@ -1105,15 +1104,6 @@ static int i915_drm_suspend(struct drm_device *dev)
>  
>  	intel_display_driver_pm_suspend(display);
>  
> -	intel_encoder_block_all_hpds(display);
> -
> -	intel_hpd_cancel_work(display);
> -
> -	if (intel_display_device_present(display))
> -		intel_display_driver_suspend_access(display);
> -
> -	intel_encoder_suspend_all(display);
> -
>  	intel_irq_suspend(dev_priv);
>  
>  	/* Must be called before GGTT is suspended. */
> diff --git a/drivers/gpu/drm/xe/display/xe_display.c b/drivers/gpu/drm/xe/display/xe_display.c
> index 99bcaa49d11a..561ec1ed6845 100644
> --- a/drivers/gpu/drm/xe/display/xe_display.c
> +++ b/drivers/gpu/drm/xe/display/xe_display.c
> @@ -30,7 +30,6 @@
>  #include "intel_dmc_wl.h"
>  #include "intel_dp.h"
>  #include "intel_dram.h"
> -#include "intel_encoder.h"
>  #include "intel_fbdev.h"
>  #include "intel_hdcp.h"
>  #include "intel_hotplug.h"
> @@ -276,15 +275,6 @@ void xe_display_pm_suspend(struct xe_device *xe)
>  
>  	intel_display_driver_pm_suspend(display);
>  
> -	intel_encoder_block_all_hpds(display);
> -
> -	intel_hpd_cancel_work(display);
> -
> -	if (intel_display_device_present(display)) {
> -		intel_display_driver_suspend_access(display);
> -		intel_encoder_suspend_all(display);
> -	}
> -
>  	intel_opregion_suspend(display, s2idle ? PCI_D1 : PCI_D3cold);
>  
>  	intel_dmc_suspend(display);
> -- 
> 2.47.3

-- 
Ville Syrjälä
Intel

Re: [PATCH 21/24] drm/{i915,xe}: keep moving stuff to intel_display_driver_pm_resume()

[Ville Syrjälä]

On Fri, May 29, 2026 at 02:04:05PM +0300, Jani Nikula wrote:
> The calls to intel_display_driver_pm_resume() are preceded with similar
> calls. Move the calls inside intel_display_driver_pm_resume().
> 
> In i915 the calls are interspersed among other things, so this is a
> functional change. Fingers crossed.
> 
> There's a slight functional change in that
> intel_display_driver_pm_resume() returns early for
> !HAS_DISPLAY(). Assume this is what we want, and there are no cases
> where display engine is present but all pipes have been fused off.
> 
> Signed-off-by: Jani Nikula <jani.nikula@intel.com>
> ---
>  drivers/gpu/drm/i915/display/intel_display_driver.c | 6 ++++++
>  drivers/gpu/drm/i915/i915_driver.c                  | 8 --------
>  drivers/gpu/drm/xe/display/xe_display.c             | 7 -------
>  3 files changed, 6 insertions(+), 15 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/display/intel_display_driver.c b/drivers/gpu/drm/i915/display/intel_display_driver.c
> index 1525ff7a1dc2..84807a9bff2b 100644
> --- a/drivers/gpu/drm/i915/display/intel_display_driver.c
> +++ b/drivers/gpu/drm/i915/display/intel_display_driver.c
> @@ -831,6 +831,12 @@ void intel_display_driver_pm_resume(struct intel_display *display)
>  	if (!HAS_DISPLAY(display))
>  		return;
>  
> +	intel_dmc_resume(display);
> +
> +	drm_mode_config_reset(display->drm);
> +
> +	intel_display_driver_init_hw(display);
> +
>  	intel_display_driver_resume_access(display);
>  
>  	intel_hpd_init(display);
> diff --git a/drivers/gpu/drm/i915/i915_driver.c b/drivers/gpu/drm/i915/i915_driver.c
> index 7d0f98cbf5d9..6b9e1b268a89 100644
> --- a/drivers/gpu/drm/i915/i915_driver.c
> +++ b/drivers/gpu/drm/i915/i915_driver.c
> @@ -57,7 +57,6 @@
>  #include "display/intel_display_device.h"
>  #include "display/intel_display_driver.h"
>  #include "display/intel_display_power.h"
> -#include "display/intel_dmc.h"
>  #include "display/intel_dp.h"
>  #include "display/intel_dpt.h"
>  #include "display/intel_dram.h"
> @@ -1233,8 +1232,6 @@ static int i915_drm_resume(struct drm_device *dev)
>  	/* Must be called after GGTT is resumed. */
>  	intel_dpt_resume(display);
>  
> -	intel_dmc_resume(display);
> -
>  	i9xx_display_sr_restore(display);
>  
>  	intel_gmbus_reset(display);
> @@ -1255,13 +1252,8 @@ static int i915_drm_resume(struct drm_device *dev)
>  	 */
>  	intel_irq_resume(dev_priv);
>  
> -	if (intel_display_device_present(display))
> -		drm_mode_config_reset(dev);
> -
>  	i915_gem_resume(dev_priv);
>  
> -	intel_display_driver_init_hw(display);
> -
>  	intel_clock_gating_init(&dev_priv->drm);

Apparently intel_display_driver_init_hw() is the
init_clock_gating() for icl+, and it looks like we still 
haven't finished the actual init_clock_gating() display
vs. gt split. Would have been nice to move all the display
clock gating stuff in one go to the same place. But so far
it looks like a clean split between icl+ vs. pre-icl (ie.
no platforms that do both) so seems safe enough to move
just one of them I guess.

Can't immediately think of any weird dependencies here so
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>

>  
>  	intel_display_driver_pm_resume(display);
> diff --git a/drivers/gpu/drm/xe/display/xe_display.c b/drivers/gpu/drm/xe/display/xe_display.c
> index 73891b36341b..b153bf9c83d8 100644
> --- a/drivers/gpu/drm/xe/display/xe_display.c
> +++ b/drivers/gpu/drm/xe/display/xe_display.c
> @@ -301,13 +301,6 @@ void xe_display_pm_resume(struct xe_device *xe)
>  	if (!xe->info.probe_display)
>  		return;
>  
> -	intel_dmc_resume(display);
> -
> -	if (intel_display_device_present(display))
> -		drm_mode_config_reset(&xe->drm);
> -
> -	intel_display_driver_init_hw(display);
> -
>  	intel_display_driver_pm_resume(display);
>  }
>  
> -- 
> 2.47.3

-- 
Ville Syrjälä
Intel

Re: [PATCH 22/24] drm/i915: add intel_display_driver_pm_runtime*() functions

[Ville Syrjälä]

On Fri, May 29, 2026 at 02:04:06PM +0300, Jani Nikula wrote:
> Add new functions intel_display_driver_pm_runtime_suspend(),
> intel_display_driver_pm_runtime_suspend_late(),
> intel_display_driver_pm_runtime_resume_early(), and
> intel_display_driver_pm_runtime_resume(). Initially, only migrate i915,
> as there are some differences with xe that will be addressed later.
> 
> There are a few functional changes, which should be benign:
> 
> - i915_pm_runtime_suspend() moves assert_forcewakes_inactive() call
>   before opregion calls.
> 
> - i915_pm_runtime_resume() moves intel_opregion_notify_adapter() call
>   slightly later.
> 
> In the interest of not introducing more severe functional changes, the
> calls become slightly asymmetric. We might want to address this later.
> 
> Signed-off-by: Jani Nikula <jani.nikula@intel.com>

Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>

> ---
>  .../drm/i915/display/intel_display_driver.c   | 56 +++++++++++++++++++
>  .../drm/i915/display/intel_display_driver.h   |  5 ++
>  drivers/gpu/drm/i915/i915_driver.c            | 44 ++-------------
>  3 files changed, 65 insertions(+), 40 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/display/intel_display_driver.c b/drivers/gpu/drm/i915/display/intel_display_driver.c
> index 84807a9bff2b..a27ddf21b08b 100644
> --- a/drivers/gpu/drm/i915/display/intel_display_driver.c
> +++ b/drivers/gpu/drm/i915/display/intel_display_driver.c
> @@ -884,3 +884,59 @@ void intel_display_driver_pm_resume(struct intel_display *display)
>  
>  	intel_display_power_enable(display);
>  }
> +
> +void intel_display_driver_pm_runtime_suspend(struct intel_display *display)
> +{
> +	intel_display_power_runtime_suspend(display);
> +}
> +
> +void intel_display_driver_pm_runtime_suspend_late(struct intel_display *display)
> +{
> +	/*
> +	 * FIXME: We really should find a document that references the arguments
> +	 * used below!
> +	 */
> +	if (display->platform.broadwell) {
> +		/*
> +		 * On Broadwell, if we use PCI_D1 the PCH DDI ports will stop
> +		 * being detected, and the call we do at i915_pm_runtime_resume()
> +		 * won't be able to restore them. Since PCI_D3hot matches the
> +		 * actual specification and appears to be working, use it.
> +		 */
> +		intel_opregion_notify_adapter(display, PCI_D3hot);
> +	} else {
> +		/*
> +		 * current versions of firmware which depend on this opregion
> +		 * notification have repurposed the D1 definition to mean
> +		 * "runtime suspended" vs. what you would normally expect (D3)
> +		 * to distinguish it from notifications that might be sent via
> +		 * the suspend path.
> +		 */
> +		intel_opregion_notify_adapter(display, PCI_D1);
> +	}
> +
> +	if (!display->platform.valleyview && !display->platform.cherryview)
> +		intel_hpd_poll_enable(display);
> +}
> +
> +void intel_display_driver_pm_runtime_resume_early(struct intel_display *display)
> +{
> +	intel_opregion_notify_adapter(display, PCI_D0);
> +
> +	intel_display_power_runtime_resume(display);
> +}
> +
> +void intel_display_driver_pm_runtime_resume(struct intel_display *display)
> +{
> +	/*
> +	 * On VLV/CHV display interrupts are part of the display
> +	 * power well, so hpd is reinitialized from there. For
> +	 * everyone else do it here.
> +	 */
> +	if (!display->platform.valleyview && !display->platform.cherryview) {
> +		intel_hpd_init(display);
> +		intel_hpd_poll_disable(display);
> +	}
> +
> +	skl_watermark_ipc_update(display);
> +}
> diff --git a/drivers/gpu/drm/i915/display/intel_display_driver.h b/drivers/gpu/drm/i915/display/intel_display_driver.h
> index 7eca3d17dd82..1b494337d629 100644
> --- a/drivers/gpu/drm/i915/display/intel_display_driver.h
> +++ b/drivers/gpu/drm/i915/display/intel_display_driver.h
> @@ -43,5 +43,10 @@ void intel_display_driver_suspend_access(struct intel_display *display);
>  void intel_display_driver_resume_access(struct intel_display *display);
>  bool intel_display_driver_check_access(struct intel_display *display);
>  
> +void intel_display_driver_pm_runtime_suspend(struct intel_display *display);
> +void intel_display_driver_pm_runtime_suspend_late(struct intel_display *display);
> +void intel_display_driver_pm_runtime_resume_early(struct intel_display *display);
> +void intel_display_driver_pm_runtime_resume(struct intel_display *display);
> +
>  #endif /* __INTEL_DISPLAY_DRIVER_H__ */
>  
> diff --git a/drivers/gpu/drm/i915/i915_driver.c b/drivers/gpu/drm/i915/i915_driver.c
> index 6b9e1b268a89..519a519d2d96 100644
> --- a/drivers/gpu/drm/i915/i915_driver.c
> +++ b/drivers/gpu/drm/i915/i915_driver.c
> @@ -1521,7 +1521,7 @@ static int i915_pm_runtime_suspend(struct device *kdev)
>  	for_each_gt(gt, dev_priv, i)
>  		intel_uncore_suspend(gt->uncore);
>  
> -	intel_display_power_runtime_suspend(display);
> +	intel_display_driver_pm_runtime_suspend(display);
>  
>  	ret = vlv_suspend_complete(dev_priv);
>  	if (ret) {
> @@ -1555,33 +1555,9 @@ static int i915_pm_runtime_suspend(struct device *kdev)
>  	if (root_pdev)
>  		pci_d3cold_disable(root_pdev);
>  
> -	/*
> -	 * FIXME: We really should find a document that references the arguments
> -	 * used below!
> -	 */
> -	if (IS_BROADWELL(dev_priv)) {
> -		/*
> -		 * On Broadwell, if we use PCI_D1 the PCH DDI ports will stop
> -		 * being detected, and the call we do at i915_pm_runtime_resume()
> -		 * won't be able to restore them. Since PCI_D3hot matches the
> -		 * actual specification and appears to be working, use it.
> -		 */
> -		intel_opregion_notify_adapter(display, PCI_D3hot);
> -	} else {
> -		/*
> -		 * current versions of firmware which depend on this opregion
> -		 * notification have repurposed the D1 definition to mean
> -		 * "runtime suspended" vs. what you would normally expect (D3)
> -		 * to distinguish it from notifications that might be sent via
> -		 * the suspend path.
> -		 */
> -		intel_opregion_notify_adapter(display, PCI_D1);
> -	}
> -
>  	assert_forcewakes_inactive(&dev_priv->uncore);
>  
> -	if (!IS_VALLEYVIEW(dev_priv) && !IS_CHERRYVIEW(dev_priv))
> -		intel_hpd_poll_enable(display);
> +	intel_display_driver_pm_runtime_suspend_late(display);
>  
>  	drm_dbg(&dev_priv->drm, "Device suspended\n");
>  	return 0;
> @@ -1605,8 +1581,6 @@ static int i915_pm_runtime_resume(struct device *kdev)
>  	drm_WARN_ON_ONCE(&dev_priv->drm, atomic_read(&rpm->wakeref_count));
>  	disable_rpm_wakeref_asserts(rpm);
>  
> -	intel_opregion_notify_adapter(display, PCI_D0);
> -
>  	root_pdev = pcie_find_root_port(pdev);
>  	if (root_pdev)
>  		pci_d3cold_enable(root_pdev);
> @@ -1615,7 +1589,7 @@ static int i915_pm_runtime_resume(struct device *kdev)
>  		drm_dbg(&dev_priv->drm,
>  			"Unclaimed access during suspend, bios?\n");
>  
> -	intel_display_power_runtime_resume(display);
> +	intel_display_driver_pm_runtime_resume_early(display);
>  
>  	ret = vlv_resume_prepare(dev_priv, true);
>  
> @@ -1633,17 +1607,7 @@ static int i915_pm_runtime_resume(struct device *kdev)
>  
>  	intel_pxp_runtime_resume(dev_priv->pxp);
>  
> -	/*
> -	 * On VLV/CHV display interrupts are part of the display
> -	 * power well, so hpd is reinitialized from there. For
> -	 * everyone else do it here.
> -	 */
> -	if (!IS_VALLEYVIEW(dev_priv) && !IS_CHERRYVIEW(dev_priv)) {
> -		intel_hpd_init(display);
> -		intel_hpd_poll_disable(display);
> -	}
> -
> -	skl_watermark_ipc_update(display);
> +	intel_display_driver_pm_runtime_resume(display);
>  
>  	enable_rpm_wakeref_asserts(rpm);
>  
> -- 
> 2.47.3

-- 
Ville Syrjälä
Intel

Re: [PATCH 23/24] drm/xe/display: separate d3cold handling from xe_display_pm_runtime_suspend_late()

[Ville Syrjälä]

On Fri, May 29, 2026 at 02:04:07PM +0300, Jani Nikula wrote:
> Make the special d3cold paths completely separate from the rest of the
> runtime pm calls.
> 
> The intel_dmc_wl_flush_release_work() call right after
> xe_display_pm_suspend_late() might be completely redundant, but this
> avoids any functional changes.
> 
> Signed-off-by: Jani Nikula <jani.nikula@intel.com>

Acked-by: Ville Syrjälä <ville.syrjala@linux.intel.com>

> ---
>  drivers/gpu/drm/xe/display/xe_display.c | 5 ++++-
>  1 file changed, 4 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/gpu/drm/xe/display/xe_display.c b/drivers/gpu/drm/xe/display/xe_display.c
> index b153bf9c83d8..0fadc62e1cdd 100644
> --- a/drivers/gpu/drm/xe/display/xe_display.c
> +++ b/drivers/gpu/drm/xe/display/xe_display.c
> @@ -373,8 +373,11 @@ void xe_display_pm_runtime_suspend_late(struct xe_device *xe)
>  	if (!xe->info.probe_display)
>  		return;
>  
> -	if (xe->d3cold.allowed)
> +	if (xe->d3cold.allowed) {
>  		xe_display_pm_suspend_late(xe);
> +		intel_dmc_wl_flush_release_work(display);
> +		return;
> +	}
>  
>  	/*
>  	 * If xe_display_pm_suspend_late() is not called, it is likely
> -- 
> 2.47.3

-- 
Ville Syrjälä
Intel

Re: [PATCH 24/24] drm/xe/display: unify runtime suspend/resume with i915 for non-d3cold

[Ville Syrjälä]

On Fri, May 29, 2026 at 02:04:08PM +0300, Jani Nikula wrote:
> With the special d3cold handling in xe runtime suspend/resume separated,
> unify the non-d3cold paths with i915. There are multiple changes here at
> once that probably wouldn't make much sense to split out further.
> 
> Add the call to intel_display_driver_pm_runtime_suspend(), which in turn
> starts calling intel_display_power_runtime_suspend(). Deep down, this
> should take care of intel_dmc_wl_flush_release_work(), allowing us to
> drop the extra call in xe_display_pm_runtime_suspend_late().
> 
> Add the call to intel_display_driver_pm_runtime_suspend_late(), which
> starts calling intel_opregion_notify_adapter(). The
> intel_hpd_poll_enable() call is also done here, postponed from the
> previous location in xe_display_pm_runtime_suspend().
> 
> Add the call to intel_display_driver_pm_runtime_resume_early(), which
> contains the intel_display_power_runtime_resume() and
> intel_opregion_notify_adapter() counterparts found in
> intel_display_power_runtime_suspend() and
> intel_display_power_runtime_suspend_late(). (They are not symmetric.)
> 
> Finally, intel_display_driver_pm_runtime_resume() replaces the direct
> calls to intel_hpd_init(), intel_hpd_poll_disable(), and
> skl_watermark_ipc_update().
> 
> Signed-off-by: Jani Nikula <jani.nikula@intel.com>
> ---
>  drivers/gpu/drm/xe/display/xe_display.c | 14 ++++----------
>  1 file changed, 4 insertions(+), 10 deletions(-)
> 
> diff --git a/drivers/gpu/drm/xe/display/xe_display.c b/drivers/gpu/drm/xe/display/xe_display.c
> index 0fadc62e1cdd..cd7264d7dfe2 100644
> --- a/drivers/gpu/drm/xe/display/xe_display.c
> +++ b/drivers/gpu/drm/xe/display/xe_display.c
> @@ -363,7 +363,7 @@ void xe_display_pm_runtime_suspend(struct xe_device *xe)
>  		return;
>  	}
>  
> -	intel_hpd_poll_enable(display);
> +	intel_display_driver_pm_runtime_suspend(display);
>  }
>  
>  void xe_display_pm_runtime_suspend_late(struct xe_device *xe)
> @@ -379,12 +379,7 @@ void xe_display_pm_runtime_suspend_late(struct xe_device *xe)
>  		return;
>  	}
>  
> -	/*
> -	 * If xe_display_pm_suspend_late() is not called, it is likely
> -	 * that we will be on dynamic DC states with DMC wakelock enabled. We
> -	 * need to flush the release work in that case.
> -	 */

The entire comment seems wonky. I don't think we have any platforms
with wakelock+!DC9. Ah, it was added exactly because the D3cold path
is broken and doesn't go into DC9. Would have been better to fix the
actual problem instead. I guess you should move the comment to the
D3cold path in the previous patch to keep it where it actually makes
some sense.

Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>

> -	intel_dmc_wl_flush_release_work(display);
> +	intel_display_driver_pm_runtime_suspend_late(display);
>  }
>  
>  void xe_display_pm_runtime_resume(struct xe_device *xe)
> @@ -399,9 +394,8 @@ void xe_display_pm_runtime_resume(struct xe_device *xe)
>  		return;
>  	}
>  
> -	intel_hpd_init(display);
> -	intel_hpd_poll_disable(display);
> -	skl_watermark_ipc_update(display);
> +	intel_display_driver_pm_runtime_resume_early(display);
> +	intel_display_driver_pm_runtime_resume(display);
>  }
>  
>  
> -- 
> 2.47.3

-- 
Ville Syrjälä
Intel

Re: [PATCH 19/24] drm/{i915,xe}: make intel_dmc_suspend() part of display suspend/shutdown calls

[Imre Deak]

On Fri, May 29, 2026 at 05:16:43PM +0300, Ville Syrjälä wrote:
> On Fri, May 29, 2026 at 02:04:03PM +0300, Jani Nikula wrote:
> > Move the intel_dmc_suspend() calls from i915 and xe suspend and shutdown
> > hooks all the way down to a shared location in
> > __intel_display_driver_pm_suspend().
> > 
> > This is a change in the suspend/shutdown sequences, but hopefully one
> > without problems.
> > 
> > Signed-off-by: Jani Nikula <jani.nikula@intel.com>
> > ---
> >  drivers/gpu/drm/i915/display/intel_display_driver.c | 2 ++
> >  drivers/gpu/drm/i915/i915_driver.c                  | 4 ----
> >  drivers/gpu/drm/xe/display/xe_display.c             | 4 ----
> >  3 files changed, 2 insertions(+), 8 deletions(-)
> > 
> > diff --git a/drivers/gpu/drm/i915/display/intel_display_driver.c b/drivers/gpu/drm/i915/display/intel_display_driver.c
> > index bc632ac8c9b4..6cac36157bea 100644
> > --- a/drivers/gpu/drm/i915/display/intel_display_driver.c
> > +++ b/drivers/gpu/drm/i915/display/intel_display_driver.c
> > @@ -755,6 +755,8 @@ static int __intel_display_driver_pm_suspend(struct intel_display *display, bool
> >  
> >  	intel_encoder_suspend_all(display);
> >  
> > +	intel_dmc_suspend(display);
> > +
> >  	return ret;
> >  }
> >  
> > diff --git a/drivers/gpu/drm/i915/i915_driver.c b/drivers/gpu/drm/i915/i915_driver.c
> > index 209ac512455d..40fc15017486 100644
> > --- a/drivers/gpu/drm/i915/i915_driver.c
> > +++ b/drivers/gpu/drm/i915/i915_driver.c
> > @@ -1045,8 +1045,6 @@ void i915_driver_shutdown(struct drm_i915_private *i915)
> >  
> >  	intel_irq_suspend(i915);
> >  
> > -	intel_dmc_suspend(display);
> > -
> 
> I wonder what we're even trying to achieve here. Just to make sure
> the DMC firmware has been loaded before we system suspend? That might
> be reasonable, but we now wait for the firmware load somewhere during
> driver init due to flip queue needing it. So this all seems rather
> redundant now.

Enabling/disabling the display power wells on demand during runtime is
prevented if DMC is not loaded, by holding the INIT domain reference.
This reference must be still dropped for suspend (and then reacquired
during resume). This - besides waiting for the firmware to load - is
done in intel_dmc_suspend()/intel_dmc_resume().

Yes, waiting for the firmware to load could be removed from
intel_dmc_suspend() after it's waited already during driver
loading/resume.

> 
> >  	i915_gem_suspend(i915);
> >  
> >  	/*
> > @@ -1117,8 +1115,6 @@ static int i915_drm_suspend(struct drm_device *dev)
> >  
> >  	dev_priv->suspend_count++;
> >  
> > -	intel_dmc_suspend(display);
> > -
> >  	enable_rpm_wakeref_asserts(&dev_priv->runtime_pm);
> >  
> >  	i915_gem_drain_freed_objects(dev_priv);
> > diff --git a/drivers/gpu/drm/xe/display/xe_display.c b/drivers/gpu/drm/xe/display/xe_display.c
> > index 561ec1ed6845..9416405667d8 100644
> > --- a/drivers/gpu/drm/xe/display/xe_display.c
> > +++ b/drivers/gpu/drm/xe/display/xe_display.c
> > @@ -198,8 +198,6 @@ void xe_display_shutdown(struct xe_device *xe)
> >  	intel_display_driver_shutdown(display);
> >  
> >  	intel_opregion_suspend(display, PCI_D3cold);
> > -
> > -	intel_dmc_suspend(display);
> >  }
> >  
> >  void xe_display_shutdown_late(struct xe_device *xe)
> > @@ -276,8 +274,6 @@ void xe_display_pm_suspend(struct xe_device *xe)
> >  	intel_display_driver_pm_suspend(display);
> >  
> >  	intel_opregion_suspend(display, s2idle ? PCI_D1 : PCI_D3cold);
> > -
> > -	intel_dmc_suspend(display);
> >  }
> >  
> >  void xe_display_pm_suspend_late(struct xe_device *xe)
> > -- 
> > 2.47.3
> 
> -- 
> Ville Syrjälä
> Intel

Re: [PATCH 08/24] drm/xe/display: relocate the xe_display_shutdown*() functions

[Michał Grzelak]

[-- Attachment #1: Type: text/plain, Size: 273 bytes --]

On Fri, 29 May 2026, Jani Nikula wrote:
> Group the xe_display_shutdown() and xe_display_shutdown_late() functions
> together, away from the pm hooks.
>
> Signed-off-by: Jani Nikula <jani.nikula@intel.com>

Reviewed-by: Michał Grzelak <michal.grzelak@intel.com>

BR,
Michał

Re: [PATCH 09/24] drm/xe/display: relocate the xe_display_pm_runtime_*() functions

[Michał Grzelak]

[-- Attachment #1: Type: text/plain, Size: 346 bytes --]

On Fri, 29 May 2026, Jani Nikula wrote:
> Keep the xe_display_pm_runtime_*() functions together, in
> suspend/suspend_late/resume order. Also relocate the dependent d3cold
> functions near usage in the runtime pm functions.
>
> Signed-off-by: Jani Nikula <jani.nikula@intel.com>

Reviewed-by: Michał Grzelak <michal.grzelak@intel.com>

BR,
Michał

Re: [PATCH 24/24] drm/xe/display: unify runtime suspend/resume with i915 for non-d3cold

[Jani Nikula]

On Fri, 29 May 2026, Ville Syrjälä <ville.syrjala@linux.intel.com> wrote:
> On Fri, May 29, 2026 at 02:04:08PM +0300, Jani Nikula wrote:
>> With the special d3cold handling in xe runtime suspend/resume separated,
>> unify the non-d3cold paths with i915. There are multiple changes here at
>> once that probably wouldn't make much sense to split out further.
>> 
>> Add the call to intel_display_driver_pm_runtime_suspend(), which in turn
>> starts calling intel_display_power_runtime_suspend(). Deep down, this
>> should take care of intel_dmc_wl_flush_release_work(), allowing us to
>> drop the extra call in xe_display_pm_runtime_suspend_late().
>> 
>> Add the call to intel_display_driver_pm_runtime_suspend_late(), which
>> starts calling intel_opregion_notify_adapter(). The
>> intel_hpd_poll_enable() call is also done here, postponed from the
>> previous location in xe_display_pm_runtime_suspend().
>> 
>> Add the call to intel_display_driver_pm_runtime_resume_early(), which
>> contains the intel_display_power_runtime_resume() and
>> intel_opregion_notify_adapter() counterparts found in
>> intel_display_power_runtime_suspend() and
>> intel_display_power_runtime_suspend_late(). (They are not symmetric.)
>> 
>> Finally, intel_display_driver_pm_runtime_resume() replaces the direct
>> calls to intel_hpd_init(), intel_hpd_poll_disable(), and
>> skl_watermark_ipc_update().
>> 
>> Signed-off-by: Jani Nikula <jani.nikula@intel.com>
>> ---
>>  drivers/gpu/drm/xe/display/xe_display.c | 14 ++++----------
>>  1 file changed, 4 insertions(+), 10 deletions(-)
>> 
>> diff --git a/drivers/gpu/drm/xe/display/xe_display.c b/drivers/gpu/drm/xe/display/xe_display.c
>> index 0fadc62e1cdd..cd7264d7dfe2 100644
>> --- a/drivers/gpu/drm/xe/display/xe_display.c
>> +++ b/drivers/gpu/drm/xe/display/xe_display.c
>> @@ -363,7 +363,7 @@ void xe_display_pm_runtime_suspend(struct xe_device *xe)
>>  		return;
>>  	}
>>  
>> -	intel_hpd_poll_enable(display);
>> +	intel_display_driver_pm_runtime_suspend(display);
>>  }
>>  
>>  void xe_display_pm_runtime_suspend_late(struct xe_device *xe)
>> @@ -379,12 +379,7 @@ void xe_display_pm_runtime_suspend_late(struct xe_device *xe)
>>  		return;
>>  	}
>>  
>> -	/*
>> -	 * If xe_display_pm_suspend_late() is not called, it is likely
>> -	 * that we will be on dynamic DC states with DMC wakelock enabled. We
>> -	 * need to flush the release work in that case.
>> -	 */
>
> The entire comment seems wonky. I don't think we have any platforms
> with wakelock+!DC9. Ah, it was added exactly because the D3cold path
> is broken and doesn't go into DC9. Would have been better to fix the
> actual problem instead. I guess you should move the comment to the
> D3cold path in the previous patch to keep it where it actually makes
> some sense.

Huh, but the comment says, "If xe_display_pm_suspend_late() is not
called", and the d3cold path above calls that. It's the non-d3cold path
that does not call the function.

Yeah, I don't know what to do with this.

Commit 731c74e988ff ("drm/xe/display: Flush DMC wakelock release work on
runtime suspend") says, "We currently are not calling display runtime
suspend functions when D3cold is not allowed." But that's not the whole
truth, we're not calling the runtime suspend/resume functions *at all*
on any xe path. (Which is what the patch at hand is trying to fix for
non-d3cold.)

Why is the fix in the above commit just adding the single DMC wakelock
call, instead of doing the proper runtime suspend/resume for non-d3cold?

I don't get it.

Cc: Gustavo, Rodrigo


BR,
Jani.


>
> Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
>
>> -	intel_dmc_wl_flush_release_work(display);
>> +	intel_display_driver_pm_runtime_suspend_late(display);
>>  }
>>  
>>  void xe_display_pm_runtime_resume(struct xe_device *xe)
>> @@ -399,9 +394,8 @@ void xe_display_pm_runtime_resume(struct xe_device *xe)
>>  		return;
>>  	}
>>  
>> -	intel_hpd_init(display);
>> -	intel_hpd_poll_disable(display);
>> -	skl_watermark_ipc_update(display);
>> +	intel_display_driver_pm_runtime_resume_early(display);
>> +	intel_display_driver_pm_runtime_resume(display);
>>  }
>>  
>>  
>> -- 
>> 2.47.3

-- 
Jani Nikula, Intel