| From 5706cb3c910cc8283f344bc37a889a8d523a2c6d Mon Sep 17 00:00:00 2001 |
| From: Randy Dunlap <rdunlap@infradead.org> |
| Date: Thu, 29 Jul 2021 20:03:47 -0700 |
| Subject: drm/amdgpu: fix checking pmops when PM_SLEEP is not enabled |
| MIME-Version: 1.0 |
| Content-Type: text/plain; charset=UTF-8 |
| Content-Transfer-Encoding: 8bit |
| |
| From: Randy Dunlap <rdunlap@infradead.org> |
| |
| commit 5706cb3c910cc8283f344bc37a889a8d523a2c6d upstream. |
| |
| 'pm_suspend_target_state' is only available when CONFIG_PM_SLEEP |
| is set/enabled. OTOH, when both SUSPEND and HIBERNATION are not set, |
| PM_SLEEP is not set, so this variable cannot be used. |
| |
| ../drivers/gpu/drm/amd/amdgpu/amdgpu_acpi.c: In function ‘amdgpu_acpi_is_s0ix_active’: |
| ../drivers/gpu/drm/amd/amdgpu/amdgpu_acpi.c:1046:11: error: ‘pm_suspend_target_state’ undeclared (first use in this function); did you mean ‘__KSYM_pm_suspend_target_state’? |
| return pm_suspend_target_state == PM_SUSPEND_TO_IDLE; |
| ^~~~~~~~~~~~~~~~~~~~~~~ |
| __KSYM_pm_suspend_target_state |
| |
| Also use shorter IS_ENABLED(CONFIG_foo) notation for checking the |
| 2 config symbols. |
| |
| Fixes: 91e273712ab8dd ("drm/amdgpu: Check pmops for desired suspend state") |
| Signed-off-by: Randy Dunlap <rdunlap@infradead.org> |
| Cc: Alex Deucher <alexander.deucher@amd.com> |
| Cc: Christian König <christian.koenig@amd.com> |
| Cc: "Pan, Xinhui" <Xinhui.Pan@amd.com> |
| Cc: amd-gfx@lists.freedesktop.org |
| Cc: dri-devel@lists.freedesktop.org |
| Cc: linux-next@vger.kernel.org |
| Signed-off-by: Alex Deucher <alexander.deucher@amd.com> |
| Cc: stable@vger.kernel.org |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| --- |
| drivers/gpu/drm/amd/amdgpu/amdgpu_acpi.c | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| --- 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_devi |
| */ |
| bool amdgpu_acpi_is_s0ix_supported(struct amdgpu_device *adev) |
| { |
| -#if defined(CONFIG_AMD_PMC) || defined(CONFIG_AMD_PMC_MODULE) |
| +#if IS_ENABLED(CONFIG_AMD_PMC) && IS_ENABLED(CONFIG_PM_SLEEP) |
| 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; |
