From: Greg Kroah-Hartman <gregkh@linuxfoundation•org>
To: linux-kernel@vger•kernel.org
Cc: "Greg Kroah-Hartman" <gregkh@linuxfoundation•org>,
stable@vger•kernel.org, "Randy Dunlap" <rdunlap@infradead•org>,
"Alex Deucher" <alexander.deucher@amd•com>,
"Christian König" <christian.koenig@amd•com>,
"Pan, Xinhui" <Xinhui.Pan@amd•com>,
amd-gfx@lists•freedesktop.org, dri-devel@lists•freedesktop.org,
linux-next@vger•kernel.org
Subject: [PATCH 5.13 081/175] drm/amdgpu: fix checking pmops when PM_SLEEP is not enabled
Date: Tue, 10 Aug 2021 19:29:49 +0200 [thread overview]
Message-ID: <20210810173003.613302353@linuxfoundation.org> (raw)
In-Reply-To: <20210810173000.928681411@linuxfoundation.org>
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;
parent reply other threads:[~2021-08-10 18:00 UTC|newest]
Thread overview: expand[flat|nested] mbox.gz Atom feed
[parent not found: <20210810173000.928681411@linuxfoundation.org>]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210810173003.613302353@linuxfoundation.org \
--to=gregkh@linuxfoundation$(echo .)org \
--cc=Xinhui.Pan@amd$(echo .)com \
--cc=alexander.deucher@amd$(echo .)com \
--cc=amd-gfx@lists$(echo .)freedesktop.org \
--cc=christian.koenig@amd$(echo .)com \
--cc=dri-devel@lists$(echo .)freedesktop.org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=rdunlap@infradead$(echo .)org \
--cc=stable@vger$(echo .)kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox