From: Borislav Petkov <bp@suse.de>
To: gregkh@linuxfoundation.org
Cc: alexander.deucher@amd.com, lijo.lazar@amd.com, stable@vger.kernel.org
Subject: Re: FAILED: patch "[PATCH] drm/amdgpu: Fix build with missing pm_suspend_target_state" failed to apply to 5.14-stable tree
Date: Thu, 16 Sep 2021 17:24:22 +0200 [thread overview]
Message-ID: <YUNhpvXi6NTCi31q@zn.tnic> (raw)
In-Reply-To: <163179759115270@kroah.com>
On Thu, Sep 16, 2021 at 03:06:31PM +0200, gregkh@linuxfoundation.org wrote:
>
> The patch below does not apply to the 5.14-stable tree.
> If someone wants it applied there, or to any other stable or longterm
> tree, then please email the backport, including the original git commit
> id to <stable@vger.kernel.org>.
>
> thanks,
>
> greg k-h
>
> ------------------ original commit in Linus's tree ------------------
>
> From a47f6a5806da4f24fbb66148a1519bf72fe060db Mon Sep 17 00:00:00 2001
> From: Borislav Petkov <bp@suse.de>
> Date: Tue, 24 Aug 2021 11:42:47 +0200
> Subject: [PATCH] drm/amdgpu: Fix build with missing pm_suspend_target_state
> module export
>
> Building a randconfig here triggered:
>
> ERROR: modpost: "pm_suspend_target_state" [drivers/gpu/drm/amd/amdgpu/amdgpu.ko] undefined!
>
> because the module export of that symbol happens in
> kernel/power/suspend.c which is enabled with CONFIG_SUSPEND.
>
> The ifdef guards in amdgpu_acpi_is_s0ix_supported(), however, test for
> CONFIG_PM_SLEEP which is defined like this:
>
> config PM_SLEEP
> def_bool y
> depends on SUSPEND || HIBERNATE_CALLBACKS
>
> and that randconfig has:
>
> # CONFIG_SUSPEND is not set
> CONFIG_HIBERNATE_CALLBACKS=y
>
> leading to the module export missing.
>
> Change the ifdeffery to depend directly on CONFIG_SUSPEND.
>
> Fixes: 5706cb3c910c ("drm/amdgpu: fix checking pmops when PM_SLEEP is not enabled")
Right, that Fixes tag points to a patch which is in:
$ git describe 5706cb3c910c
v5.14-rc3-28-g5706cb3c910c
and this here patch is in 5.14 (and trivially in 5.14-stable) already
too.
So I'm guessing that is a noop here.
Looking at lkml, you've queued that one for 5.13
Subject: [PATCH 5.13 027/113] drm/amdgpu: Fix build with missing pm_suspend_target_state module export
probably because the commit in Fixes was backported there too.
/me goes and checks...
Yap, it is:
commit 8330879408e590b0d576e2e65a0ced4d9ae804bb
Author: Randy Dunlap <rdunlap@infradead.org>
Date: Thu Jul 29 20:03:47 2021 -0700
drm/amdgpu: fix checking pmops when PM_SLEEP is not enabled
commit 5706cb3c910cc8283f344bc37a889a8d523a2c6d upstream.
Ok, all clear.
--
Regards/Gruss,
Boris.
SUSE Software Solutions Germany GmbH, GF: Felix Imendörffer, HRB 36809, AG Nürnberg
prev parent reply other threads:[~2021-09-16 15:24 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-09-16 13:06 FAILED: patch "[PATCH] drm/amdgpu: Fix build with missing pm_suspend_target_state" failed to apply to 5.14-stable tree gregkh
2021-09-16 15:24 ` Borislav Petkov [this message]
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=YUNhpvXi6NTCi31q@zn.tnic \
--to=bp@suse.de \
--cc=alexander.deucher@amd.com \
--cc=gregkh@linuxfoundation.org \
--cc=lijo.lazar@amd.com \
--cc=stable@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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