[Intel-xe] [PATCH v2 1/1] drm/xe/display: Use acpi_target_system_state only if ACPI_SLEEP is enabled

[Rodrigo Vivi]

On Tue, Sep 05, 2023 at 07:49:42PM +0000, Francois Dugast wrote:
> This fixes the build error below with CONFIG_ACPI_SLEEP=n:
> 
> 	drivers/gpu/drm/xe/xe_display.c:334:23: error: implicit declaration of function ‘acpi_target_system_state’; did you mean ‘acpi_get_system_info’? [-Werror=implicit-function-declaration]
> 	  334 |         bool s2idle = acpi_target_system_state() < ACPI_STATE_S3;
> 
> Signed-off-by: Francois Dugast <francois.dugast at intel.com>

Reviewed-by: Rodrigo Vivi <rodrigo.vivi at intel.com>

> ---
>  drivers/gpu/drm/xe/xe_display.c | 13 +++++++++++--
>  1 file changed, 11 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/gpu/drm/xe/xe_display.c b/drivers/gpu/drm/xe/xe_display.c
> index b6b547c4877c..a453946ad108 100644
> --- a/drivers/gpu/drm/xe/xe_display.c
> +++ b/drivers/gpu/drm/xe/xe_display.c
> @@ -329,9 +329,18 @@ static void intel_suspend_encoders(struct xe_device *xe)
>  	drm_modeset_unlock_all(dev);
>  }
>  
> +static bool suspend_to_idle(void)
> +{
> +#if IS_ENABLED(CONFIG_ACPI_SLEEP)
> +	if (acpi_target_system_state() < ACPI_STATE_S3)
> +		return true;
> +#endif
> +	return false;
> +}
> +
>  void xe_display_pm_suspend(struct xe_device *xe)
>  {
> -	bool s2idle = acpi_target_system_state() < ACPI_STATE_S3;
> +	bool s2idle = suspend_to_idle();
>  	if (!xe->info.enable_display)
>  		return;
>  
> @@ -360,7 +369,7 @@ void xe_display_pm_suspend(struct xe_device *xe)
>  
>  void xe_display_pm_suspend_late(struct xe_device *xe)
>  {
> -	bool s2idle = acpi_target_system_state() < ACPI_STATE_S3;
> +	bool s2idle = suspend_to_idle();
>  	if (!xe->info.enable_display)
>  		return;
>  
> -- 
> 2.34.1
>