drm/amdgpu: correct SDMA3 IH clinet id for sienna_cichlid

Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git

kernel os linux

Signed-off-by: Likun Gao <Likun.Gao@amd.com>
Reviewed-by: Hawking Zhang <Hawking.Zhang@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

authored by

Likun Gao and committed by

Alex Deucher 5 years ago d682a353 157e72e8

+3 -2

2 changed files

expand all

drivers

gpu

drm

amd

amdgpu

sdma_v5_2.c

include

soc15_ih_clientid.h

+2 -2

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

··· 1166 1166 return r; 1167 1167 1168 1168 /* SDMA trap event */ 1169 - r = amdgpu_irq_add_id(adev, SOC15_IH_CLIENTID_SDMA3, 1169 + r = amdgpu_irq_add_id(adev, SOC15_IH_CLIENTID_SDMA3_Sienna_Cichlid, 1170 1170 SDMA3_5_0__SRCID__SDMA_TRAP, 1171 1171 &adev->sdma.trap_irq); 1172 1172 if (r) ··· 1408 1408 break; 1409 1409 } 1410 1410 break; 1411 - case SOC15_IH_CLIENTID_SDMA3: 1411 + case SOC15_IH_CLIENTID_SDMA3_Sienna_Cichlid: 1412 1412 switch (entry->ring_id) { 1413 1413 case 0: 1414 1414 amdgpu_fence_process(&adev->sdma.instance[3].ring);

drivers/gpu/drm/amd/include/soc15_ih_clientid.h

··· 66 66 SOC15_IH_CLIENTID_VCN1 = SOC15_IH_CLIENTID_UVD1, 67 67 SOC15_IH_CLIENTID_SDMA2 = SOC15_IH_CLIENTID_ACP, 68 68 SOC15_IH_CLIENTID_SDMA3 = SOC15_IH_CLIENTID_DCE, 69 + SOC15_IH_CLIENTID_SDMA3_Sienna_Cichlid = SOC15_IH_CLIENTID_ISP, 69 70 SOC15_IH_CLIENTID_SDMA4 = SOC15_IH_CLIENTID_ISP, 70 71 SOC15_IH_CLIENTID_SDMA5 = SOC15_IH_CLIENTID_VCE0, 71 72 SOC15_IH_CLIENTID_SDMA6 = SOC15_IH_CLIENTID_XDMA,