[PATCH 1/3] drm/i915/display: Move shutdown sequences under display driver

[PATCH 1/3] drm/i915/display: Move shutdown sequences under display driver

[Rodrigo Vivi]

Move display related shutdown sequences from i915_driver to
intel_display_driver.

No functional change. Just taking the right ownership and
start some reconciliation of them between i915 and Xe.

v2: - Add missing _nogem caller (Imre)
    - Fix comment style (Jonathan)

Reviewed-by: Jonathan Cavitt <jonathan.cavitt@intel.com> #v1
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
---
 .../drm/i915/display/intel_display_driver.c   | 40 +++++++++++++++++++
 .../drm/i915/display/intel_display_driver.h   |  3 ++
 drivers/gpu/drm/i915/i915_driver.c            | 27 ++-----------
 3 files changed, 47 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 06a60be649ee..ee2cccff6e5e 100644
--- a/drivers/gpu/drm/i915/display/intel_display_driver.c
+++ b/drivers/gpu/drm/i915/display/intel_display_driver.c
@@ -39,6 +39,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"
@@ -762,3 +763,42 @@ void intel_display_driver_resume(struct drm_i915_private *i915)
 	if (state)
 		drm_atomic_state_put(state);
 }
+
+void intel_display_driver_shutdown(struct drm_i915_private *i915)
+{
+	intel_power_domains_disable(i915);
+
+	intel_fbdev_set_suspend(&i915->drm, FBINFO_STATE_SUSPENDED, true);
+	if (HAS_DISPLAY(i915)) {
+		drm_kms_helper_poll_disable(&i915->drm);
+		intel_display_driver_disable_user_access(i915);
+
+		drm_atomic_helper_shutdown(&i915->drm);
+	}
+
+	intel_dp_mst_suspend(i915);
+}
+
+void intel_display_driver_shutdown_noirq(struct drm_i915_private *i915)
+{
+	intel_hpd_cancel_work(i915);
+
+	if (HAS_DISPLAY(i915))
+		intel_display_driver_suspend_access(i915);
+
+	intel_encoder_suspend_all(&i915->display);
+	intel_encoder_shutdown_all(&i915->display);
+
+	intel_dmc_suspend(&i915->display);
+}
+
+void intel_display_driver_shutdown_nogem(struct drm_i915_private *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.
+	 */
+
+	intel_power_domains_driver_remove(i915);
+}
diff --git a/drivers/gpu/drm/i915/display/intel_display_driver.h b/drivers/gpu/drm/i915/display/intel_display_driver.h
index 42cc4af6d3fd..1ee37fb58d38 100644
--- a/drivers/gpu/drm/i915/display/intel_display_driver.h
+++ b/drivers/gpu/drm/i915/display/intel_display_driver.h
@@ -26,6 +26,9 @@ void intel_display_driver_remove_nogem(struct drm_i915_private *i915);
 void intel_display_driver_unregister(struct drm_i915_private *i915);
 int intel_display_driver_suspend(struct drm_i915_private *i915);
 void intel_display_driver_resume(struct drm_i915_private *i915);
+void intel_display_driver_shutdown(struct drm_i915_private *i915);
+void intel_display_driver_shutdown_noirq(struct drm_i915_private *i915);
+void intel_display_driver_shutdown_nogem(struct drm_i915_private *i915);
 
 /* interface for intel_display_reset.c */
 int __intel_display_driver_resume(struct drm_i915_private *i915,
diff --git a/drivers/gpu/drm/i915/i915_driver.c b/drivers/gpu/drm/i915/i915_driver.c
index 2013962e446c..3b241054ceb5 100644
--- a/drivers/gpu/drm/i915/i915_driver.c
+++ b/drivers/gpu/drm/i915/i915_driver.c
@@ -945,43 +945,24 @@ void i915_driver_shutdown(struct drm_i915_private *i915)
 {
 	disable_rpm_wakeref_asserts(&i915->runtime_pm);
 	intel_runtime_pm_disable(&i915->runtime_pm);
-	intel_power_domains_disable(i915);
 
-	intel_fbdev_set_suspend(&i915->drm, FBINFO_STATE_SUSPENDED, true);
-	if (HAS_DISPLAY(i915)) {
-		drm_kms_helper_poll_disable(&i915->drm);
-		intel_display_driver_disable_user_access(i915);
-
-		drm_atomic_helper_shutdown(&i915->drm);
-	}
-
-	intel_dp_mst_suspend(i915);
+	intel_display_driver_shutdown(i915);
 
 	intel_irq_suspend(i915);
-	intel_hpd_cancel_work(i915);
-
-	if (HAS_DISPLAY(i915))
-		intel_display_driver_suspend_access(i915);
 
-	intel_encoder_suspend_all(&i915->display);
-	intel_encoder_shutdown_all(&i915->display);
-
-	intel_dmc_suspend(&i915->display);
+	intel_display_driver_shutdown_noirq(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_power_domains_driver_remove(i915);
+	intel_display_driver_shutdown_nogem(i915);
+
 	enable_rpm_wakeref_asserts(&i915->runtime_pm);
 
 	intel_runtime_pm_driver_last_release(&i915->runtime_pm);
-- 
2.47.0

[PATCH 2/3] drm/xe: At shutdown disable commit helpers instead of flushing

[Rodrigo Vivi]

This aligns with the current i915 display sequence.

Cc: Maarten Lankhort <maarten.lankhorst@linux.intel.com>
Reviewed-by: Jonathan Cavitt <jonathan.cavitt@intel.com>
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
---
 drivers/gpu/drm/xe/display/xe_display.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/drivers/gpu/drm/xe/display/xe_display.c b/drivers/gpu/drm/xe/display/xe_display.c
index 69c828f38cb6..4759c3cf5915 100644
--- a/drivers/gpu/drm/xe/display/xe_display.c
+++ b/drivers/gpu/drm/xe/display/xe_display.c
@@ -10,6 +10,7 @@
 
 #include <drm/drm_drv.h>
 #include <drm/drm_managed.h>
+#include <drm/drm_atomic_helper.h>
 #include <drm/drm_probe_helper.h>
 #include <uapi/drm/xe_drm.h>
 
@@ -366,10 +367,10 @@ void xe_display_pm_shutdown(struct xe_device *xe)
 	if (has_display(xe)) {
 		drm_kms_helper_poll_disable(&xe->drm);
 		intel_display_driver_disable_user_access(xe);
-		intel_display_driver_suspend(xe);
+
+		drm_atomic_helper_shutdown(&xe->drm);
 	}
 
-	xe_display_flush_cleanup_work(xe);
 	intel_dp_mst_suspend(xe);
 	intel_hpd_cancel_work(xe);
 
-- 
2.47.0

[PATCH 3/3] drm/xe: Use i915-display shutdown sequence directly

[Rodrigo Vivi]

Start the xe-i915-display reconciliation by using the same
shutdown sequences.

Reviewed-by: Jonathan Cavitt <jonathan.cavitt@intel.com>
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
---
 drivers/gpu/drm/xe/display/xe_display.c | 46 +++++++------------------
 drivers/gpu/drm/xe/display/xe_display.h |  5 +--
 drivers/gpu/drm/xe/xe_device.c          |  4 ++-
 3 files changed, 19 insertions(+), 36 deletions(-)

diff --git a/drivers/gpu/drm/xe/display/xe_display.c b/drivers/gpu/drm/xe/display/xe_display.c
index 4759c3cf5915..29676652bc54 100644
--- a/drivers/gpu/drm/xe/display/xe_display.c
+++ b/drivers/gpu/drm/xe/display/xe_display.c
@@ -10,7 +10,6 @@
 
 #include <drm/drm_drv.h>
 #include <drm/drm_managed.h>
-#include <drm/drm_atomic_helper.h>
 #include <drm/drm_probe_helper.h>
 #include <uapi/drm/xe_drm.h>
 
@@ -357,32 +356,26 @@ void xe_display_pm_suspend(struct xe_device *xe)
 
 void xe_display_pm_shutdown(struct xe_device *xe)
 {
-	struct intel_display *display = &xe->display;
-
 	if (!xe->info.probe_display)
 		return;
 
-	intel_power_domains_disable(xe);
-	intel_fbdev_set_suspend(&xe->drm, FBINFO_STATE_SUSPENDED, true);
-	if (has_display(xe)) {
-		drm_kms_helper_poll_disable(&xe->drm);
-		intel_display_driver_disable_user_access(xe);
-
-		drm_atomic_helper_shutdown(&xe->drm);
-	}
-
-	intel_dp_mst_suspend(xe);
-	intel_hpd_cancel_work(xe);
+	intel_display_driver_shutdown(xe);
+}
 
-	if (has_display(xe))
-		intel_display_driver_suspend_access(xe);
+void xe_display_pm_shutdown_noirq(struct xe_device *xe)
+{
+	if (!xe->info.probe_display)
+		return;
 
-	intel_encoder_suspend_all(display);
-	intel_encoder_shutdown_all(display);
+	intel_display_driver_shutdown_noirq(xe);
+}
 
-	intel_opregion_suspend(display, PCI_D3cold);
+void xe_display_pm_shutdown_noaccel(struct xe_device *xe)
+{
+	if (!xe->info.probe_display)
+		return;
 
-	intel_dmc_suspend(display);
+	intel_display_driver_shutdown_nogem(xe);
 }
 
 void xe_display_pm_runtime_suspend(struct xe_device *xe)
@@ -408,19 +401,6 @@ void xe_display_pm_suspend_late(struct xe_device *xe)
 	intel_display_power_suspend_late(xe, s2idle);
 }
 
-void xe_display_pm_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_power_domains_driver_remove(xe);
-}
-
 void xe_display_pm_resume_early(struct xe_device *xe)
 {
 	if (!xe->info.probe_display)
diff --git a/drivers/gpu/drm/xe/display/xe_display.h b/drivers/gpu/drm/xe/display/xe_display.h
index 17afa537aee5..a801db19b64f 100644
--- a/drivers/gpu/drm/xe/display/xe_display.h
+++ b/drivers/gpu/drm/xe/display/xe_display.h
@@ -35,9 +35,10 @@ void xe_display_irq_reset(struct xe_device *xe);
 void xe_display_irq_postinstall(struct xe_device *xe, struct xe_gt *gt);
 
 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_shutdown(struct xe_device *xe);
+void xe_display_pm_shutdown_noirq(struct xe_device *xe);
+void xe_display_pm_shutdown_noaccel(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);
diff --git a/drivers/gpu/drm/xe/xe_device.c b/drivers/gpu/drm/xe/xe_device.c
index 0e2dd691bdae..f4ae8e11ac53 100644
--- a/drivers/gpu/drm/xe/xe_device.c
+++ b/drivers/gpu/drm/xe/xe_device.c
@@ -819,10 +819,12 @@ void xe_device_shutdown(struct xe_device *xe)
 
 		xe_irq_suspend(xe);
 
+		xe_display_pm_shutdown_noirq(xe);
+
 		for_each_gt(gt, xe, id)
 			xe_gt_shutdown(gt);
 
-		xe_display_pm_shutdown_late(xe);
+		xe_display_pm_shutdown_noaccel(xe);
 	} else {
 		/* BOOM! */
 		__xe_driver_flr(xe);
-- 
2.47.0

✓ CI.Patch_applied: success for series starting with [1/3] drm/i915/display: Move shutdown sequences under display driver

[Patchwork]

== Series Details ==

Series: series starting with [1/3] drm/i915/display: Move shutdown sequences under display driver
URL   : https://patchwork.freedesktop.org/series/141378/
State : success

== Summary ==

=== Applying kernel patches on branch 'drm-tip' with base: ===
Base commit: 36fec0eb8786 drm-tip: 2024y-11m-14d-23h-49m-25s UTC integration manifest
=== git am output follows ===
Applying: drm/i915/display: Move shutdown sequences under display driver
Applying: drm/xe: At shutdown disable commit helpers instead of flushing
Applying: drm/xe: Use i915-display shutdown sequence directly

✓ CI.checkpatch: success for series starting with [1/3] drm/i915/display: Move shutdown sequences under display driver

[Patchwork]

== Series Details ==

Series: series starting with [1/3] drm/i915/display: Move shutdown sequences under display driver
URL   : https://patchwork.freedesktop.org/series/141378/
State : success

== Summary ==

+ KERNEL=/kernel
+ git clone https://gitlab.freedesktop.org/drm/maintainer-tools mt
Cloning into 'mt'...
warning: redirecting to https://gitlab.freedesktop.org/drm/maintainer-tools.git/
+ git -C mt rev-list -n1 origin/master
30ab6715fc09baee6cc14cb3c89ad8858688d474
+ cd /kernel
+ git config --global --add safe.directory /kernel
+ git log -n1
commit 211287f920741f9cff5340f6bfc1407c0d5dd8c3
Author: Rodrigo Vivi <rodrigo.vivi@intel.com>
Date:   Thu Nov 14 15:22:52 2024 -0500

    drm/xe: Use i915-display shutdown sequence directly
    
    Start the xe-i915-display reconciliation by using the same
    shutdown sequences.
    
    Reviewed-by: Jonathan Cavitt <jonathan.cavitt@intel.com>
    Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
+ /mt/dim checkpatch 36fec0eb87867bca47f8829c9e5dbf5b3e2b3aaf drm-intel
a32e98f627c6 drm/i915/display: Move shutdown sequences under display driver
2a932f8c1740 drm/xe: At shutdown disable commit helpers instead of flushing
211287f92074 drm/xe: Use i915-display shutdown sequence directly

✗ CI.KUnit: failure for series starting with [1/3] drm/i915/display: Move shutdown sequences under display driver

[Patchwork]

== Series Details ==

Series: series starting with [1/3] drm/i915/display: Move shutdown sequences under display driver
URL   : https://patchwork.freedesktop.org/series/141378/
State : failure

== Summary ==

+ trap cleanup EXIT
+ /kernel/tools/testing/kunit/kunit.py run --kunitconfig /kernel/drivers/gpu/drm/xe/.kunitconfig
ERROR:root:../drivers/gpu/drm/xe/xe_device.c: In function ‘xe_device_shutdown’:
../drivers/gpu/drm/xe/xe_device.c:822:17: error: implicit declaration of function ‘xe_display_pm_shutdown_noirq’; did you mean ‘xe_display_pm_shutdown_late’? [-Werror=implicit-function-declaration]
  822 |                 xe_display_pm_shutdown_noirq(xe);
      |                 ^~~~~~~~~~~~~~~~~~~~~~~~~~~~
      |                 xe_display_pm_shutdown_late
../drivers/gpu/drm/xe/xe_device.c:827:17: error: implicit declaration of function ‘xe_display_pm_shutdown_noaccel’; did you mean ‘xe_display_pm_shutdown_late’? [-Werror=implicit-function-declaration]
  827 |                 xe_display_pm_shutdown_noaccel(xe);
      |                 ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
      |                 xe_display_pm_shutdown_late
cc1: some warnings being treated as errors
make[7]: *** [../scripts/Makefile.build:229: drivers/gpu/drm/xe/xe_device.o] Error 1
make[7]: *** Waiting for unfinished jobs....
make[6]: *** [../scripts/Makefile.build:478: drivers/gpu/drm/xe] Error 2
make[6]: *** Waiting for unfinished jobs....
make[5]: *** [../scripts/Makefile.build:478: drivers/gpu/drm] Error 2
make[4]: *** [../scripts/Makefile.build:478: drivers/gpu] Error 2
make[4]: *** Waiting for unfinished jobs....
make[3]: *** [../scripts/Makefile.build:478: drivers] Error 2
make[3]: *** Waiting for unfinished jobs....
../lib/iomap.c:156:5: warning: no previous prototype for ‘ioread64_lo_hi’ [-Wmissing-prototypes]
  156 | u64 ioread64_lo_hi(const void __iomem *addr)
      |     ^~~~~~~~~~~~~~
../lib/iomap.c:163:5: warning: no previous prototype for ‘ioread64_hi_lo’ [-Wmissing-prototypes]
  163 | u64 ioread64_hi_lo(const void __iomem *addr)
      |     ^~~~~~~~~~~~~~
../lib/iomap.c:170:5: warning: no previous prototype for ‘ioread64be_lo_hi’ [-Wmissing-prototypes]
  170 | u64 ioread64be_lo_hi(const void __iomem *addr)
      |     ^~~~~~~~~~~~~~~~
../lib/iomap.c:178:5: warning: no previous prototype for ‘ioread64be_hi_lo’ [-Wmissing-prototypes]
  178 | u64 ioread64be_hi_lo(const void __iomem *addr)
      |     ^~~~~~~~~~~~~~~~
../lib/iomap.c:264:6: warning: no previous prototype for ‘iowrite64_lo_hi’ [-Wmissing-prototypes]
  264 | void iowrite64_lo_hi(u64 val, void __iomem *addr)
      |      ^~~~~~~~~~~~~~~
../lib/iomap.c:272:6: warning: no previous prototype for ‘iowrite64_hi_lo’ [-Wmissing-prototypes]
  272 | void iowrite64_hi_lo(u64 val, void __iomem *addr)
      |      ^~~~~~~~~~~~~~~
../lib/iomap.c:280:6: warning: no previous prototype for ‘iowrite64be_lo_hi’ [-Wmissing-prototypes]
  280 | void iowrite64be_lo_hi(u64 val, void __iomem *addr)
      |      ^~~~~~~~~~~~~~~~~
../lib/iomap.c:288:6: warning: no previous prototype for ‘iowrite64be_hi_lo’ [-Wmissing-prototypes]
  288 | void iowrite64be_hi_lo(u64 val, void __iomem *addr)
      |      ^~~~~~~~~~~~~~~~~
make[2]: *** [/kernel/Makefile:1936: .] Error 2
make[1]: *** [/kernel/Makefile:224: __sub-make] Error 2
make: *** [Makefile:224: __sub-make] Error 2

[02:58:55] Configuring KUnit Kernel ...
Generating .config ...
Populating config with:
$ make ARCH=um O=.kunit olddefconfig
[02:59:00] Building KUnit Kernel ...
Populating config with:
$ make ARCH=um O=.kunit olddefconfig
Building with:
$ make all compile_commands.json ARCH=um O=.kunit --jobs=48
+ cleanup
++ stat -c %u:%g /kernel
+ chown -R 1003:1003 /kernel

Re: [PATCH 1/3] drm/i915/display: Move shutdown sequences under display driver

[Rodrigo Vivi]

On Thu, Nov 14, 2024 at 03:22:50PM -0500, Rodrigo Vivi wrote:
> Move display related shutdown sequences from i915_driver to
> intel_display_driver.
> 
> No functional change. Just taking the right ownership and
> start some reconciliation of them between i915 and Xe.
> 
> v2: - Add missing _nogem caller (Imre)
>     - Fix comment style (Jonathan)
> 
> Reviewed-by: Jonathan Cavitt <jonathan.cavitt@intel.com> #v1

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

> Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
> ---
>  .../drm/i915/display/intel_display_driver.c   | 40 +++++++++++++++++++
>  .../drm/i915/display/intel_display_driver.h   |  3 ++
>  drivers/gpu/drm/i915/i915_driver.c            | 27 ++-----------
>  3 files changed, 47 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 06a60be649ee..ee2cccff6e5e 100644
> --- a/drivers/gpu/drm/i915/display/intel_display_driver.c
> +++ b/drivers/gpu/drm/i915/display/intel_display_driver.c
> @@ -39,6 +39,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"
> @@ -762,3 +763,42 @@ void intel_display_driver_resume(struct drm_i915_private *i915)
>  	if (state)
>  		drm_atomic_state_put(state);
>  }
> +
> +void intel_display_driver_shutdown(struct drm_i915_private *i915)
> +{
> +	intel_power_domains_disable(i915);
> +
> +	intel_fbdev_set_suspend(&i915->drm, FBINFO_STATE_SUSPENDED, true);
> +	if (HAS_DISPLAY(i915)) {
> +		drm_kms_helper_poll_disable(&i915->drm);
> +		intel_display_driver_disable_user_access(i915);
> +
> +		drm_atomic_helper_shutdown(&i915->drm);
> +	}
> +
> +	intel_dp_mst_suspend(i915);
> +}
> +
> +void intel_display_driver_shutdown_noirq(struct drm_i915_private *i915)
> +{
> +	intel_hpd_cancel_work(i915);
> +
> +	if (HAS_DISPLAY(i915))
> +		intel_display_driver_suspend_access(i915);
> +
> +	intel_encoder_suspend_all(&i915->display);
> +	intel_encoder_shutdown_all(&i915->display);
> +
> +	intel_dmc_suspend(&i915->display);
> +}
> +
> +void intel_display_driver_shutdown_nogem(struct drm_i915_private *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.
> +	 */
> +
> +	intel_power_domains_driver_remove(i915);
> +}
> diff --git a/drivers/gpu/drm/i915/display/intel_display_driver.h b/drivers/gpu/drm/i915/display/intel_display_driver.h
> index 42cc4af6d3fd..1ee37fb58d38 100644
> --- a/drivers/gpu/drm/i915/display/intel_display_driver.h
> +++ b/drivers/gpu/drm/i915/display/intel_display_driver.h
> @@ -26,6 +26,9 @@ void intel_display_driver_remove_nogem(struct drm_i915_private *i915);
>  void intel_display_driver_unregister(struct drm_i915_private *i915);
>  int intel_display_driver_suspend(struct drm_i915_private *i915);
>  void intel_display_driver_resume(struct drm_i915_private *i915);
> +void intel_display_driver_shutdown(struct drm_i915_private *i915);
> +void intel_display_driver_shutdown_noirq(struct drm_i915_private *i915);
> +void intel_display_driver_shutdown_nogem(struct drm_i915_private *i915);
>  
>  /* interface for intel_display_reset.c */
>  int __intel_display_driver_resume(struct drm_i915_private *i915,
> diff --git a/drivers/gpu/drm/i915/i915_driver.c b/drivers/gpu/drm/i915/i915_driver.c
> index 2013962e446c..3b241054ceb5 100644
> --- a/drivers/gpu/drm/i915/i915_driver.c
> +++ b/drivers/gpu/drm/i915/i915_driver.c
> @@ -945,43 +945,24 @@ void i915_driver_shutdown(struct drm_i915_private *i915)
>  {
>  	disable_rpm_wakeref_asserts(&i915->runtime_pm);
>  	intel_runtime_pm_disable(&i915->runtime_pm);
> -	intel_power_domains_disable(i915);
>  
> -	intel_fbdev_set_suspend(&i915->drm, FBINFO_STATE_SUSPENDED, true);
> -	if (HAS_DISPLAY(i915)) {
> -		drm_kms_helper_poll_disable(&i915->drm);
> -		intel_display_driver_disable_user_access(i915);
> -
> -		drm_atomic_helper_shutdown(&i915->drm);
> -	}
> -
> -	intel_dp_mst_suspend(i915);
> +	intel_display_driver_shutdown(i915);
>  
>  	intel_irq_suspend(i915);
> -	intel_hpd_cancel_work(i915);
> -
> -	if (HAS_DISPLAY(i915))
> -		intel_display_driver_suspend_access(i915);
>  
> -	intel_encoder_suspend_all(&i915->display);
> -	intel_encoder_shutdown_all(&i915->display);
> -
> -	intel_dmc_suspend(&i915->display);
> +	intel_display_driver_shutdown_noirq(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_power_domains_driver_remove(i915);
> +	intel_display_driver_shutdown_nogem(i915);
> +
>  	enable_rpm_wakeref_asserts(&i915->runtime_pm);
>  
>  	intel_runtime_pm_driver_last_release(&i915->runtime_pm);
> -- 
> 2.47.0
> 

[PATCH] drm/xe: Use i915-display shutdown sequence directly

[Rodrigo Vivi]

Start the xe-i915-display reconciliation by using the same
shutdown sequences.

v2: include the stubs for !CONFIG_DRM_XE_DISPLAY (Kunit)

Reviewed-by: Jonathan Cavitt <jonathan.cavitt@intel.com>
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
---
 drivers/gpu/drm/xe/display/xe_display.c | 46 +++++++------------------
 drivers/gpu/drm/xe/display/xe_display.h | 10 +++---
 drivers/gpu/drm/xe/xe_device.c          |  4 ++-
 3 files changed, 22 insertions(+), 38 deletions(-)

diff --git a/drivers/gpu/drm/xe/display/xe_display.c b/drivers/gpu/drm/xe/display/xe_display.c
index 4759c3cf5915..29676652bc54 100644
--- a/drivers/gpu/drm/xe/display/xe_display.c
+++ b/drivers/gpu/drm/xe/display/xe_display.c
@@ -10,7 +10,6 @@
 
 #include <drm/drm_drv.h>
 #include <drm/drm_managed.h>
-#include <drm/drm_atomic_helper.h>
 #include <drm/drm_probe_helper.h>
 #include <uapi/drm/xe_drm.h>
 
@@ -357,32 +356,26 @@ void xe_display_pm_suspend(struct xe_device *xe)
 
 void xe_display_pm_shutdown(struct xe_device *xe)
 {
-	struct intel_display *display = &xe->display;
-
 	if (!xe->info.probe_display)
 		return;
 
-	intel_power_domains_disable(xe);
-	intel_fbdev_set_suspend(&xe->drm, FBINFO_STATE_SUSPENDED, true);
-	if (has_display(xe)) {
-		drm_kms_helper_poll_disable(&xe->drm);
-		intel_display_driver_disable_user_access(xe);
-
-		drm_atomic_helper_shutdown(&xe->drm);
-	}
-
-	intel_dp_mst_suspend(xe);
-	intel_hpd_cancel_work(xe);
+	intel_display_driver_shutdown(xe);
+}
 
-	if (has_display(xe))
-		intel_display_driver_suspend_access(xe);
+void xe_display_pm_shutdown_noirq(struct xe_device *xe)
+{
+	if (!xe->info.probe_display)
+		return;
 
-	intel_encoder_suspend_all(display);
-	intel_encoder_shutdown_all(display);
+	intel_display_driver_shutdown_noirq(xe);
+}
 
-	intel_opregion_suspend(display, PCI_D3cold);
+void xe_display_pm_shutdown_noaccel(struct xe_device *xe)
+{
+	if (!xe->info.probe_display)
+		return;
 
-	intel_dmc_suspend(display);
+	intel_display_driver_shutdown_nogem(xe);
 }
 
 void xe_display_pm_runtime_suspend(struct xe_device *xe)
@@ -408,19 +401,6 @@ void xe_display_pm_suspend_late(struct xe_device *xe)
 	intel_display_power_suspend_late(xe, s2idle);
 }
 
-void xe_display_pm_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_power_domains_driver_remove(xe);
-}
-
 void xe_display_pm_resume_early(struct xe_device *xe)
 {
 	if (!xe->info.probe_display)
diff --git a/drivers/gpu/drm/xe/display/xe_display.h b/drivers/gpu/drm/xe/display/xe_display.h
index 17afa537aee5..f139a88da3a5 100644
--- a/drivers/gpu/drm/xe/display/xe_display.h
+++ b/drivers/gpu/drm/xe/display/xe_display.h
@@ -35,9 +35,10 @@ void xe_display_irq_reset(struct xe_device *xe);
 void xe_display_irq_postinstall(struct xe_device *xe, struct xe_gt *gt);
 
 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_shutdown(struct xe_device *xe);
+void xe_display_pm_shutdown_noirq(struct xe_device *xe);
+void xe_display_pm_shutdown_noaccel(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);
@@ -68,9 +69,10 @@ static inline void xe_display_irq_reset(struct xe_device *xe) {}
 static inline void xe_display_irq_postinstall(struct xe_device *xe, struct xe_gt *gt) {}
 
 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_shutdown(struct xe_device *xe) {}
+static inline void xe_display_pm_shutdown_noirq(struct xe_device *xe) {}
+static inline void xe_display_pm_shutdown_noaccel(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 0e2dd691bdae..f4ae8e11ac53 100644
--- a/drivers/gpu/drm/xe/xe_device.c
+++ b/drivers/gpu/drm/xe/xe_device.c
@@ -819,10 +819,12 @@ void xe_device_shutdown(struct xe_device *xe)
 
 		xe_irq_suspend(xe);
 
+		xe_display_pm_shutdown_noirq(xe);
+
 		for_each_gt(gt, xe, id)
 			xe_gt_shutdown(gt);
 
-		xe_display_pm_shutdown_late(xe);
+		xe_display_pm_shutdown_noaccel(xe);
 	} else {
 		/* BOOM! */
 		__xe_driver_flr(xe);
-- 
2.47.0

✓ CI.Patch_applied: success for series starting with [1/3] drm/i915/display: Move shutdown sequences under display driver (rev2)

[Patchwork]

== Series Details ==

Series: series starting with [1/3] drm/i915/display: Move shutdown sequences under display driver (rev2)
URL   : https://patchwork.freedesktop.org/series/141378/
State : success

== Summary ==

=== Applying kernel patches on branch 'drm-tip' with base: ===
Base commit: f43942f219c8 drm-tip: 2024y-11m-15d-19h-15m-44s UTC integration manifest
=== git am output follows ===
Applying: drm/i915/display: Move shutdown sequences under display driver
Applying: drm/xe: At shutdown disable commit helpers instead of flushing
Applying: drm/xe: Use i915-display shutdown sequence directly

✓ CI.checkpatch: success for series starting with [1/3] drm/i915/display: Move shutdown sequences under display driver (rev2)

[Patchwork]

== Series Details ==

Series: series starting with [1/3] drm/i915/display: Move shutdown sequences under display driver (rev2)
URL   : https://patchwork.freedesktop.org/series/141378/
State : success

== Summary ==

+ KERNEL=/kernel
+ git clone https://gitlab.freedesktop.org/drm/maintainer-tools mt
Cloning into 'mt'...
warning: redirecting to https://gitlab.freedesktop.org/drm/maintainer-tools.git/
+ git -C mt rev-list -n1 origin/master
30ab6715fc09baee6cc14cb3c89ad8858688d474
+ cd /kernel
+ git config --global --add safe.directory /kernel
+ git log -n1
commit f39c660f6ac53b025d01d6c412729213504426f9
Author: Rodrigo Vivi <rodrigo.vivi@intel.com>
Date:   Fri Nov 15 17:28:24 2024 -0500

    drm/xe: Use i915-display shutdown sequence directly
    
    Start the xe-i915-display reconciliation by using the same
    shutdown sequences.
    
    v2: include the stubs for !CONFIG_DRM_XE_DISPLAY (Kunit)
    
    Reviewed-by: Jonathan Cavitt <jonathan.cavitt@intel.com>
    Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
+ /mt/dim checkpatch f43942f219c827e4e89baa102ceca3d62205135e drm-intel
5424514c1137 drm/i915/display: Move shutdown sequences under display driver
d99d8adf30b5 drm/xe: At shutdown disable commit helpers instead of flushing
f39c660f6ac5 drm/xe: Use i915-display shutdown sequence directly

✓ CI.KUnit: success for series starting with [1/3] drm/i915/display: Move shutdown sequences under display driver (rev2)

[Patchwork]

== Series Details ==

Series: series starting with [1/3] drm/i915/display: Move shutdown sequences under display driver (rev2)
URL   : https://patchwork.freedesktop.org/series/141378/
State : success

== Summary ==

+ trap cleanup EXIT
+ /kernel/tools/testing/kunit/kunit.py run --kunitconfig /kernel/drivers/gpu/drm/xe/.kunitconfig
[22:40:05] Configuring KUnit Kernel ...
Generating .config ...
Populating config with:
$ make ARCH=um O=.kunit olddefconfig
[22:40:09] Building KUnit Kernel ...
Populating config with:
$ make ARCH=um O=.kunit olddefconfig
Building with:
$ make all compile_commands.json ARCH=um O=.kunit --jobs=48
../lib/iomap.c:156:5: warning: no previous prototype for ‘ioread64_lo_hi’ [-Wmissing-prototypes]
  156 | u64 ioread64_lo_hi(const void __iomem *addr)
      |     ^~~~~~~~~~~~~~
../lib/iomap.c:163:5: warning: no previous prototype for ‘ioread64_hi_lo’ [-Wmissing-prototypes]
  163 | u64 ioread64_hi_lo(const void __iomem *addr)
      |     ^~~~~~~~~~~~~~
../lib/iomap.c:170:5: warning: no previous prototype for ‘ioread64be_lo_hi’ [-Wmissing-prototypes]
  170 | u64 ioread64be_lo_hi(const void __iomem *addr)
      |     ^~~~~~~~~~~~~~~~
../lib/iomap.c:178:5: warning: no previous prototype for ‘ioread64be_hi_lo’ [-Wmissing-prototypes]
  178 | u64 ioread64be_hi_lo(const void __iomem *addr)
      |     ^~~~~~~~~~~~~~~~
../lib/iomap.c:264:6: warning: no previous prototype for ‘iowrite64_lo_hi’ [-Wmissing-prototypes]
  264 | void iowrite64_lo_hi(u64 val, void __iomem *addr)
      |      ^~~~~~~~~~~~~~~
../lib/iomap.c:272:6: warning: no previous prototype for ‘iowrite64_hi_lo’ [-Wmissing-prototypes]
  272 | void iowrite64_hi_lo(u64 val, void __iomem *addr)
      |      ^~~~~~~~~~~~~~~
../lib/iomap.c:280:6: warning: no previous prototype for ‘iowrite64be_lo_hi’ [-Wmissing-prototypes]
  280 | void iowrite64be_lo_hi(u64 val, void __iomem *addr)
      |      ^~~~~~~~~~~~~~~~~
../lib/iomap.c:288:6: warning: no previous prototype for ‘iowrite64be_hi_lo’ [-Wmissing-prototypes]
  288 | void iowrite64be_hi_lo(u64 val, void __iomem *addr)
      |      ^~~~~~~~~~~~~~~~~

[22:40:37] Starting KUnit Kernel (1/1)...
[22:40:37] ============================================================
Running tests with:
$ .kunit/linux kunit.enable=1 mem=1G console=tty kunit_shutdown=halt
[22:40:37] =================== guc_dbm (7 subtests) ===================
[22:40:37] [PASSED] test_empty
[22:40:37] [PASSED] test_default
[22:40:37] ======================== test_size  ========================
[22:40:37] [PASSED] 4
[22:40:37] [PASSED] 8
[22:40:37] [PASSED] 32
[22:40:37] [PASSED] 256
[22:40:37] ==================== [PASSED] test_size ====================
[22:40:37] ======================= test_reuse  ========================
[22:40:37] [PASSED] 4
[22:40:37] [PASSED] 8
[22:40:37] [PASSED] 32
[22:40:37] [PASSED] 256
[22:40:37] =================== [PASSED] test_reuse ====================
[22:40:37] =================== test_range_overlap  ====================
[22:40:37] [PASSED] 4
[22:40:37] [PASSED] 8
[22:40:37] [PASSED] 32
[22:40:37] [PASSED] 256
[22:40:37] =============== [PASSED] test_range_overlap ================
[22:40:37] =================== test_range_compact  ====================
[22:40:37] [PASSED] 4
[22:40:37] [PASSED] 8
[22:40:37] [PASSED] 32
[22:40:37] [PASSED] 256
[22:40:37] =============== [PASSED] test_range_compact ================
[22:40:37] ==================== test_range_spare  =====================
[22:40:37] [PASSED] 4
[22:40:37] [PASSED] 8
[22:40:37] [PASSED] 32
[22:40:37] [PASSED] 256
[22:40:37] ================ [PASSED] test_range_spare =================
[22:40:37] ===================== [PASSED] guc_dbm =====================
[22:40:37] =================== guc_idm (6 subtests) ===================
[22:40:37] [PASSED] bad_init
[22:40:37] [PASSED] no_init
[22:40:37] [PASSED] init_fini
[22:40:37] [PASSED] check_used
[22:40:37] [PASSED] check_quota
[22:40:37] [PASSED] check_all
[22:40:37] ===================== [PASSED] guc_idm =====================
[22:40:37] ================== no_relay (3 subtests) ===================
[22:40:37] [PASSED] xe_drops_guc2pf_if_not_ready
[22:40:37] [PASSED] xe_drops_guc2vf_if_not_ready
[22:40:37] [PASSED] xe_rejects_send_if_not_ready
[22:40:37] ==================== [PASSED] no_relay =====================
[22:40:37] ================== pf_relay (14 subtests) ==================
[22:40:37] [PASSED] pf_rejects_guc2pf_too_short
[22:40:37] [PASSED] pf_rejects_guc2pf_too_long
[22:40:37] [PASSED] pf_rejects_guc2pf_no_payload
[22:40:37] [PASSED] pf_fails_no_payload
[22:40:37] [PASSED] pf_fails_bad_origin
[22:40:37] [PASSED] pf_fails_bad_type
[22:40:37] [PASSED] pf_txn_reports_error
[22:40:37] [PASSED] pf_txn_sends_pf2guc
[22:40:37] [PASSED] pf_sends_pf2guc
[22:40:37] [SKIPPED] pf_loopback_nop
[22:40:37] [SKIPPED] pf_loopback_echo
[22:40:37] [SKIPPED] pf_loopback_fail
[22:40:37] [SKIPPED] pf_loopback_busy
[22:40:37] [SKIPPED] pf_loopback_retry
[22:40:37] ==================== [PASSED] pf_relay =====================
[22:40:37] ================== vf_relay (3 subtests) ===================
[22:40:37] [PASSED] vf_rejects_guc2vf_too_short
[22:40:37] [PASSED] vf_rejects_guc2vf_too_long
[22:40:37] [PASSED] vf_rejects_guc2vf_no_payload
[22:40:37] ==================== [PASSED] vf_relay =====================
[22:40:37] ================= pf_service (11 subtests) =================
[22:40:37] [PASSED] pf_negotiate_any
[22:40:37] [PASSED] pf_negotiate_base_match
[22:40:37] [PASSED] pf_negotiate_base_newer
[22:40:37] [PASSED] pf_negotiate_base_next
[22:40:37] [SKIPPED] pf_negotiate_base_older
[22:40:37] [PASSED] pf_negotiate_base_prev
[22:40:37] [PASSED] pf_negotiate_latest_match
[22:40:37] [PASSED] pf_negotiate_latest_newer
[22:40:37] [PASSED] pf_negotiate_latest_next
[22:40:37] [SKIPPED] pf_negotiate_latest_older
[22:40:37] [SKIPPED] pf_negotiate_latest_prev
[22:40:37] =================== [PASSED] pf_service ====================
[22:40:37] ===================== lmtt (1 subtest) =====================
[22:40:37] ======================== test_ops  =========================
[22:40:37] [PASSED] 2-level
[22:40:37] [PASSED] multi-level
[22:40:37] ==================== [PASSED] test_ops =====================
[22:40:37] ====================== [PASSED] lmtt =======================
[22:40:37] =================== xe_mocs (2 subtests) ===================
[22:40:37] ================ xe_live_mocs_kernel_kunit  ================
[22:40:37] =========== [SKIPPED] xe_live_mocs_kernel_kunit ============
[22:40:37] ================ xe_live_mocs_reset_kunit  =================
[22:40:37] ============ [SKIPPED] xe_live_mocs_reset_kunit ============
[22:40:37] ==================== [SKIPPED] xe_mocs =====================
[22:40:37] ================= xe_migrate (2 subtests) ==================
[22:40:37] ================= xe_migrate_sanity_kunit  =================
[22:40:37] ============ [SKIPPED] xe_migrate_sanity_kunit =============
[22:40:37] ================== xe_validate_ccs_kunit  ==================
[22:40:37] ============= [SKIPPED] xe_validate_ccs_kunit ==============
[22:40:37] =================== [SKIPPED] xe_migrate ===================
[22:40:37] ================== xe_dma_buf (1 subtest) ==================
[22:40:37] ==================== xe_dma_buf_kunit  =====================
[22:40:37] ================ [SKIPPED] xe_dma_buf_kunit ================
[22:40:37] =================== [SKIPPED] xe_dma_buf ===================
[22:40:37] ==================== xe_bo (3 subtests) ====================
[22:40:37] ================== xe_ccs_migrate_kunit  ===================
[22:40:37] ============== [SKIPPED] xe_ccs_migrate_kunit ==============
[22:40:37] ==================== xe_bo_evict_kunit  ====================
[22:40:37] =============== [SKIPPED] xe_bo_evict_kunit ================
[22:40:37] =================== xe_bo_shrink_kunit  ====================
[22:40:37] =============== [SKIPPED] xe_bo_shrink_kunit ===============
[22:40:37] ===================== [SKIPPED] xe_bo ======================
[22:40:37] ==================== args (11 subtests) ====================
[22:40:37] [PASSED] count_args_test
[22:40:37] [PASSED] call_args_example
[22:40:37] [PASSED] call_args_test
[22:40:37] [PASSED] drop_first_arg_example
[22:40:37] [PASSED] drop_first_arg_test
[22:40:37] [PASSED] first_arg_example
[22:40:37] [PASSED] first_arg_test
[22:40:37] [PASSED] last_arg_example
[22:40:37] [PASSED] last_arg_test
[22:40:37] [PASSED] pick_arg_example
[22:40:37] [PASSED] sep_comma_examplestty: 'standard input': Inappropriate ioctl for device

[22:40:37] ====================== [PASSED] args =======================
[22:40:37] =================== xe_pci (2 subtests) ====================
[22:40:37] [PASSED] xe_gmdid_graphics_ip
[22:40:37] [PASSED] xe_gmdid_media_ip
[22:40:37] ===================== [PASSED] xe_pci ======================
[22:40:37] =================== xe_rtp (2 subtests) ====================
[22:40:37] =============== xe_rtp_process_to_sr_tests  ================
[22:40:37] [PASSED] coalesce-same-reg
[22:40:37] [PASSED] no-match-no-add
[22:40:37] [PASSED] match-or
[22:40:37] [PASSED] match-or-xfail
[22:40:37] [PASSED] no-match-no-add-multiple-rules
[22:40:37] [PASSED] two-regs-two-entries
[22:40:37] [PASSED] clr-one-set-other
[22:40:37] [PASSED] set-field
[22:40:37] [PASSED] conflict-duplicate
[22:40:37] [PASSED] conflict-not-disjoint
[22:40:37] [PASSED] conflict-reg-type
[22:40:37] =========== [PASSED] xe_rtp_process_to_sr_tests ============
[22:40:37] ================== xe_rtp_process_tests  ===================
[22:40:37] [PASSED] active1
[22:40:37] [PASSED] active2
[22:40:37] [PASSED] active-inactive
[22:40:37] [PASSED] inactive-active
[22:40:37] [PASSED] inactive-1st_or_active-inactive
[22:40:37] [PASSED] inactive-2nd_or_active-inactive
[22:40:37] [PASSED] inactive-last_or_active-inactive
[22:40:37] [PASSED] inactive-no_or_active-inactive
[22:40:37] ============== [PASSED] xe_rtp_process_tests ===============
[22:40:37] ===================== [PASSED] xe_rtp ======================
[22:40:37] ==================== xe_wa (1 subtest) =====================
[22:40:37] ======================== xe_wa_gt  =========================
[22:40:37] [PASSED] TIGERLAKE (B0)
[22:40:37] [PASSED] DG1 (A0)
[22:40:37] [PASSED] DG1 (B0)
[22:40:37] [PASSED] ALDERLAKE_S (A0)
[22:40:37] [PASSED] ALDERLAKE_S (B0)
[22:40:37] [PASSED] ALDERLAKE_S (C0)
[22:40:37] [PASSED] ALDERLAKE_S (D0)
[22:40:37] [PASSED] ALDERLAKE_P (A0)
[22:40:37] [PASSED] ALDERLAKE_P (B0)
[22:40:37] [PASSED] ALDERLAKE_P (C0)
[22:40:37] [PASSED] ALDERLAKE_S_RPLS (D0)
[22:40:37] [PASSED] ALDERLAKE_P_RPLU (E0)
[22:40:37] [PASSED] DG2_G10 (C0)
[22:40:37] [PASSED] DG2_G11 (B1)
[22:40:37] [PASSED] DG2_G12 (A1)
[22:40:37] [PASSED] METEORLAKE (g:A0, m:A0)
[22:40:37] [PASSED] METEORLAKE (g:A0, m:A0)
[22:40:37] [PASSED] METEORLAKE (g:A0, m:A0)
[22:40:37] [PASSED] LUNARLAKE (g:A0, m:A0)
[22:40:37] [PASSED] LUNARLAKE (g:B0, m:A0)
[22:40:37] [PASSED] BATTLEMAGE (g:A0, m:A1)
[22:40:37] ==================== [PASSED] xe_wa_gt =====================
[22:40:37] ====================== [PASSED] xe_wa ======================
[22:40:37] ============================================================
[22:40:37] Testing complete. Ran 122 tests: passed: 106, skipped: 16
[22:40:37] Elapsed time: 32.876s total, 4.389s configuring, 28.220s building, 0.224s running

+ /kernel/tools/testing/kunit/kunit.py run --kunitconfig /kernel/drivers/gpu/drm/tests/.kunitconfig
[22:40:38] Configuring KUnit Kernel ...
Regenerating .config ...
Populating config with:
$ make ARCH=um O=.kunit olddefconfig
[22:40:39] Building KUnit Kernel ...
Populating config with:
$ make ARCH=um O=.kunit olddefconfig
Building with:
$ make all compile_commands.json ARCH=um O=.kunit --jobs=48
../lib/iomap.c:156:5: warning: no previous prototype for ‘ioread64_lo_hi’ [-Wmissing-prototypes]
  156 | u64 ioread64_lo_hi(const void __iomem *addr)
      |     ^~~~~~~~~~~~~~
../lib/iomap.c:163:5: warning: no previous prototype for ‘ioread64_hi_lo’ [-Wmissing-prototypes]
  163 | u64 ioread64_hi_lo(const void __iomem *addr)
      |     ^~~~~~~~~~~~~~
../lib/iomap.c:170:5: warning: no previous prototype for ‘ioread64be_lo_hi’ [-Wmissing-prototypes]
  170 | u64 ioread64be_lo_hi(const void __iomem *addr)
      |     ^~~~~~~~~~~~~~~~
../lib/iomap.c:178:5: warning: no previous prototype for ‘ioread64be_hi_lo’ [-Wmissing-prototypes]
  178 | u64 ioread64be_hi_lo(const void __iomem *addr)
      |     ^~~~~~~~~~~~~~~~
../lib/iomap.c:264:6: warning: no previous prototype for ‘iowrite64_lo_hi’ [-Wmissing-prototypes]
  264 | void iowrite64_lo_hi(u64 val, void __iomem *addr)
      |      ^~~~~~~~~~~~~~~
../lib/iomap.c:272:6: warning: no previous prototype for ‘iowrite64_hi_lo’ [-Wmissing-prototypes]
  272 | void iowrite64_hi_lo(u64 val, void __iomem *addr)
      |      ^~~~~~~~~~~~~~~
../lib/iomap.c:280:6: warning: no previous prototype for ‘iowrite64be_lo_hi’ [-Wmissing-prototypes]
  280 | void iowrite64be_lo_hi(u64 val, void __iomem *addr)
      |      ^~~~~~~~~~~~~~~~~
../lib/iomap.c:288:6: warning: no previous prototype for ‘iowrite64be_hi_lo’ [-Wmissing-prototypes]
  288 | void iowrite64be_hi_lo(u64 val, void __iomem *addr)
      |      ^~~~~~~~~~~~~~~~~

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

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

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

✓ CI.Build: success for series starting with [1/3] drm/i915/display: Move shutdown sequences under display driver (rev2)

[Patchwork]

== Series Details ==

Series: series starting with [1/3] drm/i915/display: Move shutdown sequences under display driver (rev2)
URL   : https://patchwork.freedesktop.org/series/141378/
State : success

== Summary ==

lib/modules/6.12.0-rc7-xe/kernel/arch/x86/events/rapl.ko
lib/modules/6.12.0-rc7-xe/kernel/arch/x86/kvm/
lib/modules/6.12.0-rc7-xe/kernel/arch/x86/kvm/kvm.ko
lib/modules/6.12.0-rc7-xe/kernel/arch/x86/kvm/kvm-intel.ko
lib/modules/6.12.0-rc7-xe/kernel/arch/x86/kvm/kvm-amd.ko
lib/modules/6.12.0-rc7-xe/kernel/kernel/
lib/modules/6.12.0-rc7-xe/kernel/kernel/kheaders.ko
lib/modules/6.12.0-rc7-xe/kernel/crypto/
lib/modules/6.12.0-rc7-xe/kernel/crypto/ecrdsa_generic.ko
lib/modules/6.12.0-rc7-xe/kernel/crypto/xcbc.ko
lib/modules/6.12.0-rc7-xe/kernel/crypto/serpent_generic.ko
lib/modules/6.12.0-rc7-xe/kernel/crypto/aria_generic.ko
lib/modules/6.12.0-rc7-xe/kernel/crypto/crypto_simd.ko
lib/modules/6.12.0-rc7-xe/kernel/crypto/adiantum.ko
lib/modules/6.12.0-rc7-xe/kernel/crypto/tcrypt.ko
lib/modules/6.12.0-rc7-xe/kernel/crypto/crypto_engine.ko
lib/modules/6.12.0-rc7-xe/kernel/crypto/zstd.ko
lib/modules/6.12.0-rc7-xe/kernel/crypto/asymmetric_keys/
lib/modules/6.12.0-rc7-xe/kernel/crypto/asymmetric_keys/pkcs7_test_key.ko
lib/modules/6.12.0-rc7-xe/kernel/crypto/asymmetric_keys/pkcs8_key_parser.ko
lib/modules/6.12.0-rc7-xe/kernel/crypto/des_generic.ko
lib/modules/6.12.0-rc7-xe/kernel/crypto/xctr.ko
lib/modules/6.12.0-rc7-xe/kernel/crypto/authenc.ko
lib/modules/6.12.0-rc7-xe/kernel/crypto/sm4_generic.ko
lib/modules/6.12.0-rc7-xe/kernel/crypto/keywrap.ko
lib/modules/6.12.0-rc7-xe/kernel/crypto/camellia_generic.ko
lib/modules/6.12.0-rc7-xe/kernel/crypto/sm3.ko
lib/modules/6.12.0-rc7-xe/kernel/crypto/pcrypt.ko
lib/modules/6.12.0-rc7-xe/kernel/crypto/aegis128.ko
lib/modules/6.12.0-rc7-xe/kernel/crypto/af_alg.ko
lib/modules/6.12.0-rc7-xe/kernel/crypto/algif_aead.ko
lib/modules/6.12.0-rc7-xe/kernel/crypto/cmac.ko
lib/modules/6.12.0-rc7-xe/kernel/crypto/sm3_generic.ko
lib/modules/6.12.0-rc7-xe/kernel/crypto/aes_ti.ko
lib/modules/6.12.0-rc7-xe/kernel/crypto/chacha_generic.ko
lib/modules/6.12.0-rc7-xe/kernel/crypto/poly1305_generic.ko
lib/modules/6.12.0-rc7-xe/kernel/crypto/nhpoly1305.ko
lib/modules/6.12.0-rc7-xe/kernel/crypto/crc32_generic.ko
lib/modules/6.12.0-rc7-xe/kernel/crypto/essiv.ko
lib/modules/6.12.0-rc7-xe/kernel/crypto/ccm.ko
lib/modules/6.12.0-rc7-xe/kernel/crypto/wp512.ko
lib/modules/6.12.0-rc7-xe/kernel/crypto/streebog_generic.ko
lib/modules/6.12.0-rc7-xe/kernel/crypto/authencesn.ko
lib/modules/6.12.0-rc7-xe/kernel/crypto/echainiv.ko
lib/modules/6.12.0-rc7-xe/kernel/crypto/lrw.ko
lib/modules/6.12.0-rc7-xe/kernel/crypto/cryptd.ko
lib/modules/6.12.0-rc7-xe/kernel/crypto/crypto_user.ko
lib/modules/6.12.0-rc7-xe/kernel/crypto/algif_hash.ko
lib/modules/6.12.0-rc7-xe/kernel/crypto/vmac.ko
lib/modules/6.12.0-rc7-xe/kernel/crypto/polyval-generic.ko
lib/modules/6.12.0-rc7-xe/kernel/crypto/hctr2.ko
lib/modules/6.12.0-rc7-xe/kernel/crypto/842.ko
lib/modules/6.12.0-rc7-xe/kernel/crypto/pcbc.ko
lib/modules/6.12.0-rc7-xe/kernel/crypto/ansi_cprng.ko
lib/modules/6.12.0-rc7-xe/kernel/crypto/cast6_generic.ko
lib/modules/6.12.0-rc7-xe/kernel/crypto/twofish_common.ko
lib/modules/6.12.0-rc7-xe/kernel/crypto/twofish_generic.ko
lib/modules/6.12.0-rc7-xe/kernel/crypto/lz4hc.ko
lib/modules/6.12.0-rc7-xe/kernel/crypto/blowfish_generic.ko
lib/modules/6.12.0-rc7-xe/kernel/crypto/md4.ko
lib/modules/6.12.0-rc7-xe/kernel/crypto/chacha20poly1305.ko
lib/modules/6.12.0-rc7-xe/kernel/crypto/curve25519-generic.ko
lib/modules/6.12.0-rc7-xe/kernel/crypto/lz4.ko
lib/modules/6.12.0-rc7-xe/kernel/crypto/rmd160.ko
lib/modules/6.12.0-rc7-xe/kernel/crypto/algif_skcipher.ko
lib/modules/6.12.0-rc7-xe/kernel/crypto/cast5_generic.ko
lib/modules/6.12.0-rc7-xe/kernel/crypto/fcrypt.ko
lib/modules/6.12.0-rc7-xe/kernel/crypto/ecdsa_generic.ko
lib/modules/6.12.0-rc7-xe/kernel/crypto/sm4.ko
lib/modules/6.12.0-rc7-xe/kernel/crypto/cast_common.ko
lib/modules/6.12.0-rc7-xe/kernel/crypto/blowfish_common.ko
lib/modules/6.12.0-rc7-xe/kernel/crypto/michael_mic.ko
lib/modules/6.12.0-rc7-xe/kernel/crypto/async_tx/
lib/modules/6.12.0-rc7-xe/kernel/crypto/async_tx/async_xor.ko
lib/modules/6.12.0-rc7-xe/kernel/crypto/async_tx/async_tx.ko
lib/modules/6.12.0-rc7-xe/kernel/crypto/async_tx/async_memcpy.ko
lib/modules/6.12.0-rc7-xe/kernel/crypto/async_tx/async_pq.ko
lib/modules/6.12.0-rc7-xe/kernel/crypto/async_tx/async_raid6_recov.ko
lib/modules/6.12.0-rc7-xe/kernel/crypto/algif_rng.ko
lib/modules/6.12.0-rc7-xe/kernel/block/
lib/modules/6.12.0-rc7-xe/kernel/block/bfq.ko
lib/modules/6.12.0-rc7-xe/kernel/block/kyber-iosched.ko
lib/modules/6.12.0-rc7-xe/build
lib/modules/6.12.0-rc7-xe/modules.alias.bin
lib/modules/6.12.0-rc7-xe/modules.builtin
lib/modules/6.12.0-rc7-xe/modules.softdep
lib/modules/6.12.0-rc7-xe/modules.alias
lib/modules/6.12.0-rc7-xe/modules.order
lib/modules/6.12.0-rc7-xe/modules.symbols
lib/modules/6.12.0-rc7-xe/modules.dep.bin
+ mv kernel-nodebug.tar.gz ..
+ cd ..
+ rm -rf archive
++ date +%s
^[[0Ksection_end:1731711535:package_x86_64_nodebug
^[[0K
+ echo -e '\e[0Ksection_end:1731711535:package_x86_64_nodebug\r\e[0K'
+ sync
+ cleanup
++ stat -c %u:%g /kernel
+ chown -R 1003:1003 /kernel

✗ CI.Hooks: failure for series starting with [1/3] drm/i915/display: Move shutdown sequences under display driver (rev2)

[Patchwork]

== Series Details ==

Series: series starting with [1/3] drm/i915/display: Move shutdown sequences under display driver (rev2)
URL   : https://patchwork.freedesktop.org/series/141378/
State : failure

== Summary ==

run-parts: executing /workspace/ci/hooks/00-showenv
+ export
+ grep -Ei '(^|\W)CI_'
declare -x CI_KERNEL_BUILD_DIR="/workspace/kernel/build64-default"
declare -x CI_KERNEL_SRC_DIR="/workspace/kernel"
declare -x CI_TOOLS_SRC_DIR="/workspace/ci"
declare -x CI_WORKSPACE_DIR="/workspace"
run-parts: executing /workspace/ci/hooks/10-build-W1
+ SRC_DIR=/workspace/kernel
+ RESTORE_DISPLAY_CONFIG=0
+ '[' -n /workspace/kernel/build64-default ']'
+ BUILD_DIR=/workspace/kernel/build64-default
+ cd /workspace/kernel
++ nproc
+ make -j48 O=/workspace/kernel/build64-default modules_prepare
make[1]: Entering directory '/workspace/kernel/build64-default'
  GEN     Makefile
  UPD     include/config/kernel.release
  UPD     include/generated/utsrelease.h
mkdir -p /workspace/kernel/build64-default/tools/objtool && make O=/workspace/kernel/build64-default subdir=tools/objtool --no-print-directory -C objtool 
  CALL    ../scripts/checksyscalls.sh
  INSTALL libsubcmd_headers
  CC      /workspace/kernel/build64-default/tools/objtool/libsubcmd/exec-cmd.o
  CC      /workspace/kernel/build64-default/tools/objtool/libsubcmd/help.o
  CC      /workspace/kernel/build64-default/tools/objtool/libsubcmd/pager.o
  CC      /workspace/kernel/build64-default/tools/objtool/libsubcmd/parse-options.o
  CC      /workspace/kernel/build64-default/tools/objtool/libsubcmd/run-command.o
  CC      /workspace/kernel/build64-default/tools/objtool/libsubcmd/sigchain.o
  CC      /workspace/kernel/build64-default/tools/objtool/libsubcmd/subcmd-config.o
  LD      /workspace/kernel/build64-default/tools/objtool/libsubcmd/libsubcmd-in.o
  AR      /workspace/kernel/build64-default/tools/objtool/libsubcmd/libsubcmd.a
  CC      /workspace/kernel/build64-default/tools/objtool/weak.o
  CC      /workspace/kernel/build64-default/tools/objtool/check.o
  CC      /workspace/kernel/build64-default/tools/objtool/special.o
  CC      /workspace/kernel/build64-default/tools/objtool/builtin-check.o
  CC      /workspace/kernel/build64-default/tools/objtool/elf.o
  CC      /workspace/kernel/build64-default/tools/objtool/objtool.o
  CC      /workspace/kernel/build64-default/tools/objtool/orc_gen.o
  CC      /workspace/kernel/build64-default/tools/objtool/orc_dump.o
  CC      /workspace/kernel/build64-default/tools/objtool/libstring.o
  CC      /workspace/kernel/build64-default/tools/objtool/arch/x86/special.o
  CC      /workspace/kernel/build64-default/tools/objtool/libctype.o
  CC      /workspace/kernel/build64-default/tools/objtool/str_error_r.o
  CC      /workspace/kernel/build64-default/tools/objtool/arch/x86/decode.o
  CC      /workspace/kernel/build64-default/tools/objtool/librbtree.o
  CC      /workspace/kernel/build64-default/tools/objtool/arch/x86/orc.o
  LD      /workspace/kernel/build64-default/tools/objtool/arch/x86/objtool-in.o
  LD      /workspace/kernel/build64-default/tools/objtool/objtool-in.o
  LINK    /workspace/kernel/build64-default/tools/objtool/objtool
make[1]: Leaving directory '/workspace/kernel/build64-default'
++ nproc
+ make -j48 O=/workspace/kernel/build64-default W=1 drivers/gpu/drm/xe
make[1]: Entering directory '/workspace/kernel/build64-default'
make[2]: Nothing to be done for 'drivers/gpu/drm/xe'.
make[1]: Leaving directory '/workspace/kernel/build64-default'
run-parts: executing /workspace/ci/hooks/11-build-32b
+++ realpath /workspace/ci/hooks/11-build-32b
++ dirname /workspace/ci/hooks/11-build-32b
+ THIS_SCRIPT_DIR=/workspace/ci/hooks
+ SRC_DIR=/workspace/kernel
+ TOOLS_SRC_DIR=/workspace/ci
+ '[' -n /workspace/kernel/build64-default ']'
+ BUILD_DIR=/workspace/kernel/build64-default
+ BUILD_DIR=/workspace/kernel/build64-default/build32
+ cd /workspace/kernel
+ mkdir -p /workspace/kernel/build64-default/build32
++ nproc
+ make -j48 ARCH=i386 O=/workspace/kernel/build64-default/build32 defconfig
make[1]: Entering directory '/workspace/kernel/build64-default/build32'
  GEN     Makefile
  HOSTCC  scripts/basic/fixdep
  HOSTCC  scripts/kconfig/conf.o
  HOSTCC  scripts/kconfig/confdata.o
  HOSTCC  scripts/kconfig/expr.o
  LEX     scripts/kconfig/lexer.lex.c
  YACC    scripts/kconfig/parser.tab.[ch]
  HOSTCC  scripts/kconfig/menu.o
  HOSTCC  scripts/kconfig/preprocess.o
  HOSTCC  scripts/kconfig/symbol.o
  HOSTCC  scripts/kconfig/util.o
  HOSTCC  scripts/kconfig/lexer.lex.o
  HOSTCC  scripts/kconfig/parser.tab.o
  HOSTLD  scripts/kconfig/conf
*** Default configuration is based on 'i386_defconfig'
#
# configuration written to .config
#
make[1]: Leaving directory '/workspace/kernel/build64-default/build32'
+ cd /workspace/kernel/build64-default/build32
+ /workspace/kernel/scripts/kconfig/merge_config.sh .config /workspace/ci/kernel/10-xe.fragment
Using .config as base
Merging /workspace/ci/kernel/10-xe.fragment
The merge file '/workspace/ci/kernel/10-xe.fragment' does not exist.  Exit.
run-parts: /workspace/ci/hooks/11-build-32b exited with return code 1

✗ CI.checksparse: warning for series starting with [1/3] drm/i915/display: Move shutdown sequences under display driver (rev2)

[Patchwork]

== Series Details ==

Series: series starting with [1/3] drm/i915/display: Move shutdown sequences under display driver (rev2)
URL   : https://patchwork.freedesktop.org/series/141378/
State : warning

== Summary ==

+ trap cleanup EXIT
+ KERNEL=/kernel
+ MT=/root/linux/maintainer-tools
+ git clone https://gitlab.freedesktop.org/drm/maintainer-tools /root/linux/maintainer-tools
Cloning into '/root/linux/maintainer-tools'...
warning: redirecting to https://gitlab.freedesktop.org/drm/maintainer-tools.git/
+ make -C /root/linux/maintainer-tools
make: Entering directory '/root/linux/maintainer-tools'
cc -O2 -g -Wextra -o remap-log remap-log.c
make: Leaving directory '/root/linux/maintainer-tools'
+ cd /kernel
+ git config --global --add safe.directory /kernel
+ /root/linux/maintainer-tools/dim sparse --fast f43942f219c827e4e89baa102ceca3d62205135e
/root/linux/maintainer-tools/dim: line 2068: sparse: command not found
Sparse version: 
Fast mode used, each commit won't be checked separately.
+ cleanup
++ stat -c %u:%g /kernel
+ chown -R 1003:1003 /kernel

✗ CI.BAT: failure for series starting with [1/3] drm/i915/display: Move shutdown sequences under display driver (rev2)

[Patchwork]

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

== Series Details ==

Series: series starting with [1/3] drm/i915/display: Move shutdown sequences under display driver (rev2)
URL   : https://patchwork.freedesktop.org/series/141378/
State : failure

== Summary ==

CI Bug Log - changes from xe-2235-36fec0eb87867bca47f8829c9e5dbf5b3e2b3aaf_BAT -> xe-pw-141378v2_BAT
====================================================

Summary
-------

  **FAILURE**

  Serious unknown changes coming with xe-pw-141378v2_BAT absolutely need to be
  verified manually.
  
  If you think the reported changes have nothing to do with the changes
  introduced in xe-pw-141378v2_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 (9 -> 9)
------------------------------

  No changes in participating hosts

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

  Here are the unknown changes that may have been introduced in xe-pw-141378v2_BAT:

### IGT changes ###

#### Possible regressions ####

  * igt@xe_exec_fault_mode@twice-bindexecqueue-userptr-prefetch:
    - bat-lnl-1:          [PASS][1] -> [DMESG-FAIL][2] +33 other tests dmesg-fail
   [1]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-2235-36fec0eb87867bca47f8829c9e5dbf5b3e2b3aaf/bat-lnl-1/igt@xe_exec_fault_mode@twice-bindexecqueue-userptr-prefetch.html
   [2]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-pw-141378v2/bat-lnl-1/igt@xe_exec_fault_mode@twice-bindexecqueue-userptr-prefetch.html

  * igt@xe_exec_fault_mode@twice-userptr-invalidate-prefetch:
    - bat-lnl-2:          [PASS][3] -> [DMESG-FAIL][4] +33 other tests dmesg-fail
   [3]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-2235-36fec0eb87867bca47f8829c9e5dbf5b3e2b3aaf/bat-lnl-2/igt@xe_exec_fault_mode@twice-userptr-invalidate-prefetch.html
   [4]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-pw-141378v2/bat-lnl-2/igt@xe_exec_fault_mode@twice-userptr-invalidate-prefetch.html

  * igt@xe_exec_threads@threads-basic:
    - bat-lnl-1:          [PASS][5] -> [DMESG-WARN][6] +3 other tests dmesg-warn
   [5]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-2235-36fec0eb87867bca47f8829c9e5dbf5b3e2b3aaf/bat-lnl-1/igt@xe_exec_threads@threads-basic.html
   [6]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-pw-141378v2/bat-lnl-1/igt@xe_exec_threads@threads-basic.html

  * igt@xe_exec_threads@threads-mixed-basic:
    - bat-lnl-2:          [PASS][7] -> [DMESG-WARN][8] +3 other tests dmesg-warn
   [7]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-2235-36fec0eb87867bca47f8829c9e5dbf5b3e2b3aaf/bat-lnl-2/igt@xe_exec_threads@threads-mixed-basic.html
   [8]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-pw-141378v2/bat-lnl-2/igt@xe_exec_threads@threads-mixed-basic.html

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

  Here are the changes found in xe-pw-141378v2_BAT that come from known issues:

### IGT changes ###

#### Issues hit ####

  * igt@kms_frontbuffer_tracking@basic:
    - bat-adlp-7:         [PASS][9] -> [DMESG-WARN][10] ([Intel XE#1033])
   [9]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-2235-36fec0eb87867bca47f8829c9e5dbf5b3e2b3aaf/bat-adlp-7/igt@kms_frontbuffer_tracking@basic.html
   [10]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-pw-141378v2/bat-adlp-7/igt@kms_frontbuffer_tracking@basic.html

  * igt@xe_evict@evict-beng-small:
    - bat-adlp-7:         NOTRUN -> [SKIP][11] ([Intel XE#261] / [Intel XE#3443] / [Intel XE#688]) +15 other tests skip
   [11]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-pw-141378v2/bat-adlp-7/igt@xe_evict@evict-beng-small.html

  * igt@xe_exec_fault_mode@twice-userptr-invalidate-prefetch:
    - bat-adlp-7:         NOTRUN -> [SKIP][12] ([Intel XE#288] / [Intel XE#3443]) +32 other tests skip
   [12]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-pw-141378v2/bat-adlp-7/igt@xe_exec_fault_mode@twice-userptr-invalidate-prefetch.html

  * igt@xe_live_ktest@xe_bo:
    - bat-adlp-vf:        [PASS][13] -> [SKIP][14] ([Intel XE#2229] / [Intel XE#455])
   [13]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-2235-36fec0eb87867bca47f8829c9e5dbf5b3e2b3aaf/bat-adlp-vf/igt@xe_live_ktest@xe_bo.html
   [14]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-pw-141378v2/bat-adlp-vf/igt@xe_live_ktest@xe_bo.html
    - bat-lnl-1:          [PASS][15] -> [SKIP][16] ([Intel XE#1192]) +2 other tests skip
   [15]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-2235-36fec0eb87867bca47f8829c9e5dbf5b3e2b3aaf/bat-lnl-1/igt@xe_live_ktest@xe_bo.html
   [16]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-pw-141378v2/bat-lnl-1/igt@xe_live_ktest@xe_bo.html

  * igt@xe_live_ktest@xe_migrate:
    - bat-lnl-2:          [PASS][17] -> [SKIP][18] ([Intel XE#1192]) +2 other tests skip
   [17]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-2235-36fec0eb87867bca47f8829c9e5dbf5b3e2b3aaf/bat-lnl-2/igt@xe_live_ktest@xe_migrate.html
   [18]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-pw-141378v2/bat-lnl-2/igt@xe_live_ktest@xe_migrate.html

  * igt@xe_live_ktest@xe_migrate@xe_validate_ccs_kunit:
    - bat-adlp-7:         NOTRUN -> [SKIP][19] ([Intel XE#2229] / [Intel XE#3443])
   [19]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-pw-141378v2/bat-adlp-7/igt@xe_live_ktest@xe_migrate@xe_validate_ccs_kunit.html

  
#### Possible fixes ####

  * igt@xe_live_ktest@xe_bo:
    - bat-bmg-1:          [INCOMPLETE][20] ([Intel XE#2874] / [Intel XE#2998]) -> [PASS][21]
   [20]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-2235-36fec0eb87867bca47f8829c9e5dbf5b3e2b3aaf/bat-bmg-1/igt@xe_live_ktest@xe_bo.html
   [21]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-pw-141378v2/bat-bmg-1/igt@xe_live_ktest@xe_bo.html

  
#### Warnings ####

  * igt@xe_live_ktest@xe_bo:
    - bat-adlp-7:         [INCOMPLETE][22] ([Intel XE#2874]) -> [SKIP][23] ([Intel XE#2229] / [Intel XE#3443] / [Intel XE#455])
   [22]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-2235-36fec0eb87867bca47f8829c9e5dbf5b3e2b3aaf/bat-adlp-7/igt@xe_live_ktest@xe_bo.html
   [23]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-pw-141378v2/bat-adlp-7/igt@xe_live_ktest@xe_bo.html

  * igt@xe_live_ktest@xe_bo@xe_bo_evict_kunit:
    - bat-adlp-7:         [SKIP][24] ([Intel XE#2229] / [Intel XE#3443]) -> [SKIP][25] ([Intel XE#2229] / [Intel XE#3443] / [Intel XE#455]) +1 other test skip
   [24]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-2235-36fec0eb87867bca47f8829c9e5dbf5b3e2b3aaf/bat-adlp-7/igt@xe_live_ktest@xe_bo@xe_bo_evict_kunit.html
   [25]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-pw-141378v2/bat-adlp-7/igt@xe_live_ktest@xe_bo@xe_bo_evict_kunit.html

  * igt@xe_live_ktest@xe_bo@xe_ccs_migrate_kunit:
    - bat-adlp-vf:        [SKIP][26] ([Intel XE#2229]) -> [SKIP][27] ([Intel XE#2229] / [Intel XE#455]) +1 other test skip
   [26]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-2235-36fec0eb87867bca47f8829c9e5dbf5b3e2b3aaf/bat-adlp-vf/igt@xe_live_ktest@xe_bo@xe_ccs_migrate_kunit.html
   [27]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-pw-141378v2/bat-adlp-vf/igt@xe_live_ktest@xe_bo@xe_ccs_migrate_kunit.html

  
  [Intel XE#1033]: https://gitlab.freedesktop.org/drm/xe/kernel/issues/1033
  [Intel XE#1192]: https://gitlab.freedesktop.org/drm/xe/kernel/issues/1192
  [Intel XE#2229]: https://gitlab.freedesktop.org/drm/xe/kernel/issues/2229
  [Intel XE#261]: https://gitlab.freedesktop.org/drm/xe/kernel/issues/261
  [Intel XE#2874]: https://gitlab.freedesktop.org/drm/xe/kernel/issues/2874
  [Intel XE#288]: https://gitlab.freedesktop.org/drm/xe/kernel/issues/288
  [Intel XE#2998]: https://gitlab.freedesktop.org/drm/xe/kernel/issues/2998
  [Intel XE#3443]: https://gitlab.freedesktop.org/drm/xe/kernel/issues/3443
  [Intel XE#455]: https://gitlab.freedesktop.org/drm/xe/kernel/issues/455
  [Intel XE#688]: https://gitlab.freedesktop.org/drm/xe/kernel/issues/688


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

  * IGT: IGT_8111 -> IGT_8114
  * Linux: xe-2235-36fec0eb87867bca47f8829c9e5dbf5b3e2b3aaf -> xe-pw-141378v2

  IGT_8111: 67422a7b55b0278cf0d1bfdc0899ee637ed7d588 @ https://gitlab.freedesktop.org/drm/igt-gpu-tools.git
  IGT_8114: 8114
  xe-2235-36fec0eb87867bca47f8829c9e5dbf5b3e2b3aaf: 36fec0eb87867bca47f8829c9e5dbf5b3e2b3aaf
  xe-pw-141378v2: 141378v2

== Logs ==

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

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

[PATCH 3/3] drm/xe: Use i915-display shutdown sequence directly

[Rodrigo Vivi]

Start the xe-i915-display reconciliation by using the same
shutdown sequences.

v2: include the stubs for !CONFIG_DRM_XE_DISPLAY (Kunit)

Reviewed-by: Jonathan Cavitt <jonathan.cavitt@intel.com>
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
---
 drivers/gpu/drm/xe/display/xe_display.c | 48 +++++++------------------
 drivers/gpu/drm/xe/display/xe_display.h | 10 +++---
 drivers/gpu/drm/xe/xe_device.c          |  4 ++-
 3 files changed, 22 insertions(+), 40 deletions(-)

diff --git a/drivers/gpu/drm/xe/display/xe_display.c b/drivers/gpu/drm/xe/display/xe_display.c
index 4f60d7bd7742..e1ce9eb3332d 100644
--- a/drivers/gpu/drm/xe/display/xe_display.c
+++ b/drivers/gpu/drm/xe/display/xe_display.c
@@ -10,7 +10,6 @@
 
 #include <drm/drm_drv.h>
 #include <drm/drm_managed.h>
-#include <drm/drm_atomic_helper.h>
 #include <drm/drm_probe_helper.h>
 #include <uapi/drm/xe_drm.h>
 
@@ -369,32 +368,26 @@ void xe_display_pm_suspend(struct xe_device *xe)
 
 void xe_display_pm_shutdown(struct xe_device *xe)
 {
-	struct intel_display *display = &xe->display;
-
 	if (!xe->info.probe_display)
 		return;
 
-	intel_power_domains_disable(display);
-	intel_fbdev_set_suspend(&xe->drm, FBINFO_STATE_SUSPENDED, true);
-	if (has_display(xe)) {
-		drm_kms_helper_poll_disable(&xe->drm);
-		intel_display_driver_disable_user_access(display);
-
-		drm_atomic_helper_shutdown(display->drm);
-	}
-
-	intel_dp_mst_suspend(display);
-	intel_hpd_cancel_work(xe);
+	intel_display_driver_shutdown(&xe->display);
+}
 
-	if (has_display(xe))
-		intel_display_driver_suspend_access(display);
+void xe_display_pm_shutdown_noirq(struct xe_device *xe)
+{
+	if (!xe->info.probe_display)
+		return;
 
-	intel_encoder_suspend_all(display);
-	intel_encoder_shutdown_all(display);
+	intel_display_driver_shutdown_noirq(&xe->display);
+}
 
-	intel_opregion_suspend(display, PCI_D3cold);
+void xe_display_pm_shutdown_noaccel(struct xe_device *xe)
+{
+	if (!xe->info.probe_display)
+		return;
 
-	intel_dmc_suspend(display);
+	intel_display_driver_shutdown_nogem(&xe->display);
 }
 
 void xe_display_pm_runtime_suspend(struct xe_device *xe)
@@ -439,21 +432,6 @@ 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)
-{
-	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_power_domains_driver_remove(display);
-}
-
 void xe_display_pm_resume_early(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 233f81a26c25..a15ec29b862b 100644
--- a/drivers/gpu/drm/xe/display/xe_display.h
+++ b/drivers/gpu/drm/xe/display/xe_display.h
@@ -35,9 +35,10 @@ void xe_display_irq_reset(struct xe_device *xe);
 void xe_display_irq_postinstall(struct xe_device *xe, struct xe_gt *gt);
 
 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_shutdown(struct xe_device *xe);
+void xe_display_pm_shutdown_noirq(struct xe_device *xe);
+void xe_display_pm_shutdown_noaccel(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);
@@ -69,9 +70,10 @@ static inline void xe_display_irq_reset(struct xe_device *xe) {}
 static inline void xe_display_irq_postinstall(struct xe_device *xe, struct xe_gt *gt) {}
 
 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_shutdown(struct xe_device *xe) {}
+static inline void xe_display_pm_shutdown_noirq(struct xe_device *xe) {}
+static inline void xe_display_pm_shutdown_noaccel(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 0966d9697caf..53cac055a2a9 100644
--- a/drivers/gpu/drm/xe/xe_device.c
+++ b/drivers/gpu/drm/xe/xe_device.c
@@ -934,10 +934,12 @@ void xe_device_shutdown(struct xe_device *xe)
 
 		xe_irq_suspend(xe);
 
+		xe_display_pm_shutdown_noirq(xe);
+
 		for_each_gt(gt, xe, id)
 			xe_gt_shutdown(gt);
 
-		xe_display_pm_shutdown_late(xe);
+		xe_display_pm_shutdown_noaccel(xe);
 	} else {
 		/* BOOM! */
 		__xe_driver_flr(xe);
-- 
2.48.1

Re: [PATCH 3/3] drm/xe: Use i915-display shutdown sequence directly

[Maarten Lankhorst]

Hey,

Den 2025-01-17 kl. 23:09, skrev Rodrigo Vivi:
> Start the xe-i915-display reconciliation by using the same
> shutdown sequences.
> 
> v2: include the stubs for !CONFIG_DRM_XE_DISPLAY (Kunit)
> 
> Reviewed-by: Jonathan Cavitt <jonathan.cavitt@intel.com>
> Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
> ---
>   drivers/gpu/drm/xe/display/xe_display.c | 48 +++++++------------------
>   drivers/gpu/drm/xe/display/xe_display.h | 10 +++---
>   drivers/gpu/drm/xe/xe_device.c          |  4 ++-
>   3 files changed, 22 insertions(+), 40 deletions(-)
> 
> diff --git a/drivers/gpu/drm/xe/display/xe_display.c b/drivers/gpu/drm/xe/display/xe_display.c
> index 4f60d7bd7742..e1ce9eb3332d 100644
> --- a/drivers/gpu/drm/xe/display/xe_display.c
> +++ b/drivers/gpu/drm/xe/display/xe_display.c
> @@ -10,7 +10,6 @@
>   
>   #include <drm/drm_drv.h>
>   #include <drm/drm_managed.h>
> -#include <drm/drm_atomic_helper.h>
>   #include <drm/drm_probe_helper.h>
>   #include <uapi/drm/xe_drm.h>
>   
> @@ -369,32 +368,26 @@ void xe_display_pm_suspend(struct xe_device *xe)
>   
>   void xe_display_pm_shutdown(struct xe_device *xe)
>   {
> -	struct intel_display *display = &xe->display;
> -
>   	if (!xe->info.probe_display)
>   		return;
>   
> -	intel_power_domains_disable(display);
> -	intel_fbdev_set_suspend(&xe->drm, FBINFO_STATE_SUSPENDED, true);
> -	if (has_display(xe)) {
> -		drm_kms_helper_poll_disable(&xe->drm);
> -		intel_display_driver_disable_user_access(display);
> -
> -		drm_atomic_helper_shutdown(display->drm);
> -	}
> -
> -	intel_dp_mst_suspend(display);
> -	intel_hpd_cancel_work(xe);
> +	intel_display_driver_shutdown(&xe->display);
> +}
>   
> -	if (has_display(xe))
> -		intel_display_driver_suspend_access(display);
> +void xe_display_pm_shutdown_noirq(struct xe_device *xe)
> +{
> +	if (!xe->info.probe_display)
> +		return;
>   
> -	intel_encoder_suspend_all(display);
> -	intel_encoder_shutdown_all(display);
> +	intel_display_driver_shutdown_noirq(&xe->display);
> +}
>   
> -	intel_opregion_suspend(display, PCI_D3cold);
> +void xe_display_pm_shutdown_noaccel(struct xe_device *xe)
> +{
> +	if (!xe->info.probe_display)
> +		return;
>   
> -	intel_dmc_suspend(display);
> +	intel_display_driver_shutdown_nogem(&xe->display);
>   }
>   
>   void xe_display_pm_runtime_suspend(struct xe_device *xe)
> @@ -439,21 +432,6 @@ 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)
> -{
> -	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_power_domains_driver_remove(display);
> -}
> -
>   void xe_display_pm_resume_early(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 233f81a26c25..a15ec29b862b 100644
> --- a/drivers/gpu/drm/xe/display/xe_display.h
> +++ b/drivers/gpu/drm/xe/display/xe_display.h
> @@ -35,9 +35,10 @@ void xe_display_irq_reset(struct xe_device *xe);
>   void xe_display_irq_postinstall(struct xe_device *xe, struct xe_gt *gt);
>   
>   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_shutdown(struct xe_device *xe);
> +void xe_display_pm_shutdown_noirq(struct xe_device *xe);
> +void xe_display_pm_shutdown_noaccel(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);
> @@ -69,9 +70,10 @@ static inline void xe_display_irq_reset(struct xe_device *xe) {}
>   static inline void xe_display_irq_postinstall(struct xe_device *xe, struct xe_gt *gt) {}
>   
>   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_shutdown(struct xe_device *xe) {}
> +static inline void xe_display_pm_shutdown_noirq(struct xe_device *xe) {}
> +static inline void xe_display_pm_shutdown_noaccel(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 0966d9697caf..53cac055a2a9 100644
> --- a/drivers/gpu/drm/xe/xe_device.c
> +++ b/drivers/gpu/drm/xe/xe_device.c
> @@ -934,10 +934,12 @@ void xe_device_shutdown(struct xe_device *xe)
>   
>   		xe_irq_suspend(xe);
>   
> +		xe_display_pm_shutdown_noirq(xe);
> +
>   		for_each_gt(gt, xe, id)
>   			xe_gt_shutdown(gt);
>   
> -		xe_display_pm_shutdown_late(xe);
> +		xe_display_pm_shutdown_noaccel(xe);
 From the xe point of view, it shouldn't matter whether we call the 
noirq part before or after gt shutdown. I like the integration into 
xe_device to be as simple as possible, so could we keep the single 
xe_display_pm_shutdown_late() call?

Which reminds me to send out xe_display simplification once more to do 
the same for init..
>   	} else {
>   		/* BOOM! */
>   		__xe_driver_flr(xe);
Completely unrelated, do you happen to know if we need to call 
encoder_suspend/shutdown in the FLR path, whether it affects logic not 
on the chip itself?

Cheers,
~Maarten

Re: [PATCH 3/3] drm/xe: Use i915-display shutdown sequence directly

[Rodrigo Vivi]

On Mon, Jan 20, 2025 at 02:42:14PM +0100, Maarten Lankhorst wrote:
> Hey,
> 
> Den 2025-01-17 kl. 23:09, skrev Rodrigo Vivi:
> > Start the xe-i915-display reconciliation by using the same
> > shutdown sequences.
> > 
> > v2: include the stubs for !CONFIG_DRM_XE_DISPLAY (Kunit)
> > 
> > Reviewed-by: Jonathan Cavitt <jonathan.cavitt@intel.com>
> > Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
> > ---
> >   drivers/gpu/drm/xe/display/xe_display.c | 48 +++++++------------------
> >   drivers/gpu/drm/xe/display/xe_display.h | 10 +++---
> >   drivers/gpu/drm/xe/xe_device.c          |  4 ++-
> >   3 files changed, 22 insertions(+), 40 deletions(-)
> > 
> > diff --git a/drivers/gpu/drm/xe/display/xe_display.c b/drivers/gpu/drm/xe/display/xe_display.c
> > index 4f60d7bd7742..e1ce9eb3332d 100644
> > --- a/drivers/gpu/drm/xe/display/xe_display.c
> > +++ b/drivers/gpu/drm/xe/display/xe_display.c
> > @@ -10,7 +10,6 @@
> >   #include <drm/drm_drv.h>
> >   #include <drm/drm_managed.h>
> > -#include <drm/drm_atomic_helper.h>
> >   #include <drm/drm_probe_helper.h>
> >   #include <uapi/drm/xe_drm.h>
> > @@ -369,32 +368,26 @@ void xe_display_pm_suspend(struct xe_device *xe)
> >   void xe_display_pm_shutdown(struct xe_device *xe)
> >   {
> > -	struct intel_display *display = &xe->display;
> > -
> >   	if (!xe->info.probe_display)
> >   		return;
> > -	intel_power_domains_disable(display);
> > -	intel_fbdev_set_suspend(&xe->drm, FBINFO_STATE_SUSPENDED, true);
> > -	if (has_display(xe)) {
> > -		drm_kms_helper_poll_disable(&xe->drm);
> > -		intel_display_driver_disable_user_access(display);
> > -
> > -		drm_atomic_helper_shutdown(display->drm);
> > -	}
> > -
> > -	intel_dp_mst_suspend(display);
> > -	intel_hpd_cancel_work(xe);
> > +	intel_display_driver_shutdown(&xe->display);
> > +}
> > -	if (has_display(xe))
> > -		intel_display_driver_suspend_access(display);
> > +void xe_display_pm_shutdown_noirq(struct xe_device *xe)
> > +{
> > +	if (!xe->info.probe_display)
> > +		return;
> > -	intel_encoder_suspend_all(display);
> > -	intel_encoder_shutdown_all(display);
> > +	intel_display_driver_shutdown_noirq(&xe->display);
> > +}
> > -	intel_opregion_suspend(display, PCI_D3cold);
> > +void xe_display_pm_shutdown_noaccel(struct xe_device *xe)
> > +{
> > +	if (!xe->info.probe_display)
> > +		return;
> > -	intel_dmc_suspend(display);
> > +	intel_display_driver_shutdown_nogem(&xe->display);
> >   }
> >   void xe_display_pm_runtime_suspend(struct xe_device *xe)
> > @@ -439,21 +432,6 @@ 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)
> > -{
> > -	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_power_domains_driver_remove(display);
> > -}
> > -
> >   void xe_display_pm_resume_early(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 233f81a26c25..a15ec29b862b 100644
> > --- a/drivers/gpu/drm/xe/display/xe_display.h
> > +++ b/drivers/gpu/drm/xe/display/xe_display.h
> > @@ -35,9 +35,10 @@ void xe_display_irq_reset(struct xe_device *xe);
> >   void xe_display_irq_postinstall(struct xe_device *xe, struct xe_gt *gt);
> >   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_shutdown(struct xe_device *xe);
> > +void xe_display_pm_shutdown_noirq(struct xe_device *xe);
> > +void xe_display_pm_shutdown_noaccel(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);
> > @@ -69,9 +70,10 @@ static inline void xe_display_irq_reset(struct xe_device *xe) {}
> >   static inline void xe_display_irq_postinstall(struct xe_device *xe, struct xe_gt *gt) {}
> >   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_shutdown(struct xe_device *xe) {}
> > +static inline void xe_display_pm_shutdown_noirq(struct xe_device *xe) {}
> > +static inline void xe_display_pm_shutdown_noaccel(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 0966d9697caf..53cac055a2a9 100644
> > --- a/drivers/gpu/drm/xe/xe_device.c
> > +++ b/drivers/gpu/drm/xe/xe_device.c
> > @@ -934,10 +934,12 @@ void xe_device_shutdown(struct xe_device *xe)
> >   		xe_irq_suspend(xe);
> > +		xe_display_pm_shutdown_noirq(xe);
> > +
> >   		for_each_gt(gt, xe, id)
> >   			xe_gt_shutdown(gt);
> > -		xe_display_pm_shutdown_late(xe);
> > +		xe_display_pm_shutdown_noaccel(xe);
> From the xe point of view, it shouldn't matter whether we call the noirq
> part before or after gt shutdown. I like the integration into xe_device to
> be as simple as possible, so could we keep the single
> xe_display_pm_shutdown_late() call?

I prefer that we make the xe_display entirely an wrapper to i915/display,
It should only check for the Xe's display module parameter, and then call
the equivalent function there directly.

Then, whatever differences we might have we move to xe_device itself.

And in this case _noaccel is just a generic name for _nogem which is a name
that would works for both i915 and xe...

> 
> Which reminds me to send out xe_display simplification once more to do the
> same for init..

On that too, I know I reviewed, but Jani also had concerns with that on the
sense that that deviates from removing display differences between drivers.

Although I still believe it is possible to take that patch in, but later
move the differences out of xe_display ?!

> >   	} else {
> >   		/* BOOM! */
> >   		__xe_driver_flr(xe);
> Completely unrelated, do you happen to know if we need to call
> encoder_suspend/shutdown in the FLR path, whether it affects logic not on
> the chip itself?
> 
> Cheers,
> ~Maarten
> 

[PATCH 3/3] drm/xe: Use i915-display shutdown sequence directly

[Rodrigo Vivi]

Start the xe-i915-display reconciliation by using the same
shutdown sequences.

v2: include the stubs for !CONFIG_DRM_XE_DISPLAY (Kunit)

Reviewed-by: Jonathan Cavitt <jonathan.cavitt@intel.com>
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
---
 drivers/gpu/drm/xe/display/xe_display.c | 48 +++++++------------------
 drivers/gpu/drm/xe/display/xe_display.h | 10 +++---
 drivers/gpu/drm/xe/xe_device.c          |  4 ++-
 3 files changed, 22 insertions(+), 40 deletions(-)

diff --git a/drivers/gpu/drm/xe/display/xe_display.c b/drivers/gpu/drm/xe/display/xe_display.c
index 4f60d7bd7742..e1ce9eb3332d 100644
--- a/drivers/gpu/drm/xe/display/xe_display.c
+++ b/drivers/gpu/drm/xe/display/xe_display.c
@@ -10,7 +10,6 @@
 
 #include <drm/drm_drv.h>
 #include <drm/drm_managed.h>
-#include <drm/drm_atomic_helper.h>
 #include <drm/drm_probe_helper.h>
 #include <uapi/drm/xe_drm.h>
 
@@ -369,32 +368,26 @@ void xe_display_pm_suspend(struct xe_device *xe)
 
 void xe_display_pm_shutdown(struct xe_device *xe)
 {
-	struct intel_display *display = &xe->display;
-
 	if (!xe->info.probe_display)
 		return;
 
-	intel_power_domains_disable(display);
-	intel_fbdev_set_suspend(&xe->drm, FBINFO_STATE_SUSPENDED, true);
-	if (has_display(xe)) {
-		drm_kms_helper_poll_disable(&xe->drm);
-		intel_display_driver_disable_user_access(display);
-
-		drm_atomic_helper_shutdown(display->drm);
-	}
-
-	intel_dp_mst_suspend(display);
-	intel_hpd_cancel_work(xe);
+	intel_display_driver_shutdown(&xe->display);
+}
 
-	if (has_display(xe))
-		intel_display_driver_suspend_access(display);
+void xe_display_pm_shutdown_noirq(struct xe_device *xe)
+{
+	if (!xe->info.probe_display)
+		return;
 
-	intel_encoder_suspend_all(display);
-	intel_encoder_shutdown_all(display);
+	intel_display_driver_shutdown_noirq(&xe->display);
+}
 
-	intel_opregion_suspend(display, PCI_D3cold);
+void xe_display_pm_shutdown_noaccel(struct xe_device *xe)
+{
+	if (!xe->info.probe_display)
+		return;
 
-	intel_dmc_suspend(display);
+	intel_display_driver_shutdown_nogem(&xe->display);
 }
 
 void xe_display_pm_runtime_suspend(struct xe_device *xe)
@@ -439,21 +432,6 @@ 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)
-{
-	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_power_domains_driver_remove(display);
-}
-
 void xe_display_pm_resume_early(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 233f81a26c25..a15ec29b862b 100644
--- a/drivers/gpu/drm/xe/display/xe_display.h
+++ b/drivers/gpu/drm/xe/display/xe_display.h
@@ -35,9 +35,10 @@ void xe_display_irq_reset(struct xe_device *xe);
 void xe_display_irq_postinstall(struct xe_device *xe, struct xe_gt *gt);
 
 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_shutdown(struct xe_device *xe);
+void xe_display_pm_shutdown_noirq(struct xe_device *xe);
+void xe_display_pm_shutdown_noaccel(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);
@@ -69,9 +70,10 @@ static inline void xe_display_irq_reset(struct xe_device *xe) {}
 static inline void xe_display_irq_postinstall(struct xe_device *xe, struct xe_gt *gt) {}
 
 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_shutdown(struct xe_device *xe) {}
+static inline void xe_display_pm_shutdown_noirq(struct xe_device *xe) {}
+static inline void xe_display_pm_shutdown_noaccel(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 bd6191e1ed3e..b4b8c6582a20 100644
--- a/drivers/gpu/drm/xe/xe_device.c
+++ b/drivers/gpu/drm/xe/xe_device.c
@@ -940,10 +940,12 @@ void xe_device_shutdown(struct xe_device *xe)
 
 		xe_irq_suspend(xe);
 
+		xe_display_pm_shutdown_noirq(xe);
+
 		for_each_gt(gt, xe, id)
 			xe_gt_shutdown(gt);
 
-		xe_display_pm_shutdown_late(xe);
+		xe_display_pm_shutdown_noaccel(xe);
 	} else {
 		/* BOOM! */
 		__xe_driver_flr(xe);
-- 
2.48.1

Re: [PATCH 3/3] drm/xe: Use i915-display shutdown sequence directly

[Rodrigo Vivi]

On Mon, Jan 20, 2025 at 02:42:14PM +0100, Maarten Lankhorst wrote:
> Hey,
> 
> Den 2025-01-17 kl. 23:09, skrev Rodrigo Vivi:
> > Start the xe-i915-display reconciliation by using the same
> > shutdown sequences.
> > 
> > v2: include the stubs for !CONFIG_DRM_XE_DISPLAY (Kunit)
> > 
> > Reviewed-by: Jonathan Cavitt <jonathan.cavitt@intel.com>
> > Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
> > ---
> >   drivers/gpu/drm/xe/display/xe_display.c | 48 +++++++------------------
> >   drivers/gpu/drm/xe/display/xe_display.h | 10 +++---
> >   drivers/gpu/drm/xe/xe_device.c          |  4 ++-
> >   3 files changed, 22 insertions(+), 40 deletions(-)
> > 
> > diff --git a/drivers/gpu/drm/xe/display/xe_display.c b/drivers/gpu/drm/xe/display/xe_display.c
> > index 4f60d7bd7742..e1ce9eb3332d 100644
> > --- a/drivers/gpu/drm/xe/display/xe_display.c
> > +++ b/drivers/gpu/drm/xe/display/xe_display.c
> > @@ -10,7 +10,6 @@
> >   #include <drm/drm_drv.h>
> >   #include <drm/drm_managed.h>
> > -#include <drm/drm_atomic_helper.h>
> >   #include <drm/drm_probe_helper.h>
> >   #include <uapi/drm/xe_drm.h>
> > @@ -369,32 +368,26 @@ void xe_display_pm_suspend(struct xe_device *xe)
> >   void xe_display_pm_shutdown(struct xe_device *xe)
> >   {
> > -	struct intel_display *display = &xe->display;
> > -
> >   	if (!xe->info.probe_display)
> >   		return;
> > -	intel_power_domains_disable(display);
> > -	intel_fbdev_set_suspend(&xe->drm, FBINFO_STATE_SUSPENDED, true);
> > -	if (has_display(xe)) {
> > -		drm_kms_helper_poll_disable(&xe->drm);
> > -		intel_display_driver_disable_user_access(display);
> > -
> > -		drm_atomic_helper_shutdown(display->drm);
> > -	}
> > -
> > -	intel_dp_mst_suspend(display);
> > -	intel_hpd_cancel_work(xe);
> > +	intel_display_driver_shutdown(&xe->display);
> > +}
> > -	if (has_display(xe))
> > -		intel_display_driver_suspend_access(display);
> > +void xe_display_pm_shutdown_noirq(struct xe_device *xe)
> > +{
> > +	if (!xe->info.probe_display)
> > +		return;
> > -	intel_encoder_suspend_all(display);
> > -	intel_encoder_shutdown_all(display);
> > +	intel_display_driver_shutdown_noirq(&xe->display);
> > +}
> > -	intel_opregion_suspend(display, PCI_D3cold);
> > +void xe_display_pm_shutdown_noaccel(struct xe_device *xe)
> > +{
> > +	if (!xe->info.probe_display)
> > +		return;
> > -	intel_dmc_suspend(display);
> > +	intel_display_driver_shutdown_nogem(&xe->display);
> >   }
> >   void xe_display_pm_runtime_suspend(struct xe_device *xe)
> > @@ -439,21 +432,6 @@ 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)
> > -{
> > -	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_power_domains_driver_remove(display);
> > -}
> > -
> >   void xe_display_pm_resume_early(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 233f81a26c25..a15ec29b862b 100644
> > --- a/drivers/gpu/drm/xe/display/xe_display.h
> > +++ b/drivers/gpu/drm/xe/display/xe_display.h
> > @@ -35,9 +35,10 @@ void xe_display_irq_reset(struct xe_device *xe);
> >   void xe_display_irq_postinstall(struct xe_device *xe, struct xe_gt *gt);
> >   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_shutdown(struct xe_device *xe);
> > +void xe_display_pm_shutdown_noirq(struct xe_device *xe);
> > +void xe_display_pm_shutdown_noaccel(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);
> > @@ -69,9 +70,10 @@ static inline void xe_display_irq_reset(struct xe_device *xe) {}
> >   static inline void xe_display_irq_postinstall(struct xe_device *xe, struct xe_gt *gt) {}
> >   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_shutdown(struct xe_device *xe) {}
> > +static inline void xe_display_pm_shutdown_noirq(struct xe_device *xe) {}
> > +static inline void xe_display_pm_shutdown_noaccel(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 0966d9697caf..53cac055a2a9 100644
> > --- a/drivers/gpu/drm/xe/xe_device.c
> > +++ b/drivers/gpu/drm/xe/xe_device.c
> > @@ -934,10 +934,12 @@ void xe_device_shutdown(struct xe_device *xe)
> >   		xe_irq_suspend(xe);
> > +		xe_display_pm_shutdown_noirq(xe);
> > +
> >   		for_each_gt(gt, xe, id)
> >   			xe_gt_shutdown(gt);
> > -		xe_display_pm_shutdown_late(xe);
> > +		xe_display_pm_shutdown_noaccel(xe);
> From the xe point of view, it shouldn't matter whether we call the noirq
> part before or after gt shutdown. I like the integration into xe_device to
> be as simple as possible, so could we keep the single
> xe_display_pm_shutdown_late() call?

As I had told you offline I was seeing if we could have a naming in i915
more generic like shutdown, shutdown_late, shutdown_early...
However I didn't like that that much... From the i915/display side, the
names still matters... that function can only be called at shutdown when
there's no irq anymore...

And from the xe side, I'm still working towards make the xe_display only
a thin layer for checking xe.enable_display parameter and nothing else.

So I still pretty much prefer the _noirq and _noaccel naming...

> 
> Which reminds me to send out xe_display simplification once more to do the
> same for init..
> >   	} else {
> >   		/* BOOM! */
> >   		__xe_driver_flr(xe);
> Completely unrelated, do you happen to know if we need to call
> encoder_suspend/shutdown in the FLR path, whether it affects logic not on
> the chip itself?
> 
> Cheers,
> ~Maarten
>