drm/amdgpu: add CSDMA reg offsets for NBIO v7.7.0
Subsystems (2)
Alex Deucher
maintainerPATCH 1/2 drm/amdgpu: add CSDMA reg offsets for NBIO v7.7.0
From: Xiaojian Du <[email protected]>
This patch will add CSDMA reg offsets for NBIO v7.7.0
Signed-off-by Xiaojian Du <[email protected]>
Acked-by Roman Li <[email protected]>
Acked-by Alex Deucher <[email protected]>
Signed-off-by Alex Deucher <[email protected]>
--- .../drm/amd/include/asic_reg/nbio/nbio_7_7_0_offset.h | 4 ++++ .../drm/amd/include/asic_reg/nbio/nbio_7_7_0_sh_mask.h | 10 ++++++++++ 2 files changed, 14 insertions(+)
drivers/gpu/drm/amd/include/asic_reg/nbio/nbio_7_7_0_offset.h +4 -0
@@ -4005,6 +4005,8 @@#define regGDC0_BIF_VCN0_DOORBELL_RANGE_BASE_IDX 3#define regGDC0_BIF_RLC_DOORBELL_RANGE 0x4f0af5#define regGDC0_BIF_RLC_DOORBELL_RANGE_BASE_IDX 3 +#define regGDC0_BIF_CSDMA_DOORBELL_RANGE 0x4f0afb +#define regGDC0_BIF_CSDMA_DOORBELL_RANGE_BASE_IDX 3#define regGDC0_ATDMA_MISC_CNTL 0x4f0afd#define regGDC0_ATDMA_MISC_CNTL_BASE_IDX 3#define regGDC0_BIF_DOORBELL_FENCE_CNTL 0x4f0afe
@@ -21535,6 +21537,8 @@#define regGDC1_BIF_SDMA4_DOORBELL_RANGE_BASE_IDX 5#define regGDC1_BIF_SDMA5_DOORBELL_RANGE 0x2ffc0efa#define regGDC1_BIF_SDMA5_DOORBELL_RANGE_BASE_IDX 5 +#define regGDC1_BIF_CSDMA_DOORBELL_RANGE 0x2ffc0efb +#define regGDC1_BIF_CSDMA_DOORBELL_RANGE_BASE_IDX 5#define regGDC1_ATDMA_MISC_CNTL 0x2ffc0efd#define regGDC1_ATDMA_MISC_CNTL_BASE_IDX 5#define regGDC1_BIF_DOORBELL_FENCE_CNTL 0x2ffc0efe
drivers/gpu/drm/amd/include/asic_reg/nbio/nbio_7_7_0_sh_mask.h +10 -0
@@ -31641,6 +31641,11 @@#define GDC0_BIF_RLC_DOORBELL_RANGE__SIZE__SHIFT 0x10#define GDC0_BIF_RLC_DOORBELL_RANGE__OFFSET_MASK 0x00000FFCL#define GDC0_BIF_RLC_DOORBELL_RANGE__SIZE_MASK 0x001F0000L +//GDC0_BIF_CSDMA_DOORBELL_RANGE +#define GDC0_BIF_CSDMA_DOORBELL_RANGE__OFFSET__SHIFT 0x2 +#define GDC0_BIF_CSDMA_DOORBELL_RANGE__SIZE__SHIFT 0x10 +#define GDC0_BIF_CSDMA_DOORBELL_RANGE__OFFSET_MASK 0x00000FFCL +#define GDC0_BIF_CSDMA_DOORBELL_RANGE__SIZE_MASK 0x00FF0000L//GDC0_ATDMA_MISC_CNTL #define GDC0_ATDMA_MISC_CNTL__WRR_ARB_MODE__SHIFT 0x0#define GDC0_ATDMA_MISC_CNTL__ATDMA_MISC_CNTL_INSERT_RD_ON_2ND_WDAT_EN__SHIFT 0x1
@@ -119765,6 +119770,11 @@#define GDC1_BIF_SDMA5_DOORBELL_RANGE__SIZE__SHIFT 0x10#define GDC1_BIF_SDMA5_DOORBELL_RANGE__OFFSET_MASK 0x00000FFCL#define GDC1_BIF_SDMA5_DOORBELL_RANGE__SIZE_MASK 0x001F0000L +//GDC1_BIF_CSDMA_DOORBELL_RANGE +#define GDC1_BIF_CSDMA_DOORBELL_RANGE__OFFSET__SHIFT 0x2 +#define GDC1_BIF_CSDMA_DOORBELL_RANGE__SIZE__SHIFT 0x10 +#define GDC1_BIF_CSDMA_DOORBELL_RANGE__OFFSET_MASK 0x00000FFCL +#define GDC1_BIF_CSDMA_DOORBELL_RANGE__SIZE_MASK 0x00FF0000L//GDC1_ATDMA_MISC_CNTL #define GDC1_ATDMA_MISC_CNTL__WRR_ARB_MODE__SHIFT 0x0#define GDC1_ATDMA_MISC_CNTL__ATDMA_MISC_CNTL_INSERT_RD_ON_2ND_WDAT_EN__SHIFT 0x1
Signature · 1 line
2.35.3
Alex Deucher
maintainerPATCH 2/2 drm/amdgpu: fix sdma doorbell issue on SDMA v6.0 and NBIO v7.7
From: Xiaojian Du <[email protected]>
This patch will fix sdma doorbell issue on SDMA v6.0 and NBIO v7.7.0. NBIO v7.7.0 uses a new reg function -- Common SDMA to allow a common doorbell range for all SDMA queues, this is different to the old NBIO version. This patch will add configuration for CSDMA and enable SDMA doorbell function.
Signed-off-by Xiaojian Du <[email protected]>
Reviewed-by Tim Huang <[email protected]>
Reviewed-by Huang Rui <[email protected]>
Signed-off-by Alex Deucher <[email protected]>
--- drivers/gpu/drm/amd/amdgpu/nbio_v7_7.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/amdgpu/nbio_v7_7.c +7 -1
@@ -58,10 +58,16 @@ static void nbio_v7_7_sdma_doorbell_range(struct amdgpu_device *adev, int instan bool use_doorbell, int doorbell_index, int doorbell_size) { - u32 reg = SOC15_REG_OFFSET(NBIO, 0, regGDC0_BIF_SDMA0_DOORBELL_RANGE); + u32 reg = SOC15_REG_OFFSET(NBIO, 0, regGDC0_BIF_CSDMA_DOORBELL_RANGE);u32 doorbell_range =RREG32_PCIE_PORT (reg);if (use_doorbell) { + doorbell_range =REG_SET_FIELD (doorbell_range, +GDC0_BIF_CSDMA_DOORBELL_RANGE , +OFFSET , doorbell_index); + doorbell_range =REG_SET_FIELD (doorbell_range, +GDC0_BIF_CSDMA_DOORBELL_RANGE , +SIZE , doorbell_size); doorbell_range =REG_SET_FIELD (doorbell_range,GDC0_BIF_SDMA0_DOORBELL_RANGE ,OFFSET , doorbell_index);
Signature · 1 line
2.35.3