diff options
| author |  Alex Deucher <alexander.deucher@amd.com>
| 2023-03-06 10:34:20 -0500 |
|---|---|---|
| committer | Alex Deucher <alexander.deucher@amd.com>
| 2023-03-09 22:06:19 -0500 |
| commit | 0dcdf8498eae2727bb33cef3576991dc841d4343 (patch) | |
| tree | d2b73401cbc69b7a08aef655d4a1e091d16c82e4 | |
| parent | drm/amdgpu: Fix the warning info when removing amdgpu device (diff) | |
| download | linux-0dcdf8498eae2727bb33cef3576991dc841d4343.tar.gz linux-0dcdf8498eae2727bb33cef3576991dc841d4343.tar.bz2 linux-0dcdf8498eae2727bb33cef3576991dc841d4343.zip | |
drm/amdgpu: fix error checking in amdgpu_read_mm_registers for soc15
Properly skip non-existent registers as well.
Bug: https://gitlab.freedesktop.org/drm/amd/-/issues/2442
Reviewed-by: Hawking Zhang <Hawking.Zhang@amd.com>
Reviewed-by: Evan Quan <evan.quan@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Cc: stable@vger.kernel.org
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/soc15.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/soc15.c b/drivers/gpu/drm/amd/amdgpu/soc15.c index 7cd17dda32ce..2eddd7f6cd41 100644 --- a/drivers/gpu/drm/amd/amdgpu/soc15.c +++ b/drivers/gpu/drm/amd/amdgpu/soc15.c @@ -439,8 +439,9 @@ static int soc15_read_register(struct amdgpu_device *adev, u32 se_num, *value = 0; for (i = 0; i < ARRAY_SIZE(soc15_allowed_read_registers); i++) { en = &soc15_allowed_read_registers[i]; - if (adev->reg_offset[en->hwip][en->inst] && - reg_offset != (adev->reg_offset[en->hwip][en->inst][en->seg] + 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; |