commit: 3cf56bf62e9b8a9005ad379ab3937218be338191 Author: Mike Pagano <mpagano <AT> gentoo <DOT> org> AuthorDate: Mon Jan 6 23:28:32 2025 +0000 Commit: Mike Pagano <mpagano <AT> gentoo <DOT> org> CommitDate: Mon Jan 6 23:28:32 2025 +0000 URL: https://gitweb.gentoo.org/proj/linux-patches.git/commit/?id=3cf56bf6
drm/amdgpu: fix backport of commit 73dae652dcac Bug: https://bugs.gentoo.org/947639 Signed-off-by: Mike Pagano <mpagano <AT> gentoo.org> 0000_README | 4 +++ 2710_drm-amdgpu-resume-handling-rework.patch | 42 ++++++++++++++++++++++++++++ 2 files changed, 46 insertions(+) diff --git a/0000_README b/0000_README index e4ba5e82..d03d6cf7 100644 --- a/0000_README +++ b/0000_README @@ -355,6 +355,10 @@ Patch: 2700_ASoC_max98388_correct_includes.patch From: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/patch/sound/soc/codecs/max98388.c?id=832beb640e425b5d1a92d8c2002e6b8e0af693eb Desc: ASoC: max98388: Correct the includes +Patch: 2710_drm-amdgpu-resume-handling-rework.patch +From: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git +Desc: drm/amdgpu: fix backport of commit 73dae652dcac + Patch: 2800_amdgpu-Adj-kmalloc-array-calls-for-new-Walloc-size.patch From: [email protected] Desc: amdgpu: Adjust kmalloc_array calls for new -Walloc-size diff --git a/2710_drm-amdgpu-resume-handling-rework.patch b/2710_drm-amdgpu-resume-handling-rework.patch new file mode 100644 index 00000000..a4dde6d8 --- /dev/null +++ b/2710_drm-amdgpu-resume-handling-rework.patch @@ -0,0 +1,42 @@ +From 6f300b3e29b20f23dffb0e046853e560a8e3da00 Mon Sep 17 00:00:00 2001 +From: Alex Deucher <[email protected]> +Date: Fri, 27 Dec 2024 02:37:00 -0500 +Subject: drm/amdgpu: fix backport of commit 73dae652dcac + +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 <[email protected]> +Cc: [email protected] # 6.11.x +Signed-off-by: Greg Kroah-Hartman <[email protected]> +--- + drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +index 51904906545e59..45e28726e148e9 100644 +--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c ++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +@@ -3721,8 +3721,12 @@ static int amdgpu_device_ip_resume_phase3(struct amdgpu_device *adev) + continue; + if (adev->ip_blocks[i].version->type == AMD_IP_BLOCK_TYPE_DCE) { + r = adev->ip_blocks[i].version->funcs->resume(adev); +- if (r) ++ if (r) { ++ DRM_ERROR("resume of IP block <%s> failed %d\n", ++ adev->ip_blocks[i].version->funcs->name, r); + return r; ++ } ++ adev->ip_blocks[i].status.hw = true; + } + } + +-- +cgit 1.2.3-korg +
