drm/amdgpu: skip sdma1 in nv_allowed_read_registers list for van gogh (v2)
authorHuang Rui <ray.huang@amd.com>
Fri, 28 Aug 2020 14:54:32 +0000 (22:54 +0800)
committerAlex Deucher <alexander.deucher@amd.com>
Mon, 5 Oct 2020 19:14:03 +0000 (15:14 -0400)
Van gogh only has one sdma.

v2: use num_instances rather than APU flag

Signed-off-by: Huang Rui <ray.huang@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
drivers/gpu/drm/amd/amdgpu/nv.c

index 622bcbb..1a15422 100644 (file)
@@ -254,7 +254,8 @@ static int nv_read_register(struct amdgpu_device *adev, u32 se_num,
        *value = 0;
        for (i = 0; i < ARRAY_SIZE(nv_allowed_read_registers); i++) {
                en = &nv_allowed_read_registers[i];
-               if (reg_offset !=
+               if ((i == 7 && (adev->sdma.num_instances == 1)) || /* some asics don't have SDMA1 */
+                   reg_offset !=
                    (adev->reg_offset[en->hwip][en->inst][en->seg] + en->reg_offset))
                        continue;