[PATCH v2 1/2] drm/xe/display: Match i915 driver suspend/resume sequences better

Shankar, Uma uma.shankar at intel.com
Tue Aug 13 16:32:21 UTC 2024


> -----Original Message-----
> From: Intel-xe <intel-xe-bounces at lists.freedesktop.org> On Behalf Of Maarten
> Lankhorst
> Sent: Tuesday, August 6, 2024 4:21 PM
> To: intel-xe at lists.freedesktop.org
> Cc: Maarten Lankhorst <maarten.lankhorst at linux.intel.com>; Deak, Imre
> <imre.deak at intel.com>
> Subject: [PATCH v2 1/2] drm/xe/display: Match i915 driver suspend/resume
> sequences better
> 
> Suspend fbdev sooner, and disable user access before suspending to prevent
> some races. I've noticed this when comparing xe suspend to i915's.
> 
> Matches the following commits from i915:
> 24b412b1bfeb ("drm/i915: Disable intel HPD poll after DRM poll init/enable")
> 1ef28d86bea9 ("drm/i915: Suspend the framebuffer console earlier during system
> suspend")
> bd738d859e71 ("drm/i915: Prevent modesets during driver init/shutdown")
> 
> Thanks to Imre for pointing me to those commits.
> 
> Driver shutdown is currently missing, but I have some idea how to implement it
> next.

There will be some cleanup needed to avoid duplication in i915 and xe, as highlighted
by Imre and Jani as well. But that can be taken up as a separate series.

Changes in this patch looks good and matches the behaviour of i915 wrt to suspend/resume
init/de-init flows.

Reviewed-by: Uma Shankar <uma.shankar at intel.com>

> Signed-off-by: Maarten Lankhorst <maarten.lankhorst at linux.intel.com>
> Cc: Imre Deak <imre.deak at intel.com>
> ---
>  drivers/gpu/drm/xe/display/xe_display.c | 19 ++++++++++++++-----
>  1 file changed, 14 insertions(+), 5 deletions(-)
> 
> diff --git a/drivers/gpu/drm/xe/display/xe_display.c
> b/drivers/gpu/drm/xe/display/xe_display.c
> index ca4468c820788..d544d18ad1ecc 100644
> --- a/drivers/gpu/drm/xe/display/xe_display.c
> +++ b/drivers/gpu/drm/xe/display/xe_display.c
> @@ -294,8 +294,11 @@ void xe_display_pm_suspend(struct xe_device *xe, bool
> runtime)
>  	 * properly.
>  	 */
>  	intel_power_domains_disable(xe);
> -	if (has_display(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);
> +	}
> 
>  	if (!runtime)
>  		intel_display_driver_suspend(xe);
> @@ -304,12 +307,13 @@ void xe_display_pm_suspend(struct xe_device *xe,
> bool runtime)
> 
>  	intel_hpd_cancel_work(xe);
> 
> +	if (has_display(xe))
> +		intel_display_driver_suspend_access(xe);
> +
>  	intel_encoder_suspend_all(&xe->display);
> 
>  	intel_opregion_suspend(xe, s2idle ? PCI_D1 : PCI_D3cold);
> 
> -	intel_fbdev_set_suspend(&xe->drm, FBINFO_STATE_SUSPENDED, true);
> -
>  	intel_dmc_suspend(xe);
>  }
> 
> @@ -347,14 +351,19 @@ void xe_display_pm_resume(struct xe_device *xe, bool
> runtime)
>  	intel_display_driver_init_hw(xe);
>  	intel_hpd_init(xe);
> 
> +	if (has_display(xe))
> +		intel_display_driver_resume_access(xe);
> +
>  	/* MST sideband requires HPD interrupts enabled */
>  	intel_dp_mst_resume(xe);
>  	if (!runtime)
>  		intel_display_driver_resume(xe);
> 
> -	intel_hpd_poll_disable(xe);
> -	if (has_display(xe))
> +	if (has_display(xe)) {
>  		drm_kms_helper_poll_enable(&xe->drm);
> +		intel_display_driver_enable_user_access(xe);
> +	}
> +	intel_hpd_poll_disable(xe);
> 
>  	intel_opregion_resume(xe);
> 
> --
> 2.45.2



More information about the Intel-xe mailing list