diff options
| author | Le Ma <le.ma@amd.com> | 2022-08-24 12:41:47 +0300 |
|---|---|---|
| committer | Alex Deucher <alexander.deucher@amd.com> | 2023-06-09 16:46:34 +0300 |
| commit | 58bd8023752f3d7e6888d5cbb27387853b04c431 (patch) | |
| tree | bbff94d605fd4bfc15c030fc383562c57ebbd6d9 /drivers/gpu/drm/amd/amdgpu/nbio_v7_9.c | |
| parent | d6e924ad85a0cebc9e39eb956a23386ce32cc9f9 (diff) | |
| download | linux-58bd8023752f3d7e6888d5cbb27387853b04c431.tar.xz | |
drm/amdgpu: adjust s2a entry register for sdma doorbell trans decoding
Use s2a entry 5/6 registers to decode sdma doorbell trans on different AIDs,
which aligns the entry table in SHUB spec, and leave entry 4 dedicated for VCN
doorbell to avoid conflict.
Signed-off-by: Le Ma <le.ma@amd.com>
Reviewed-by: Hawking Zhang <Hawking.Zhang@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/nbio_v7_9.c')
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/nbio_v7_9.c | 32 |
1 files changed, 8 insertions, 24 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/nbio_v7_9.c b/drivers/gpu/drm/amd/amdgpu/nbio_v7_9.c index ef0b557e9b3e..5dbab8ab9b27 100644 --- a/drivers/gpu/drm/amd/amdgpu/nbio_v7_9.c +++ b/drivers/gpu/drm/amd/amdgpu/nbio_v7_9.c @@ -151,18 +151,10 @@ static void nbio_v7_9_sdma_doorbell_range(struct amdgpu_device *adev, int instan S2A_DOORBELL_ENTRY_1_CTRL, S2A_DOORBELL_PORT1_AWADDR_31_28_VALUE, 0x8); - if (aid_id != 0) - WREG32_PCIE_EXT((SOC15_REG_OFFSET(NBIO, 0, - regS2A_DOORBELL_ENTRY_3_CTRL) - + S2A_DOORBELL_REG_LSD_OFFSET) * 4 - + AMDGPU_SMN_TARGET_AID(aid_id) - + AMDGPU_SMN_CROSS_AID * !!aid_id, - doorbell_ctrl); - else - WREG32(SOC15_REG_OFFSET(NBIO, 0, - regS2A_DOORBELL_ENTRY_5_CTRL) - + S2A_DOORBELL_REG_LSD_OFFSET, - doorbell_ctrl); + WREG32_PCIE_EXT(SOC15_REG_OFFSET(NBIO, 0, regS2A_DOORBELL_ENTRY_5_CTRL) * 4 + + AMDGPU_SMN_TARGET_AID(aid_id) + + AMDGPU_SMN_CROSS_AID * !!aid_id, + doorbell_ctrl); break; case 3: WREG32(SOC15_REG_OFFSET(NBIO, 0, regDOORBELL0_CTRL_ENTRY_4) + @@ -178,18 +170,10 @@ static void nbio_v7_9_sdma_doorbell_range(struct amdgpu_device *adev, int instan S2A_DOORBELL_ENTRY_1_CTRL, S2A_DOORBELL_PORT1_AWADDR_31_28_VALUE, 0x9); - if (aid_id != 0) - WREG32_PCIE_EXT((SOC15_REG_OFFSET(NBIO, 0, - regS2A_DOORBELL_ENTRY_4_CTRL) - + S2A_DOORBELL_REG_LSD_OFFSET) * 4 - + AMDGPU_SMN_TARGET_AID(aid_id) - + AMDGPU_SMN_CROSS_AID * !!aid_id, - doorbell_ctrl); - else - WREG32(SOC15_REG_OFFSET(NBIO, 0, - regS2A_DOORBELL_ENTRY_6_CTRL) - + S2A_DOORBELL_REG_LSD_OFFSET, - doorbell_ctrl); + WREG32_PCIE_EXT(SOC15_REG_OFFSET(NBIO, 0, regS2A_DOORBELL_ENTRY_6_CTRL) * 4 + + AMDGPU_SMN_TARGET_AID(aid_id) + + AMDGPU_SMN_CROSS_AID * !!aid_id, + doorbell_ctrl); break; default: break; |