ACK: [PATCH][Hirsute/linux-aws] UBUNTU SAUCE: aws: Check for CONFIG_SUSPEND in amdgpu_acpi_is_s0ix_supported()

[Marcelo Henrique Cerri]

Acked-by: Marcelo Henrique Cerri <marcelo.cerri at canonical.com>

On Wed, Sep 08, 2021 at 12:31:39PM -0600, Tim Gardner wrote:
> BugLink: https://bugs.launchpad.net/bugs/1943070
> 
> linux-aws is the only amd64 flavour that has CONFIG_SUSPEND=n. See LP: #1732512
> and LP: #1898087 for details. A recent stable update introduced this build config
> incompatibility. Fix it by also checking for CONFIG_SUSPEND.
> 
> Signed-off-by: Tim Gardner <tim.gardner at canonical.com>
> ---
>  drivers/gpu/drm/amd/amdgpu/amdgpu_acpi.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_acpi.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_acpi.c
> index b53eab384adb..dba00f73fd83 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_acpi.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_acpi.c
> @@ -904,7 +904,7 @@ void amdgpu_acpi_fini(struct amdgpu_device *adev)
>   */
>  bool amdgpu_acpi_is_s0ix_supported(struct amdgpu_device *adev)
>  {
> -#if IS_ENABLED(CONFIG_AMD_PMC) && IS_ENABLED(CONFIG_PM_SLEEP)
> +#if IS_ENABLED(CONFIG_AMD_PMC) && IS_ENABLED(CONFIG_PM_SLEEP) && IS_ENABLED(CONFIG_SUSPEND)
>  	if (acpi_gbl_FADT.flags & ACPI_FADT_LOW_POWER_S0) {
>  		if (adev->flags & AMD_IS_APU)
>  			return pm_suspend_target_state == PM_SUSPEND_TO_IDLE;
> -- 
> 2.33.0
> 
> 
> -- 
> kernel-team mailing list
> kernel-team at lists.ubuntu.com
> https://lists.ubuntu.com/mailman/listinfo/kernel-team

-- 
Regards,
Marcelo

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 659 bytes
Desc: not available
URL: <https://lists.ubuntu.com/archives/kernel-team/attachments/20210908/940b6dbc/attachment.sig>