Skip to content

Commit b42fee5

Browse files
committed
drm/amdgpu: fix error checking in amdgpu_read_mm_registers for nv
Properly skip non-existent registers as well. Bug: https://gitlab.freedesktop.org/drm/amd/-/issues/2442 Reviewed-by: Hawking Zhang <[email protected]> Signed-off-by: Alex Deucher <[email protected]> Cc: [email protected]
1 parent 2915e43 commit b42fee5

File tree

1 file changed

+4
-3
lines changed
  • drivers/gpu/drm/amd/amdgpu

1 file changed

+4
-3
lines changed

drivers/gpu/drm/amd/amdgpu/nv.c

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -444,9 +444,10 @@ static int nv_read_register(struct amdgpu_device *adev, u32 se_num,
444444
*value = 0;
445445
for (i = 0; i < ARRAY_SIZE(nv_allowed_read_registers); i++) {
446446
en = &nv_allowed_read_registers[i];
447-
if (adev->reg_offset[en->hwip][en->inst] &&
448-
reg_offset != (adev->reg_offset[en->hwip][en->inst][en->seg]
449-
+ en->reg_offset))
447+
if (!adev->reg_offset[en->hwip][en->inst])
448+
continue;
449+
else if (reg_offset != (adev->reg_offset[en->hwip][en->inst][en->seg]
450+
+ en->reg_offset))
450451
continue;
451452

452453
*value = nv_get_register_value(adev,

0 commit comments

Comments
 (0)