From: Huang Rui Date: Fri, 28 Aug 2020 14:54:32 +0000 (+0800) Subject: drm/amdgpu: skip sdma1 in nv_allowed_read_registers list for van gogh (v2) X-Git-Tag: io_uring-5.11-2020-12-23~116^2~12^2~428 X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=fced3c3a4655a55db34b2729007dee554e4c2306;p=linux-block.git drm/amdgpu: skip sdma1 in nv_allowed_read_registers list for van gogh (v2) Van gogh only has one sdma. v2: use num_instances rather than APU flag Signed-off-by: Huang Rui Signed-off-by: Alex Deucher --- diff --git a/drivers/gpu/drm/amd/amdgpu/nv.c b/drivers/gpu/drm/amd/amdgpu/nv.c index 622bcbb56e17..1a15422d3afd 100644 --- a/drivers/gpu/drm/amd/amdgpu/nv.c +++ b/drivers/gpu/drm/amd/amdgpu/nv.c @@ -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;