From: Xiaojian Du Date: Wed, 29 Dec 2021 07:03:11 +0000 (+0800) Subject: drm/amdgpu: handle asics with 1 SDMA instance X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=06aeb7533294d8a02383f2b248d04cd9a2731172;p=linux.git drm/amdgpu: handle asics with 1 SDMA instance This patch will handle asics with 1 SDMA instance. Signed-off-by: Xiaojian Du Reviewed-by: Huang Rui Reviewed-by: Alex Deucher Signed-off-by: Alex Deucher --- diff --git a/drivers/gpu/drm/amd/amdgpu/soc21.c b/drivers/gpu/drm/amd/amdgpu/soc21.c index 307a1da13557d..29acc5573f561 100644 --- a/drivers/gpu/drm/amd/amdgpu/soc21.c +++ b/drivers/gpu/drm/amd/amdgpu/soc21.c @@ -252,8 +252,9 @@ 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 (reg_offset != - (adev->reg_offset[en->hwip][en->inst][en->seg] + en->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; *value = soc21_get_register_value(adev,