This is a note to let you know that I've just added the patch titled
drm/amdgpu: fix error checking in amdgpu_read_mm_registers for soc21
to the 6.1-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
drm-amdgpu-fix-error-checking-in-amdgpu_read_mm_registers-for-soc21.patch
and it can be found in the queue-6.1 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From 2915e43a033a778816fa4bc621f033576796521e Mon Sep 17 00:00:00 2001
From: Alex Deucher <alexander.deucher@xxxxxxx>
Date: Mon, 6 Mar 2023 10:35:34 -0500
Subject: drm/amdgpu: fix error checking in amdgpu_read_mm_registers for soc21
From: Alex Deucher <alexander.deucher@xxxxxxx>
commit 2915e43a033a778816fa4bc621f033576796521e upstream.
Properly skip non-existent registers as well.
Bug: https://gitlab.freedesktop.org/drm/amd/-/issues/2442
Reviewed-by: Hawking Zhang <Hawking.Zhang@xxxxxxx>
Signed-off-by: Alex Deucher <alexander.deucher@xxxxxxx>
Cc: stable@xxxxxxxxxxxxxxx
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
drivers/gpu/drm/amd/amdgpu/soc21.c | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
--- a/drivers/gpu/drm/amd/amdgpu/soc21.c
+++ b/drivers/gpu/drm/amd/amdgpu/soc21.c
@@ -254,9 +254,10 @@ static int soc21_read_register(struct am
*value = 0;
for (i = 0; i < ARRAY_SIZE(soc21_allowed_read_registers); i++) {
en = &soc21_allowed_read_registers[i];
- if (adev->reg_offset[en->hwip][en->inst] &&
- reg_offset != (adev->reg_offset[en->hwip][en->inst][en->seg]
- + en->reg_offset))
+ if (!adev->reg_offset[en->hwip][en->inst])
+ continue;
+ else if (reg_offset != (adev->reg_offset[en->hwip][en->inst][en->seg]
+ + en->reg_offset))
continue;
*value = soc21_get_register_value(adev,
Patches currently in stable-queue which might be from alexander.deucher@xxxxxxx are
queue-6.1/drm-connector-print-max_requested_bpc-in-state-debugfs.patch
queue-6.1/drm-display-don-t-block-hdr_output_metadata-on-unknown-eotf.patch
queue-6.1/drm-amdgpu-fix-error-checking-in-amdgpu_read_mm_registers-for-soc15.patch
queue-6.1/drm-amdgpu-fix-error-checking-in-amdgpu_read_mm_registers-for-soc21.patch
queue-6.1/drm-amdgpu-fix-error-checking-in-amdgpu_read_mm_registers-for-nv.patch
