From: Jiri Slaby <jirislaby@kernel.org>
To: Greg KH <gregkh@linuxfoundation.org>,
Alex Deucher <alexander.deucher@amd.com>
Cc: stable@vger.kernel.org, sashal@kernel.org
Subject: Re: [PATCH] drm/amdgpu: fix backport of commit 73dae652dcac
Date: Thu, 2 Jan 2025 09:52:33 +0100 [thread overview]
Message-ID: <252d24ea-0ad6-4278-8d90-1540a02557a4@kernel.org> (raw)
In-Reply-To: <2024122742-chili-unvarying-2e32@gregkh>
On 27. 12. 24, 8:50, Greg KH wrote:
> On Fri, Dec 27, 2024 at 02:37:00AM -0500, Alex Deucher wrote:
>> Commit 73dae652dcac ("drm/amdgpu: rework resume handling for display (v2)")
>> missed a small code change when it was backported resulting in an automatic
>> backlight control breakage. Fix the backport.
>>
>> Note that this patch is not in Linus' tree as it is not required there;
>> the bug was introduced in the backport.
>>
>> Fixes: 99a02eab8251 ("drm/amdgpu: rework resume handling for display (v2)")
>> Closes: https://gitlab.freedesktop.org/drm/amd/-/issues/3853
>> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
>> Cc: stable@vger.kernel.org # 6.11.x
>
> So the 6.12.y backport is ok? What exact trees is this fix for?
IMO all trees which received 73dae652dcac are broken. All the backports
call "adev->ip_blocks[i].version->funcs->resume()" and not
"amdgpu_ip_block_resume()" (as in upstream). Incl. 6.12.
And there is a bug report for 6.12 here too:
https://bugzilla.suse.com/show_bug.cgi?id=1234782
$ git grep -A8 'stat.*amdgpu_device_ip_resume_phase3'
> releases/5.15.174/drm-amdgpu-rework-resume-handling-for-display-v2.patch:+static int amdgpu_device_ip_resume_phase3(struct amdgpu_device *adev)
> releases/5.15.174/drm-amdgpu-rework-resume-handling-for-display-v2.patch-+{
> releases/5.15.174/drm-amdgpu-rework-resume-handling-for-display-v2.patch-+ int i, r;
> releases/5.15.174/drm-amdgpu-rework-resume-handling-for-display-v2.patch-+
> releases/5.15.174/drm-amdgpu-rework-resume-handling-for-display-v2.patch-+ for (i = 0; i < adev->num_ip_blocks; i++) {
> releases/5.15.174/drm-amdgpu-rework-resume-handling-for-display-v2.patch-+ if (!adev->ip_blocks[i].status.valid || adev->ip_blocks[i].status.hw)
> releases/5.15.174/drm-amdgpu-rework-resume-handling-for-display-v2.patch-+ continue;
> releases/5.15.174/drm-amdgpu-rework-resume-handling-for-display-v2.patch-+ if (adev->ip_blocks[i].version->type == AMD_IP_BLOCK_TYPE_DCE) {
> releases/5.15.174/drm-amdgpu-rework-resume-handling-for-display-v2.patch-+ r = adev->ip_blocks[i].version->funcs->resume(adev);
> --
> releases/6.1.120/drm-amdgpu-rework-resume-handling-for-display-v2.patch:+static int amdgpu_device_ip_resume_phase3(struct amdgpu_device *adev)
> releases/6.1.120/drm-amdgpu-rework-resume-handling-for-display-v2.patch-+{
> releases/6.1.120/drm-amdgpu-rework-resume-handling-for-display-v2.patch-+ int i, r;
> releases/6.1.120/drm-amdgpu-rework-resume-handling-for-display-v2.patch-+
> releases/6.1.120/drm-amdgpu-rework-resume-handling-for-display-v2.patch-+ for (i = 0; i < adev->num_ip_blocks; i++) {
> releases/6.1.120/drm-amdgpu-rework-resume-handling-for-display-v2.patch-+ if (!adev->ip_blocks[i].status.valid || adev->ip_blocks[i].status.hw)
> releases/6.1.120/drm-amdgpu-rework-resume-handling-for-display-v2.patch-+ continue;
> releases/6.1.120/drm-amdgpu-rework-resume-handling-for-display-v2.patch-+ if (adev->ip_blocks[i].version->type == AMD_IP_BLOCK_TYPE_DCE) {
> releases/6.1.120/drm-amdgpu-rework-resume-handling-for-display-v2.patch-+ r = adev->ip_blocks[i].version->funcs->resume(adev);
> --
> releases/6.12.5/drm-amdgpu-rework-resume-handling-for-display-v2.patch:+static int amdgpu_device_ip_resume_phase3(struct amdgpu_device *adev)
> releases/6.12.5/drm-amdgpu-rework-resume-handling-for-display-v2.patch-+{
> releases/6.12.5/drm-amdgpu-rework-resume-handling-for-display-v2.patch-+ int i, r;
> releases/6.12.5/drm-amdgpu-rework-resume-handling-for-display-v2.patch-+
> releases/6.12.5/drm-amdgpu-rework-resume-handling-for-display-v2.patch-+ for (i = 0; i < adev->num_ip_blocks; i++) {
> releases/6.12.5/drm-amdgpu-rework-resume-handling-for-display-v2.patch-+ if (!adev->ip_blocks[i].status.valid || adev->ip_blocks[i].status.hw)
> releases/6.12.5/drm-amdgpu-rework-resume-handling-for-display-v2.patch-+ continue;
> releases/6.12.5/drm-amdgpu-rework-resume-handling-for-display-v2.patch-+ if (adev->ip_blocks[i].version->type == AMD_IP_BLOCK_TYPE_DCE) {
> releases/6.12.5/drm-amdgpu-rework-resume-handling-for-display-v2.patch-+ r = adev->ip_blocks[i].version->funcs->resume(adev);
> --
> releases/6.6.66/drm-amdgpu-rework-resume-handling-for-display-v2.patch:+static int amdgpu_device_ip_resume_phase3(struct amdgpu_device *adev)
> releases/6.6.66/drm-amdgpu-rework-resume-handling-for-display-v2.patch-+{
> releases/6.6.66/drm-amdgpu-rework-resume-handling-for-display-v2.patch-+ int i, r;
> releases/6.6.66/drm-amdgpu-rework-resume-handling-for-display-v2.patch-+
> releases/6.6.66/drm-amdgpu-rework-resume-handling-for-display-v2.patch-+ for (i = 0; i < adev->num_ip_blocks; i++) {
> releases/6.6.66/drm-amdgpu-rework-resume-handling-for-display-v2.patch-+ if (!adev->ip_blocks[i].status.valid || adev->ip_blocks[i].status.hw)
> releases/6.6.66/drm-amdgpu-rework-resume-handling-for-display-v2.patch-+ continue;
> releases/6.6.66/drm-amdgpu-rework-resume-handling-for-display-v2.patch-+ if (adev->ip_blocks[i].version->type == AMD_IP_BLOCK_TYPE_DCE) {
> releases/6.6.66/drm-amdgpu-rework-resume-handling-for-display-v2.patch-+ r = adev->ip_blocks[i].version->funcs->resume(adev);
thanks,
--
js
suse labs
next prev parent reply other threads:[~2025-01-02 8:52 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-12-27 7:37 [PATCH] drm/amdgpu: fix backport of commit 73dae652dcac Alex Deucher
2024-12-27 7:50 ` Greg KH
2025-01-02 8:52 ` Jiri Slaby [this message]
2025-01-02 18:08 ` Deucher, Alexander
2025-01-03 14:40 ` Greg KH
2025-01-09 18:21 ` Deucher, Alexander
2025-01-12 16:50 ` Salvatore Bonaccorso
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=252d24ea-0ad6-4278-8d90-1540a02557a4@kernel.org \
--to=jirislaby@kernel.org \
--cc=alexander.deucher@amd.com \
--cc=gregkh@linuxfoundation.org \
--cc=sashal@kernel.org \
--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