TWxSoftware/twx-linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

drm/amdgpu: assign the doorbell index for sdma on non-AID0

Browse Source 
Allocate new sdma doorbell index for the instances only on AID1 for now.

Todo: there's limitation that SDMA doorbell index on SDMA 4.4.2 needs to be
less than 0x1FF, so the tail part in _AMDGPU_VEGA20_DOORBELL_ASSIGNMENT is not
enough to store sdma doorbell range on maximum 4 AIDs if doorbell_range is 20.
So it looks better to create a new doorbell index assignment table for 4.4.2.

v2: change "(x << 1) + 2" to "(x + 1) << 1" for readability.

Signed-off-by: Le Ma <le.ma@amd.com>
Acked-by: Felix Kuehling <Felix.Kuehling@amd.com>
Reviewed-by: Lijo Lazar <lijo.lazar@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
This commit is contained in:
Le Ma
2022-03-01 19:42:29 +08:00
committed by Alex Deucher
parent f786b1d4ec
commit 2a47a2d90e
2 changed files with 21 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
drivers/gpu/drm/amd/amdgpu/amdgpu_doorbell.h
+5 -1
View File
@@ -85,6 +85,7 @@ struct amdgpu_doorbell_index {
uint32_t last_non_cp; uint32_t last_non_cp;
uint32_t xcc1_kiq_start; uint32_t xcc1_kiq_start;
uint32_t xcc1_mec_ring0_start; uint32_t xcc1_mec_ring0_start;
uint32_t aid1_sdma_start;
uint32_t max_assignment; uint32_t max_assignment;
/* Per engine SDMA doorbell size in dword */ /* Per engine SDMA doorbell size in dword */
uint32_t sdma_doorbell_range; uint32_t sdma_doorbell_range;
@@ -171,7 +172,10 @@ typedef enum _AMDGPU_VEGA20_DOORBELL_ASSIGNMENT
/* 8 compute rings per GC. Max to 0x1CE */ /* 8 compute rings per GC. Max to 0x1CE */
AMDGPU_VEGA20_DOORBELL_XCC1_MEC_RING0_START = 0x197, AMDGPU_VEGA20_DOORBELL_XCC1_MEC_RING0_START = 0x197,
AMDGPU_VEGA20_DOORBELL_MAX_ASSIGNMENT = 0x1CE, /* AID1 SDMA: 0x1D0 ~ 0x1F7 */
AMDGPU_VEGA20_DOORBELL_AID1_sDMA_START = 0x1D0,
AMDGPU_VEGA20_DOORBELL_MAX_ASSIGNMENT = 0x1F7,
AMDGPU_VEGA20_DOORBELL_INVALID = 0xFFFF AMDGPU_VEGA20_DOORBELL_INVALID = 0xFFFF
} AMDGPU_VEGA20_DOORBELL_ASSIGNMENT; } AMDGPU_VEGA20_DOORBELL_ASSIGNMENT;
drivers/gpu/drm/amd/amdgpu/sdma_v4_4_2.c
+16 -2
View File
@@ -1310,7 +1310,14 @@ static int sdma_v4_4_2_sw_init(void *handle)
ring->use_doorbell?"true":"false"); ring->use_doorbell?"true":"false");
/* doorbell size is 2 dwords, get DWORD offset */ /* doorbell size is 2 dwords, get DWORD offset */
ring->doorbell_index = adev->doorbell_index.sdma_engine[i] << 1; if (aid_id > 0)
ring->doorbell_index =
(adev->doorbell_index.aid1_sdma_start << 1)
+ adev->doorbell_index.sdma_doorbell_range
* (i - adev->sdma.num_inst_per_aid);
else
ring->doorbell_index =
adev->doorbell_index.sdma_engine[i] << 1;
ring->vm_hub = AMDGPU_MMHUB0(aid_id); ring->vm_hub = AMDGPU_MMHUB0(aid_id);
sprintf(ring->name, "sdma%d.%d", aid_id, sprintf(ring->name, "sdma%d.%d", aid_id,
@@ -1329,7 +1336,14 @@ static int sdma_v4_4_2_sw_init(void *handle)
/* doorbell index of page queue is assigned right after /* doorbell index of page queue is assigned right after
* gfx queue on the same instance * gfx queue on the same instance
*/ */
ring->doorbell_index = (adev->doorbell_index.sdma_engine[i] + 1) << 1; if (aid_id > 0)
ring->doorbell_index =
((adev->doorbell_index.aid1_sdma_start + 1) << 1)
+ adev->doorbell_index.sdma_doorbell_range
* (i - adev->sdma.num_inst_per_aid);
else
ring->doorbell_index =
(adev->doorbell_index.sdma_engine[i] + 1) << 1;
ring->vm_hub = AMDGPU_MMHUB0(aid_id); ring->vm_hub = AMDGPU_MMHUB0(aid_id);
sprintf(ring->name, "page%d.%d", aid_id, sprintf(ring->name, "page%d.%d", aid_id,