From: Alex Deucher Date: Mon, 6 Mar 2023 15:35:34 +0000 (-0500) Subject: drm/amdgpu: fix error checking in amdgpu_read_mm_registers for soc21 X-Git-Tag: v6.1.20~129 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=a11e210dc595a8b7259335a9d7c7b57cc8f39bd4;p=users%2Fdwmw2%2Flinux.git drm/amdgpu: fix error checking in amdgpu_read_mm_registers for soc21 commit 2915e43a033a778816fa4bc621f033576796521e upstream. Properly skip non-existent registers as well. Bug: https://gitlab.freedesktop.org/drm/amd/-/issues/2442 Reviewed-by: Hawking Zhang Signed-off-by: Alex Deucher Cc: stable@vger.kernel.org Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/gpu/drm/amd/amdgpu/soc21.c b/drivers/gpu/drm/amd/amdgpu/soc21.c index 230e15fed755c..00df439ed493d 100644 --- 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 amdgpu_device *adev, u32 se_num, *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,