drm/amdgpu: Fix bugs in setting CP RB/MEC DOORBELL_RANGE registers
Subsystems (2)
PATCH 1/2 drm/amdgpu: Fix bugs in setting CP RB/MEC DOORBELL_RANGE registers
CP_RB_DOORBELL_RANGE_LOWER/UPPER and CP_MEC_DOORBELL_RANGE_LOWER/UPPER are used for waking up an idle scheduler and for power gating support. Usually the first few doorbells in pci doorbell bar are used for RB and all leftover for MEC. This patch fixes the incorrect settings.
Theoretically, gfx ring doorbells should come before all MEC doorbells to be consistent with the design. However, since the doorbell allocations are agreed by all and we are not free to change them, also considering the kernel MEC ring doorbells which are before gfx ring doorbells are not used often, we compromise by leaving the doorbell allocations unchanged.
--- drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c | 19 +++++++++++++++---- drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 19 ++++++++++++++----- 2 files changed, 29 insertions(+), 9 deletions(-)
drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c +15 -4
@@ -4223,8 +4223,8 @@ static void gfx_v8_0_set_cpg_door_bell(struct amdgpu_device *adev, struct amdgpu adev->doorbell_index.gfx_ring0);WREG32 (mmCP_RB_DOORBELL_RANGE_LOWER, tmp); -WREG32 (mmCP_RB_DOORBELL_RANGE_UPPER, -CP_RB_DOORBELL_RANGE_UPPER__DOORBELL_RANGE_UPPER_MASK ); +/* There is only one GFX queue */ +WREG32 (mmCP_RB_DOORBELL_RANGE_UPPER, tmp); }static int gfx_v8_0_cp_gfx_resume (struct amdgpu_device *adev)
@@ -4646,8 +4646,19 @@ static int gfx_v8_0_kcq_init_queue(struct amdgpu_ring *ring)static void gfx_v8_0_set_mec_doorbell_range (struct amdgpu_device *adev) {if (adev->asic_type >CHIP_TONGA ) { -WREG32 (mmCP_MEC_DOORBELL_RANGE_LOWER, adev->doorbell_index.kiq <<2 ); -WREG32 (mmCP_MEC_DOORBELL_RANGE_UPPER, adev->doorbell_index.mec_ring7 <<2 ); +/* The first few doorbells in pci doorbell bar are for GFX RB +* rings and all the leftover for MEC. +* So CP_MEC_DOORBELL_RANGE_LOWER should be set one index after +* CP_RB_DOORBELL_RANGE_UPPER, as we assume there is only one +* GFX RB rings. +*/ +u32 tmp =REG_SET_FIELD (0 ,CP_MEC_DOORBELL_RANGE_LOWER , +DOORBELL_RANGE_LOWER , + adev->gfx.gfx_ring[0 ].doorbell_index +1 ); + +WREG32 (mmCP_MEC_DOORBELL_RANGE_LOWER, tmp); +WREG32 (mmCP_MEC_DOORBELL_RANGE_UPPER, +CP_MEC_DOORBELL_RANGE_UPPER__DOORBELL_RANGE_UPPER_MASK ); }/* enable doorbells */ WREG32_FIELD (CP_PQ_STATUS ,DOORBELL_ENABLE ,1 );
drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c +14 -5
@@ -2631,8 +2631,8 @@ static int gfx_v9_0_cp_gfx_resume(struct amdgpu_device *adev) DOORBELL_RANGE_LOWER, ring->doorbell_index);WREG32_SOC15 (GC ,0 , mmCP_RB_DOORBELL_RANGE_LOWER, tmp); -WREG32_SOC15 (GC ,0 , mmCP_RB_DOORBELL_RANGE_UPPER, -CP_RB_DOORBELL_RANGE_UPPER__DOORBELL_RANGE_UPPER_MASK ); +/* There is only one GFX queue */ +WREG32_SOC15 (GC ,0 , mmCP_RB_DOORBELL_RANGE_UPPER, tmp);/* start the ring */
@@ -2995,10 +2995,19 @@ static int gfx_v9_0_kiq_init_register(struct amdgpu_ring *ring)/* enable the doorbell if requested */ if (ring->use_doorbell) { -WREG32_SOC15 (GC ,0 , mmCP_MEC_DOORBELL_RANGE_LOWER, - (adev->doorbell_index.kiq *2 ) <<2 ); +/* The first few doorbells in pci doorbell bar are for GFX RB +* rings and all the leftover for MEC. +* So CP_MEC_DOORBELL_RANGE_LOWER should be set one index after +* CP_RB_DOORBELL_RANGE_UPPER, as we assume there is only one +* GFX RB rings. +*/ +u32 tmp =REG_SET_FIELD (0 ,CP_MEC_DOORBELL_RANGE_LOWER , +DOORBELL_RANGE_LOWER , + adev->gfx.gfx_ring[0 ].doorbell_index +2 ); + +WREG32_SOC15 (GC ,0 , mmCP_MEC_DOORBELL_RANGE_LOWER, tmp);WREG32_SOC15 (GC ,0 , mmCP_MEC_DOORBELL_RANGE_UPPER, - (adev->doorbell_index.userqueue_end *2 ) <<2 ); +CP_MEC_DOORBELL_RANGE_UPPER__DOORBELL_RANGE_UPPER_MASK ); } WREG32_SOC15(GC, 0, mmCP_HQD_PQ_DOORBELL_CONTROL,
Signature · 6 lines
2.17.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
A message that is not in the archive (sent off-list or not yet received): [email protected]
PATCH 2/2 drm/amdgpu: Delete user queue doorbell variables
They are no longer used, so delete them to avoid confusion.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_doorbell.h | 8 -------- drivers/gpu/drm/amd/amdgpu/vega10_reg_init.c | 2 -- drivers/gpu/drm/amd/amdgpu/vega20_reg_init.c | 2 -- 3 files changed, 12 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_doorbell.h +0 -8
@@ -48,8 +48,6 @@ struct amdgpu_doorbell_index {uint32_t mec_ring5;uint32_t mec_ring6;uint32_t mec_ring7; -uint32_t userqueue_start; -uint32_t userqueue_end;uint32_t gfx_ring0;uint32_t sdma_engine[8 ];uint32_t ih;
@@ -112,8 +110,6 @@ typedef enum _AMDGPU_VEGA20_DOORBELL_ASSIGNMENTAMDGPU_VEGA20_DOORBELL_MEC_RING5 =0x008 ,AMDGPU_VEGA20_DOORBELL_MEC_RING6 =0x009 ,AMDGPU_VEGA20_DOORBELL_MEC_RING7 =0x00A , -AMDGPU_VEGA20_DOORBELL_USERQUEUE_START =0x00B , -AMDGPU_VEGA20_DOORBELL_USERQUEUE_END =0x08A ,AMDGPU_VEGA20_DOORBELL_GFX_RING0 =0x08B ,/* SDMA:256~335*/ AMDGPU_VEGA20_DOORBELL_sDMA_ENGINE0 = 0x100,
@@ -178,10 +174,6 @@ typedef enum _AMDGPU_DOORBELL64_ASSIGNMENTAMDGPU_DOORBELL64_MEC_RING6 =0x09 ,AMDGPU_DOORBELL64_MEC_RING7 =0x0a , -/* User queue doorbell range (128 doorbells) */ -AMDGPU_DOORBELL64_USERQUEUE_START =0x0b , -AMDGPU_DOORBELL64_USERQUEUE_END =0x8a , -/* Graphics engine */ AMDGPU_DOORBELL64_GFX_RING0 = 0x8b,
drivers/gpu/drm/amd/amdgpu/vega10_reg_init.c +0 -2
@@ -67,8 +67,6 @@ void vega10_doorbell_index_init(struct amdgpu_device *adev) adev->doorbell_index.mec_ring5 =AMDGPU_DOORBELL64_MEC_RING5 ; adev->doorbell_index.mec_ring6 =AMDGPU_DOORBELL64_MEC_RING6 ; adev->doorbell_index.mec_ring7 =AMDGPU_DOORBELL64_MEC_RING7 ; - adev->doorbell_index.userqueue_start =AMDGPU_DOORBELL64_USERQUEUE_START ; - adev->doorbell_index.userqueue_end =AMDGPU_DOORBELL64_USERQUEUE_END ; adev->doorbell_index.gfx_ring0 =AMDGPU_DOORBELL64_GFX_RING0 ; adev->doorbell_index.sdma_engine[0 ] = AMDGPU_DOORBELL64_sDMA_ENGINE0; adev->doorbell_index.sdma_engine[1 ] = AMDGPU_DOORBELL64_sDMA_ENGINE1;
drivers/gpu/drm/amd/amdgpu/vega20_reg_init.c +0 -2
@@ -65,8 +65,6 @@ void vega20_doorbell_index_init(struct amdgpu_device *adev) adev->doorbell_index.mec_ring5 =AMDGPU_VEGA20_DOORBELL_MEC_RING5 ; adev->doorbell_index.mec_ring6 =AMDGPU_VEGA20_DOORBELL_MEC_RING6 ; adev->doorbell_index.mec_ring7 =AMDGPU_VEGA20_DOORBELL_MEC_RING7 ; - adev->doorbell_index.userqueue_start =AMDGPU_VEGA20_DOORBELL_USERQUEUE_START ; - adev->doorbell_index.userqueue_end =AMDGPU_VEGA20_DOORBELL_USERQUEUE_END ; adev->doorbell_index.gfx_ring0 =AMDGPU_VEGA20_DOORBELL_GFX_RING0 ; adev->doorbell_index.sdma_engine[0 ] = AMDGPU_VEGA20_DOORBELL_sDMA_ENGINE0; adev->doorbell_index.sdma_engine[1 ] = AMDGPU_VEGA20_DOORBELL_sDMA_ENGINE1;
Signature · 6 lines
2.17.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
A message that is not in the archive (sent off-list or not yet received): [email protected]
Re: [PATCH 2/2] drm/amdgpu: Delete user queue doorbell variables
The series is Reviewed-by: Felix Kuehling <[email protected]>
Quoted 61 lines · Yong
They are no longer used, so delete them to avoid confusion.
Change-Id I3cf23fe7110ff88f53c0c279b2b4ec8d1a53b87cSigned-off-by Yong Zhao <[email protected]>--- drivers/gpu/drm/amd/amdgpu/amdgpu_doorbell.h | 8 -------- drivers/gpu/drm/amd/amdgpu/vega10_reg_init.c | 2 -- drivers/gpu/drm/amd/amdgpu/vega20_reg_init.c | 2 -- 3 files changed, 12 deletions(-)drivers/gpu/drm/amd/amdgpu/amdgpu_doorbell.h +0
-8@@ -48,8 +48,6 @@ struct amdgpu_doorbell_index {uint32_t mec_ring5;uint32_t mec_ring6;uint32_t mec_ring7; -uint32_t userqueue_start; -uint32_t userqueue_end;uint32_t gfx_ring0;uint32_t sdma_engine[8 ];uint32_t ih;@@ -112,8 +110,6 @@ typedef enum _AMDGPU_VEGA20_DOORBELL_ASSIGNMENTAMDGPU_VEGA20_DOORBELL_MEC_RING5 =0x008 ,AMDGPU_VEGA20_DOORBELL_MEC_RING6 =0x009 ,AMDGPU_VEGA20_DOORBELL_MEC_RING7 =0x00A , -AMDGPU_VEGA20_DOORBELL_USERQUEUE_START =0x00B , -AMDGPU_VEGA20_DOORBELL_USERQUEUE_END =0x08A ,AMDGPU_VEGA20_DOORBELL_GFX_RING0 =0x08B ,/* SDMA:256~335*/ AMDGPU_VEGA20_DOORBELL_sDMA_ENGINE0 = 0x100,@@ -178,10 +174,6 @@ typedef enum _AMDGPU_DOORBELL64_ASSIGNMENTAMDGPU_DOORBELL64_MEC_RING6 =0x09 ,AMDGPU_DOORBELL64_MEC_RING7 =0x0a , -/* User queue doorbell range (128 doorbells) */ -AMDGPU_DOORBELL64_USERQUEUE_START =0x0b , -AMDGPU_DOORBELL64_USERQUEUE_END =0x8a , -/* Graphics engine */ AMDGPU_DOORBELL64_GFX_RING0 = 0x8b,drivers/gpu/drm/amd/amdgpu/vega10_reg_init.c +0
-2@@ -67,8 +67,6 @@ void vega10_doorbell_index_init(struct amdgpu_device *adev) adev->doorbell_index.mec_ring5 =AMDGPU_DOORBELL64_MEC_RING5 ; adev->doorbell_index.mec_ring6 =AMDGPU_DOORBELL64_MEC_RING6 ; adev->doorbell_index.mec_ring7 =AMDGPU_DOORBELL64_MEC_RING7 ; - adev->doorbell_index.userqueue_start =AMDGPU_DOORBELL64_USERQUEUE_START ; - adev->doorbell_index.userqueue_end =AMDGPU_DOORBELL64_USERQUEUE_END ; adev->doorbell_index.gfx_ring0 =AMDGPU_DOORBELL64_GFX_RING0 ; adev->doorbell_index.sdma_engine[0 ] = AMDGPU_DOORBELL64_sDMA_ENGINE0; adev->doorbell_index.sdma_engine[1 ] = AMDGPU_DOORBELL64_sDMA_ENGINE1;drivers/gpu/drm/amd/amdgpu/vega20_reg_init.c +0
-0
drivers/gpu/drm/amd/amdgpu/vega20_reg_init.c void vega20_doorbell_index_init(struct amdgpu_device *adev) · line 70
Quoted 8 lines
drivers/gpu/drm/amd/amdgpu/vega20_reg_init.c +0
-2@@ -65,8 +65,6 @@ void vega20_doorbell_index_init(struct amdgpu_device *adev) adev->doorbell_index.mec_ring5 =AMDGPU_VEGA20_DOORBELL_MEC_RING5 ; adev->doorbell_index.mec_ring6 =AMDGPU_VEGA20_DOORBELL_MEC_RING6 ; adev->doorbell_index.mec_ring7 =AMDGPU_VEGA20_DOORBELL_MEC_RING7 ; - adev->doorbell_index.userqueue_start =AMDGPU_VEGA20_DOORBELL_USERQUEUE_START ; - adev->doorbell_index.userqueue_end =AMDGPU_VEGA20_DOORBELL_USERQUEUE_END ; adev->doorbell_index.gfx_ring0 =AMDGPU_VEGA20_DOORBELL_GFX_RING0 ; adev->doorbell_index.sdma_engine[0 ] = AMDGPU_VEGA20_DOORBELL_sDMA_ENGINE0; adev->doorbell_index.sdma_engine[1 ] = AMDGPU_VEGA20_DOORBELL_sDMA_ENGINE1;
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
A message that is not in the archive (sent off-list or not yet received): ddf8dff7-648b-b277-f9eb-374fe2520bf7-5C7GfCeVMHo@public.gmane.org
Re: [PATCH 2/2] drm/amdgpu: Delete user queue doorbell variables
Pushed. Thanks.
Yong
Quoted 64 lines · Felix
The series is Reviewed-by: Felix Kuehling <[email protected]>
Quoted 61 lines · Yong
They are no longer used, so delete them to avoid confusion.
Change-Id I3cf23fe7110ff88f53c0c279b2b4ec8d1a53b87cSigned-off-by Yong Zhao <[email protected]>--- drivers/gpu/drm/amd/amdgpu/amdgpu_doorbell.h | 8 -------- drivers/gpu/drm/amd/amdgpu/vega10_reg_init.c | 2 -- drivers/gpu/drm/amd/amdgpu/vega20_reg_init.c | 2 -- 3 files changed, 12 deletions(-)drivers/gpu/drm/amd/amdgpu/amdgpu_doorbell.h +0
-8@@ -48,8 +48,6 @@ struct amdgpu_doorbell_index {uint32_t mec_ring5;uint32_t mec_ring6;uint32_t mec_ring7; -uint32_t userqueue_start; -uint32_t userqueue_end;uint32_t gfx_ring0;uint32_t sdma_engine[8 ];uint32_t ih;@@ -112,8 +110,6 @@ typedef enum _AMDGPU_VEGA20_DOORBELL_ASSIGNMENTAMDGPU_VEGA20_DOORBELL_MEC_RING5 =0x008 ,AMDGPU_VEGA20_DOORBELL_MEC_RING6 =0x009 ,AMDGPU_VEGA20_DOORBELL_MEC_RING7 =0x00A , -AMDGPU_VEGA20_DOORBELL_USERQUEUE_START =0x00B , -AMDGPU_VEGA20_DOORBELL_USERQUEUE_END =0x08A ,AMDGPU_VEGA20_DOORBELL_GFX_RING0 =0x08B ,/* SDMA:256~335*/ AMDGPU_VEGA20_DOORBELL_sDMA_ENGINE0 = 0x100,@@ -178,10 +174,6 @@ typedef enum _AMDGPU_DOORBELL64_ASSIGNMENTAMDGPU_DOORBELL64_MEC_RING6 =0x09 ,AMDGPU_DOORBELL64_MEC_RING7 =0x0a , -/* User queue doorbell range (128 doorbells) */ -AMDGPU_DOORBELL64_USERQUEUE_START =0x0b , -AMDGPU_DOORBELL64_USERQUEUE_END =0x8a , -/* Graphics engine */ AMDGPU_DOORBELL64_GFX_RING0 = 0x8b,drivers/gpu/drm/amd/amdgpu/vega10_reg_init.c +0
-2@@ -67,8 +67,6 @@ void vega10_doorbell_index_init(struct amdgpu_device *adev) adev->doorbell_index.mec_ring5 =AMDGPU_DOORBELL64_MEC_RING5 ; adev->doorbell_index.mec_ring6 =AMDGPU_DOORBELL64_MEC_RING6 ; adev->doorbell_index.mec_ring7 =AMDGPU_DOORBELL64_MEC_RING7 ; - adev->doorbell_index.userqueue_start =AMDGPU_DOORBELL64_USERQUEUE_START ; - adev->doorbell_index.userqueue_end =AMDGPU_DOORBELL64_USERQUEUE_END ; adev->doorbell_index.gfx_ring0 =AMDGPU_DOORBELL64_GFX_RING0 ; adev->doorbell_index.sdma_engine[0 ] = AMDGPU_DOORBELL64_sDMA_ENGINE0; adev->doorbell_index.sdma_engine[1 ] = AMDGPU_DOORBELL64_sDMA_ENGINE1;drivers/gpu/drm/amd/amdgpu/vega20_reg_init.c +0
-0@@ -65,8 +65,6 @@ void vega20_doorbell_index_init(struct amdgpu_device *adev)
Quoted 8 lines
drivers/gpu/drm/amd/amdgpu/vega20_reg_init.c void vega20_doorbell_index_init(struct amdgpu_device *adev) · line 70
Quoted 8 lines
drivers/gpu/drm/amd/amdgpu/vega20_reg_init.c +0
-2adev->doorbell_index.mec_ring5 =AMDGPU_VEGA20_DOORBELL_MEC_RING5 ; adev->doorbell_index.mec_ring6 =AMDGPU_VEGA20_DOORBELL_MEC_RING6 ; adev->doorbell_index.mec_ring7 =AMDGPU_VEGA20_DOORBELL_MEC_RING7 ; - adev->doorbell_index.userqueue_start =AMDGPU_VEGA20_DOORBELL_USERQUEUE_START ; - adev->doorbell_index.userqueue_end =AMDGPU_VEGA20_DOORBELL_USERQUEUE_END ; adev->doorbell_index.gfx_ring0 =AMDGPU_VEGA20_DOORBELL_GFX_RING0 ; adev->doorbell_index.sdma_engine[0 ] = AMDGPU_VEGA20_DOORBELL_sDMA_ENGINE0; adev->doorbell_index.sdma_engine[1 ] = AMDGPU_VEGA20_DOORBELL_sDMA_ENGINE1;
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx