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

[Imre Deak <imre.deak@intel.com>]

On Tue, Sep 22, 2026 at 06:00:49PM +0300, Jani Nikula wrote:
> Move the intel_dmc_suspend() calls from i915 and xe suspend and shutdown
> hooks all the way down to a shared location in
> __intel_display_driver_pm_suspend().
> 
> This is a change in the suspend/shutdown sequences, but hopefully one
> without problems. The main change is moving intel_dmc_suspend() before
> irq suspend.
> 
> Signed-off-by: Jani Nikula <jani.nikula@intel.com>

Reviewed-by: Imre Deak <imre.deak@intel.com>

> ---
>  drivers/gpu/drm/i915/display/intel_display_driver.c | 2 ++
>  drivers/gpu/drm/i915/i915_driver.c                  | 4 ----
>  drivers/gpu/drm/xe/display/xe_display.c             | 4 ----
>  3 files changed, 2 insertions(+), 8 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/display/intel_display_driver.c b/drivers/gpu/drm/i915/display/intel_display_driver.c
> index 70d112fd4287..77009dca7d0d 100644
> --- a/drivers/gpu/drm/i915/display/intel_display_driver.c
> +++ b/drivers/gpu/drm/i915/display/intel_display_driver.c
> @@ -768,6 +768,8 @@ static int __intel_display_driver_pm_suspend(struct intel_display *display, bool
>  
>  	intel_encoder_suspend_all(display);
>  
> +	intel_dmc_suspend(display);
> +
>  	return ret;
>  }
>  
> diff --git a/drivers/gpu/drm/i915/i915_driver.c b/drivers/gpu/drm/i915/i915_driver.c
> index ce6d20958320..9e047c27a153 100644
> --- a/drivers/gpu/drm/i915/i915_driver.c
> +++ b/drivers/gpu/drm/i915/i915_driver.c
> @@ -1024,8 +1024,6 @@ void i915_driver_shutdown(struct drm_i915_private *i915)
>  
>  	intel_irq_suspend(i915);
>  
> -	intel_dmc_suspend(display);
> -
>  	i915_gem_suspend(i915);
>  
>  	/*
> @@ -1096,8 +1094,6 @@ static int i915_drm_suspend(struct drm_device *dev)
>  
>  	dev_priv->suspend_count++;
>  
> -	intel_dmc_suspend(display);
> -
>  	enable_rpm_wakeref_asserts(&dev_priv->runtime_pm);
>  
>  	i915_gem_drain_freed_objects(dev_priv);
> diff --git a/drivers/gpu/drm/xe/display/xe_display.c b/drivers/gpu/drm/xe/display/xe_display.c
> index 7b25c0814674..184a5a237880 100644
> --- a/drivers/gpu/drm/xe/display/xe_display.c
> +++ b/drivers/gpu/drm/xe/display/xe_display.c
> @@ -178,8 +178,6 @@ void xe_display_shutdown(struct xe_device *xe)
>  	intel_display_driver_shutdown(display);
>  
>  	intel_opregion_suspend(display, PCI_D3cold);
> -
> -	intel_dmc_suspend(display);
>  }
>  
>  void xe_display_shutdown_late(struct xe_device *xe)
> @@ -256,8 +254,6 @@ void xe_display_pm_suspend(struct xe_device *xe)
>  	intel_display_driver_pm_suspend(display);
>  
>  	intel_opregion_suspend(display, s2idle ? PCI_D1 : PCI_D3cold);
> -
> -	intel_dmc_suspend(display);
>  }
>  
>  void xe_display_pm_suspend_late(struct xe_device *xe)
> -- 
> 2.47.3
>