diff options
| author |  Alex Deucher <alexander.deucher@amd.com>
| 2023-03-06 10:35:34 -0500 |
|---|---|---|
| committer | Alex Deucher <alexander.deucher@amd.com>
| 2023-03-09 22:06:19 -0500 |
| commit | 2915e43a033a778816fa4bc621f033576796521e (patch) | |
| tree | cde587ce2971e4a6a1e6d141a5023ae99c197ef2 | |
| parent | drm/amdgpu: fix error checking in amdgpu_read_mm_registers for soc15 (diff) | |
| download | linux-2915e43a033a778816fa4bc621f033576796521e.tar.gz linux-2915e43a033a778816fa4bc621f033576796521e.tar.bz2 linux-2915e43a033a778816fa4bc621f033576796521e.zip | |
drm/amdgpu: fix error checking in amdgpu_read_mm_registers for soc21
Properly skip non-existent registers as well.
Bug: https://gitlab.freedesktop.org/drm/amd/-/issues/2442
Reviewed-by: Hawking Zhang <Hawking.Zhang@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Cc: stable@vger.kernel.org
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/soc21.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/soc21.c b/drivers/gpu/drm/amd/amdgpu/soc21.c index 620f7409825d..9df2236007ab 100644 --- a/drivers/gpu/drm/amd/amdgpu/soc21.c +++ b/drivers/gpu/drm/amd/amdgpu/soc21.c @@ -291,9 +291,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, |