Various simply cleanups to GFX9
Subsystems (2)
No real functional changes just code style improvements and cleanups.
_______________________________________________
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 1/14 drm/amd/amdgpu: Tidy up register list formatting.
--- drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 96 +++++++++++++++++++++++------------ 1 file changed, 64 insertions(+), 32 deletions(-)
drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c +64 -32
@@ -66,38 +66,70 @@ MODULE_FIRMWARE("amdgpu/raven_rlc.bin");static const struct amdgpu_gds_reg_offset amdgpu_gds_reg_offset[] = { - {SOC15_REG_OFFSET (GC ,0 , mmGDS_VMID0_BASE),SOC15_REG_OFFSET (GC ,0 , mmGDS_VMID0_SIZE), -SOC15_REG_OFFSET (GC ,0 , mmGDS_GWS_VMID0),SOC15_REG_OFFSET (GC ,0 , mmGDS_OA_VMID0)}, - {SOC15_REG_OFFSET (GC ,0 , mmGDS_VMID1_BASE),SOC15_REG_OFFSET (GC ,0 , mmGDS_VMID1_SIZE), -SOC15_REG_OFFSET (GC ,0 , mmGDS_GWS_VMID1),SOC15_REG_OFFSET (GC ,0 , mmGDS_OA_VMID1)}, - {SOC15_REG_OFFSET (GC ,0 , mmGDS_VMID2_BASE),SOC15_REG_OFFSET (GC ,0 , mmGDS_VMID2_SIZE), -SOC15_REG_OFFSET (GC ,0 , mmGDS_GWS_VMID2),SOC15_REG_OFFSET (GC ,0 , mmGDS_OA_VMID2)}, - {SOC15_REG_OFFSET (GC ,0 , mmGDS_VMID3_BASE),SOC15_REG_OFFSET (GC ,0 , mmGDS_VMID3_SIZE), -SOC15_REG_OFFSET (GC ,0 , mmGDS_GWS_VMID3),SOC15_REG_OFFSET (GC ,0 , mmGDS_OA_VMID3)}, - {SOC15_REG_OFFSET (GC ,0 , mmGDS_VMID4_BASE),SOC15_REG_OFFSET (GC ,0 , mmGDS_VMID4_SIZE), -SOC15_REG_OFFSET (GC ,0 , mmGDS_GWS_VMID4),SOC15_REG_OFFSET (GC ,0 , mmGDS_OA_VMID4)}, - {SOC15_REG_OFFSET (GC ,0 , mmGDS_VMID5_BASE),SOC15_REG_OFFSET (GC ,0 , mmGDS_VMID5_SIZE), -SOC15_REG_OFFSET (GC ,0 , mmGDS_GWS_VMID5),SOC15_REG_OFFSET (GC ,0 , mmGDS_OA_VMID5)}, - {SOC15_REG_OFFSET (GC ,0 , mmGDS_VMID6_BASE),SOC15_REG_OFFSET (GC ,0 , mmGDS_VMID6_SIZE), -SOC15_REG_OFFSET (GC ,0 , mmGDS_GWS_VMID6),SOC15_REG_OFFSET (GC ,0 , mmGDS_OA_VMID6)}, - {SOC15_REG_OFFSET (GC ,0 , mmGDS_VMID7_BASE),SOC15_REG_OFFSET (GC ,0 , mmGDS_VMID7_SIZE), -SOC15_REG_OFFSET (GC ,0 , mmGDS_GWS_VMID7),SOC15_REG_OFFSET (GC ,0 , mmGDS_OA_VMID7)}, - {SOC15_REG_OFFSET (GC ,0 , mmGDS_VMID8_BASE),SOC15_REG_OFFSET (GC ,0 , mmGDS_VMID8_SIZE), -SOC15_REG_OFFSET (GC ,0 , mmGDS_GWS_VMID8),SOC15_REG_OFFSET (GC ,0 , mmGDS_OA_VMID8)}, - {SOC15_REG_OFFSET (GC ,0 , mmGDS_VMID9_BASE),SOC15_REG_OFFSET (GC ,0 , mmGDS_VMID9_SIZE), -SOC15_REG_OFFSET (GC ,0 , mmGDS_GWS_VMID9),SOC15_REG_OFFSET (GC ,0 , mmGDS_OA_VMID9)}, - {SOC15_REG_OFFSET (GC ,0 , mmGDS_VMID10_BASE),SOC15_REG_OFFSET (GC ,0 , mmGDS_VMID10_SIZE), -SOC15_REG_OFFSET (GC ,0 , mmGDS_GWS_VMID10),SOC15_REG_OFFSET (GC ,0 , mmGDS_OA_VMID10)}, - {SOC15_REG_OFFSET (GC ,0 , mmGDS_VMID11_BASE),SOC15_REG_OFFSET (GC ,0 , mmGDS_VMID11_SIZE), -SOC15_REG_OFFSET (GC ,0 , mmGDS_GWS_VMID11),SOC15_REG_OFFSET (GC ,0 , mmGDS_OA_VMID11)}, - {SOC15_REG_OFFSET (GC ,0 , mmGDS_VMID12_BASE),SOC15_REG_OFFSET (GC ,0 , mmGDS_VMID12_SIZE), -SOC15_REG_OFFSET (GC ,0 , mmGDS_GWS_VMID12),SOC15_REG_OFFSET (GC ,0 , mmGDS_OA_VMID12)}, - {SOC15_REG_OFFSET (GC ,0 , mmGDS_VMID13_BASE),SOC15_REG_OFFSET (GC ,0 , mmGDS_VMID13_SIZE), -SOC15_REG_OFFSET (GC ,0 , mmGDS_GWS_VMID13),SOC15_REG_OFFSET (GC ,0 , mmGDS_OA_VMID13)}, - {SOC15_REG_OFFSET (GC ,0 , mmGDS_VMID14_BASE),SOC15_REG_OFFSET (GC ,0 , mmGDS_VMID14_SIZE), -SOC15_REG_OFFSET (GC ,0 , mmGDS_GWS_VMID14),SOC15_REG_OFFSET (GC ,0 , mmGDS_OA_VMID14)}, - {SOC15_REG_OFFSET (GC ,0 , mmGDS_VMID15_BASE),SOC15_REG_OFFSET (GC ,0 , mmGDS_VMID15_SIZE), -SOC15_REG_OFFSET (GC ,0 , mmGDS_GWS_VMID15),SOC15_REG_OFFSET (GC ,0 , mmGDS_OA_VMID15)} + {SOC15_REG_OFFSET (GC ,0 , mmGDS_VMID0_BASE), +SOC15_REG_OFFSET (GC ,0 , mmGDS_VMID0_SIZE), +SOC15_REG_OFFSET (GC ,0 , mmGDS_GWS_VMID0), +SOC15_REG_OFFSET (GC ,0 , mmGDS_OA_VMID0) }, + {SOC15_REG_OFFSET (GC ,0 , mmGDS_VMID1_BASE), +SOC15_REG_OFFSET (GC ,0 , mmGDS_VMID1_SIZE), +SOC15_REG_OFFSET (GC ,0 , mmGDS_GWS_VMID1), +SOC15_REG_OFFSET (GC ,0 , mmGDS_OA_VMID1) }, + {SOC15_REG_OFFSET (GC ,0 , mmGDS_VMID2_BASE), +SOC15_REG_OFFSET (GC ,0 , mmGDS_VMID2_SIZE), +SOC15_REG_OFFSET (GC ,0 , mmGDS_GWS_VMID2), +SOC15_REG_OFFSET (GC ,0 , mmGDS_OA_VMID2) }, + {SOC15_REG_OFFSET (GC ,0 , mmGDS_VMID3_BASE), +SOC15_REG_OFFSET (GC ,0 , mmGDS_VMID3_SIZE), +SOC15_REG_OFFSET (GC ,0 , mmGDS_GWS_VMID3), +SOC15_REG_OFFSET (GC ,0 , mmGDS_OA_VMID3) }, + {SOC15_REG_OFFSET (GC ,0 , mmGDS_VMID4_BASE), +SOC15_REG_OFFSET (GC ,0 , mmGDS_VMID4_SIZE), +SOC15_REG_OFFSET (GC ,0 , mmGDS_GWS_VMID4), +SOC15_REG_OFFSET (GC ,0 , mmGDS_OA_VMID4) }, + {SOC15_REG_OFFSET (GC ,0 , mmGDS_VMID5_BASE), +SOC15_REG_OFFSET (GC ,0 , mmGDS_VMID5_SIZE), +SOC15_REG_OFFSET (GC ,0 , mmGDS_GWS_VMID5), +SOC15_REG_OFFSET (GC ,0 , mmGDS_OA_VMID5) }, + {SOC15_REG_OFFSET (GC ,0 , mmGDS_VMID6_BASE), +SOC15_REG_OFFSET (GC ,0 , mmGDS_VMID6_SIZE), +SOC15_REG_OFFSET (GC ,0 , mmGDS_GWS_VMID6), +SOC15_REG_OFFSET (GC ,0 , mmGDS_OA_VMID6) }, + {SOC15_REG_OFFSET (GC ,0 , mmGDS_VMID7_BASE), +SOC15_REG_OFFSET (GC ,0 , mmGDS_VMID7_SIZE), +SOC15_REG_OFFSET (GC ,0 , mmGDS_GWS_VMID7), +SOC15_REG_OFFSET (GC ,0 , mmGDS_OA_VMID7) }, + {SOC15_REG_OFFSET (GC ,0 , mmGDS_VMID8_BASE), +SOC15_REG_OFFSET (GC ,0 , mmGDS_VMID8_SIZE), +SOC15_REG_OFFSET (GC ,0 , mmGDS_GWS_VMID8), +SOC15_REG_OFFSET (GC ,0 , mmGDS_OA_VMID8) }, + {SOC15_REG_OFFSET (GC ,0 , mmGDS_VMID9_BASE), +SOC15_REG_OFFSET (GC ,0 , mmGDS_VMID9_SIZE), +SOC15_REG_OFFSET (GC ,0 , mmGDS_GWS_VMID9), +SOC15_REG_OFFSET (GC ,0 , mmGDS_OA_VMID9) }, + {SOC15_REG_OFFSET (GC ,0 , mmGDS_VMID10_BASE), +SOC15_REG_OFFSET (GC ,0 , mmGDS_VMID10_SIZE), +SOC15_REG_OFFSET (GC ,0 , mmGDS_GWS_VMID10), +SOC15_REG_OFFSET (GC ,0 , mmGDS_OA_VMID10) }, + {SOC15_REG_OFFSET (GC ,0 , mmGDS_VMID11_BASE), +SOC15_REG_OFFSET (GC ,0 , mmGDS_VMID11_SIZE), +SOC15_REG_OFFSET (GC ,0 , mmGDS_GWS_VMID11), +SOC15_REG_OFFSET (GC ,0 , mmGDS_OA_VMID11) }, + {SOC15_REG_OFFSET (GC ,0 , mmGDS_VMID12_BASE), +SOC15_REG_OFFSET (GC ,0 , mmGDS_VMID12_SIZE), +SOC15_REG_OFFSET (GC ,0 , mmGDS_GWS_VMID12), +SOC15_REG_OFFSET (GC ,0 , mmGDS_OA_VMID12)}, + {SOC15_REG_OFFSET (GC ,0 , mmGDS_VMID13_BASE), +SOC15_REG_OFFSET (GC ,0 , mmGDS_VMID13_SIZE), +SOC15_REG_OFFSET (GC ,0 , mmGDS_GWS_VMID13), +SOC15_REG_OFFSET (GC ,0 , mmGDS_OA_VMID13) }, + {SOC15_REG_OFFSET (GC ,0 , mmGDS_VMID14_BASE), +SOC15_REG_OFFSET (GC ,0 , mmGDS_VMID14_SIZE), +SOC15_REG_OFFSET (GC ,0 , mmGDS_GWS_VMID14), +SOC15_REG_OFFSET (GC ,0 , mmGDS_OA_VMID14) }, + {SOC15_REG_OFFSET (GC ,0 , mmGDS_VMID15_BASE), +SOC15_REG_OFFSET (GC ,0 , mmGDS_VMID15_SIZE), +SOC15_REG_OFFSET (GC ,0 , mmGDS_GWS_VMID15), +SOC15_REG_OFFSET (GC ,0 , mmGDS_OA_VMID15) } }; static const u32 golden_settings_gc_9_0[] =
Signature · 6 lines
2.12.0 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 2/14 drm/amd/amdgpu: Tidy up gfx_v9_0_ngg_en()
In reply to a message not in the archive--- drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 26 +++++++++----------------- 1 file changed, 9 insertions(+), 17 deletions(-)
drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c +9 -17
@@ -1152,30 +1152,22 @@ static int gfx_v9_0_ngg_en(struct amdgpu_device *adev) {struct amdgpu_ring *ring = &adev->gfx.gfx_ring[0 ];int r; -u32 data; -u32 size; -u32 base; +u32 data, base;if (!amdgpu_ngg)return 0 ;/* Program buffer size */ - data =0 ; - size = adev->gfx.ngg.buf[NGG_PRIM ].size /256 ; - data =REG_SET_FIELD (data,WD_BUF_RESOURCE_1 ,INDEX_BUF_SIZE , size); - - size = adev->gfx.ngg.buf[NGG_POS ].size /256 ; - data =REG_SET_FIELD (data,WD_BUF_RESOURCE_1 ,POS_BUF_SIZE , size); - + data =REG_SET_FIELD (0 ,WD_BUF_RESOURCE_1 ,INDEX_BUF_SIZE , + adev->gfx.ngg.buf[NGG_PRIM ].size >>8 ); + data =REG_SET_FIELD (data,WD_BUF_RESOURCE_1 ,POS_BUF_SIZE , + adev->gfx.ngg.buf[NGG_POS ].size >>8 );WREG32_SOC15 (GC ,0 , mmWD_BUF_RESOURCE_1, data); - data =0 ; - size = adev->gfx.ngg.buf[NGG_CNTL ].size /256 ; - data =REG_SET_FIELD (data,WD_BUF_RESOURCE_2 ,CNTL_SB_BUF_SIZE , size); - - size = adev->gfx.ngg.buf[NGG_PARAM ].size /1024 ; - data =REG_SET_FIELD (data,WD_BUF_RESOURCE_2 ,PARAM_BUF_SIZE , size); - + data =REG_SET_FIELD (0 ,WD_BUF_RESOURCE_2 ,CNTL_SB_BUF_SIZE , + adev->gfx.ngg.buf[NGG_CNTL ].size >>8 ); + data =REG_SET_FIELD (data,WD_BUF_RESOURCE_2 ,PARAM_BUF_SIZE , + adev->gfx.ngg.buf[NGG_PARAM ].size >>10 );WREG32_SOC15 (GC ,0 , mmWD_BUF_RESOURCE_2, data);/* Program buffer base address */
Signature · 6 lines
2.12.0 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 3/14 drm/amd/amdgpu: Tidy up gfx_v9_0_gpu_init()
In reply to a message not in the archive--- drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-)
drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c +3 -10
@@ -1531,13 +1531,11 @@ static void gfx_v9_0_init_compute_vmid(struct amdgpu_device *adev)static void gfx_v9_0_gpu_init (struct amdgpu_device *adev) { -u32 tmp;int i;WREG32_FIELD15 (GC ,0 ,GRBM_CNTL ,READ_TIMEOUT ,0xff );gfx_v9_0_tiling_mode_table_init (adev); -gfx_v9_0_setup_rb (adev);gfx_v9_0_get_cu_info (adev, &adev->gfx.cu_info);
@@ -1547,25 +1545,21 @@ static void gfx_v9_0_gpu_init(struct amdgpu_device *adev)for (i =0 ; i <16 ; i++) {soc15_grbm_select (adev,0 ,0 ,0 , i);/* CP and shaders */ - tmp =0 ; - tmp =REG_SET_FIELD (tmp,SH_MEM_CONFIG ,ALIGNMENT_MODE , -SH_MEM_ALIGNMENT_MODE_UNALIGNED ); -WREG32_SOC15 (GC ,0 , mmSH_MEM_CONFIG, tmp); +WREG32_FIELD15 (GC ,0 ,SH_MEM_CONFIG ,ALIGNMENT_MODE , +SH_MEM_ALIGNMENT_MODE_UNALIGNED );WREG32_SOC15 (GC ,0 , mmSH_MEM_BASES,0 ); }soc15_grbm_select (adev,0 ,0 ,0 ,0 ); -mutex_unlock (&adev->srbm_mutex);gfx_v9_0_init_compute_vmid (adev); -mutex_lock (&adev->grbm_idx_mutex);/* * making sure that the following register writes will be broadcasted * to all the shaders */ +mutex_lock (&adev->grbm_idx_mutex);gfx_v9_0_select_se_sh (adev,0xffffffff ,0xffffffff ,0xffffffff ); - WREG32_SOC15(GC, 0, mmPA_SC_FIFO_SIZE, (adev->gfx.config.sc_prim_fifo_size_frontend << PA_SC_FIFO_SIZE__SC_FRONTEND_PRIM_FIFO_SIZE__SHIFT) |
@@ -1576,7 +1570,6 @@ static void gfx_v9_0_gpu_init(struct amdgpu_device *adev) (adev->gfx.config.sc_earlyz_tile_fifo_size << PA_SC_FIFO_SIZE__SC_EARLYZ_TILE_FIFO_SIZE__SHIFT));mutex_unlock (&adev->grbm_idx_mutex); - }static void gfx_v9_0_wait_for_rlc_serdes (struct amdgpu_device *adev)
Signature · 6 lines
2.12.0 _______________________________________________ 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 03/14] drm/amd/amdgpu: Tidy up gfx_v9_0_gpu_init()
Quoted 24 lines · Tom St Denis
Signed-off-by Tom St Denis <[email protected]>--- drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-)drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c +0
-2@@ -1531,13 +1531,11 @@ static void gfx_v9_0_init_compute_vmid(struct amdgpu_device *adev)static void gfx_v9_0_gpu_init (struct amdgpu_device *adev) { -u32 tmp;int i;WREG32_FIELD15 (GC ,0 ,GRBM_CNTL ,READ_TIMEOUT ,0xff );gfx_v9_0_tiling_mode_table_init (adev); -gfx_v9_0_setup_rb (adev);gfx_v9_0_get_cu_info (adev, &adev->gfx.cu_info);
drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c static void gfx_v9_0_gpu_init(struct amdgpu_device *adev) · line 1549
Quoted 9 lines
drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c +2
-4@@ -1547,25 +1545,21 @@ static void gfx_v9_0_gpu_init(struct amdgpu_device *adev)for (i =0 ; i <16 ; i++) {soc15_grbm_select (adev,0 ,0 ,0 , i);/* CP and shaders */ - tmp =0 ; - tmp =REG_SET_FIELD (tmp,SH_MEM_CONFIG ,ALIGNMENT_MODE , -SH_MEM_ALIGNMENT_MODE_UNALIGNED ); -WREG32_SOC15 (GC ,0 , mmSH_MEM_CONFIG, tmp); +WREG32_FIELD15 (GC ,0 ,SH_MEM_CONFIG ,ALIGNMENT_MODE , +SH_MEM_ALIGNMENT_MODE_UNALIGNED );
There is a slight change in behavior here. Previously we were setting the entire register to 0 except the alignment mode. now we just change the alignment mode. It's probably more correct as you've written it and the default value of the register is 0 anyway, but it is a change. Probably worth splitting this out as a separate change.
Alex
Quoted 30 lines
drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c +1
-5WREG32_SOC15 (GC ,0 , mmSH_MEM_BASES,0 ); }soc15_grbm_select (adev,0 ,0 ,0 ,0 ); -mutex_unlock (&adev->srbm_mutex);gfx_v9_0_init_compute_vmid (adev); -mutex_lock (&adev->grbm_idx_mutex);/* * making sure that the following register writes will be broadcasted * to all the shaders */ +mutex_lock (&adev->grbm_idx_mutex);gfx_v9_0_select_se_sh (adev,0xffffffff ,0xffffffff ,0xffffffff ); - WREG32_SOC15(GC, 0, mmPA_SC_FIFO_SIZE, (adev->gfx.config.sc_prim_fifo_size_frontend << PA_SC_FIFO_SIZE__SC_FRONTEND_PRIM_FIFO_SIZE__SHIFT) |@@ -1576,7 +1570,6 @@ static void gfx_v9_0_gpu_init(struct amdgpu_device *adev) (adev->gfx.config.sc_earlyz_tile_fifo_size << PA_SC_FIFO_SIZE__SC_EARLYZ_TILE_FIFO_SIZE__SHIFT));mutex_unlock (&adev->grbm_idx_mutex); - }static void gfx_v9_0_wait_for_rlc_serdes (struct amdgpu_device *adev) --2.12.0
Quoted 4 lines
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
_______________________________________________
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): CADnq5_O0CoNC2cKu-wWbB_NjURTny5TA8t0s6sybNPixaupWKQ-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org
Re: [PATCH 03/14] drm/amd/amdgpu: Tidy up gfx_v9_0_gpu_init()
Quoted 24 lines · Alex Deucher
Quoted 23 lines · Tom St Denis
Signed-off-by Tom St Denis <[email protected]>--- drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-)drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c +0
-2@@ -1531,13 +1531,11 @@ static void gfx_v9_0_init_compute_vmid(struct amdgpu_device *adev)static void gfx_v9_0_gpu_init (struct amdgpu_device *adev) { -u32 tmp;int i;WREG32_FIELD15 (GC ,0 ,GRBM_CNTL ,READ_TIMEOUT ,0xff );gfx_v9_0_tiling_mode_table_init (adev); -gfx_v9_0_setup_rb (adev);gfx_v9_0_get_cu_info (adev, &adev->gfx.cu_info);
Quoted 16 lines
drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c static void gfx_v9_0_gpu_init(struct amdgpu_device *adev) · line 1549
Quoted 10 lines
drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c +2
-4@@ -1547,25 +1545,21 @@ static void gfx_v9_0_gpu_init(struct amdgpu_device *adev)for (i =0 ; i <16 ; i++) {soc15_grbm_select (adev,0 ,0 ,0 , i);/* CP and shaders */ - tmp =0 ; - tmp =REG_SET_FIELD (tmp,SH_MEM_CONFIG ,ALIGNMENT_MODE , -SH_MEM_ALIGNMENT_MODE_UNALIGNED ); -WREG32_SOC15 (GC ,0 , mmSH_MEM_CONFIG, tmp); +WREG32_FIELD15 (GC ,0 ,SH_MEM_CONFIG ,ALIGNMENT_MODE , +SH_MEM_ALIGNMENT_MODE_UNALIGNED );There is a slight change in behavior here. Previously we were setting the entire register to 0 except the alignment mode. now we just change the alignment mode. It's probably more correct as you've written it and the default value of the register is 0 anyway, but it is a change. Probably worth splitting this out as a separate change.
I'll just remove this from this series since the intent was no real functional changes. I'll then add on a two patch change after to clean this up.
Thanks,
Tom
Quoted 29 lines
Alex
Quoted 26 lines
drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c +1
-4WREG32_SOC15 (GC ,0 , mmSH_MEM_BASES,0 ); }soc15_grbm_select (adev,0 ,0 ,0 ,0 ); -mutex_unlock (&adev->srbm_mutex);gfx_v9_0_init_compute_vmid (adev); -mutex_lock (&adev->grbm_idx_mutex);/* * making sure that the following register writes will be broadcasted * to all the shaders */ +mutex_lock (&adev->grbm_idx_mutex);gfx_v9_0_select_se_sh (adev,0xffffffff ,0xffffffff ,0xffffffff ); - WREG32_SOC15(GC, 0, mmPA_SC_FIFO_SIZE, (adev->gfx.config.sc_prim_fifo_size_frontend << PA_SC_FIFO_SIZE__SC_FRONTEND_PRIM_FIFO_SIZE__SHIFT) |@@ -1576,7 +1570,6 @@ static void gfx_v9_0_gpu_init(struct amdgpu_device *adev) (adev->gfx.config.sc_earlyz_tile_fifo_size << PA_SC_FIFO_SIZE__SC_EARLYZ_TILE_FIFO_SIZE__SHIFT));mutex_unlock (&adev->grbm_idx_mutex); - }
Quoted 8 lines
Quoted 8 lines
drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c +0
-1static void gfx_v9_0_wait_for_rlc_serdes (struct amdgpu_device *adev) --2.12.0
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 4/14 drm/amd/amdgpu: Tidy up gfx_v9_0_enable_save_restore_machine()
In reply to a message not in the archive--- drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-)
drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c +1 -5
@@ -1757,11 +1757,7 @@ static int gfx_v9_0_init_rlc_save_restore_list(struct amdgpu_device *adev)static void gfx_v9_0_enable_save_restore_machine (struct amdgpu_device *adev) { -u32 tmp =0 ; - - tmp =RREG32 (SOC15_REG_OFFSET (GC ,0 , mmRLC_SRM_CNTL)); - tmp |=RLC_SRM_CNTL__SRM_ENABLE_MASK ; -WREG32 (SOC15_REG_OFFSET (GC ,0 , mmRLC_SRM_CNTL), tmp); +WREG32_FIELD15 (GC ,0 ,RLC_SRM_CNTL ,SRM_ENABLE ,1 ); } static void pwr_10_0_gfxip_control_over_cgpg(struct amdgpu_device *adev,
Signature · 6 lines
2.12.0 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 5/14 drm/amd/amdgpu: Tidy up gfx_v9_0_enable_sck_slow_down_on_power_up()
In reply to a message not in the archive--- drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-)
drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c +5 -10
@@ -1835,16 +1835,11 @@ static void gfx_v9_0_enable_sck_slow_down_on_power_up(struct amdgpu_device *adevuint32_t default_data =0 ; default_data = data =RREG32 (SOC15_REG_OFFSET (GC ,0 , mmRLC_PG_CNTL)); - -if (enable == true) { - data |=RLC_PG_CNTL__SMU_CLK_SLOWDOWN_ON_PU_ENABLE_MASK ; -if (default_data != data) -WREG32 (SOC15_REG_OFFSET (GC ,0 , mmRLC_PG_CNTL), data); - }else { - data &= ~RLC_PG_CNTL__SMU_CLK_SLOWDOWN_ON_PU_ENABLE_MASK ; -if (default_data != data) -WREG32 (SOC15_REG_OFFSET (GC ,0 , mmRLC_PG_CNTL), data); - } + data =REG_SET_FIELD (data,RLC_PG_CNTL , +SMU_CLK_SLOWDOWN_ON_PU_ENABLE , + enable ?1 :0 ); +if (default_data != data) +WREG32 (SOC15_REG_OFFSET (GC ,0 , mmRLC_PG_CNTL), data); } static void gfx_v9_0_enable_sck_slow_down_on_power_down(struct amdgpu_device *adev,
Signature · 6 lines
2.12.0 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 6/14 drm/amd/amdgpu: Tidy up gfx_v9_0_enable_sck_slow_down_on_power_down()
In reply to a message not in the archive--- drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-)
drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c +5 -10
@@ -1849,16 +1849,11 @@ static void gfx_v9_0_enable_sck_slow_down_on_power_down(struct amdgpu_device *aduint32_t default_data =0 ; default_data = data =RREG32 (SOC15_REG_OFFSET (GC ,0 , mmRLC_PG_CNTL)); - -if (enable == true) { - data |=RLC_PG_CNTL__SMU_CLK_SLOWDOWN_ON_PD_ENABLE_MASK ; -if (default_data != data) -WREG32 (SOC15_REG_OFFSET (GC ,0 , mmRLC_PG_CNTL), data); - }else { - data &= ~RLC_PG_CNTL__SMU_CLK_SLOWDOWN_ON_PD_ENABLE_MASK ; -if (default_data != data) -WREG32 (SOC15_REG_OFFSET (GC ,0 , mmRLC_PG_CNTL), data); - } + data =REG_SET_FIELD (data,RLC_PG_CNTL , +SMU_CLK_SLOWDOWN_ON_PD_ENABLE , + enable ?1 :0 ); +if (default_data != data) +WREG32 (SOC15_REG_OFFSET (GC ,0 , mmRLC_PG_CNTL), data); } static void gfx_v9_0_enable_cp_power_gating(struct amdgpu_device *adev,
Signature · 6 lines
2.12.0 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 7/14 drm/amd/amdgpu: Tidy up gfx_v9_0_enable_cp_power_gating()
In reply to a message not in the archive--- drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-)
drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c +5 -10
@@ -1863,16 +1863,11 @@ static void gfx_v9_0_enable_cp_power_gating(struct amdgpu_device *adev,uint32_t default_data =0 ; default_data = data =RREG32 (SOC15_REG_OFFSET (GC ,0 , mmRLC_PG_CNTL)); - -if (enable == true) { - data &= ~RLC_PG_CNTL__CP_PG_DISABLE_MASK ; -if (default_data != data) -WREG32 (SOC15_REG_OFFSET (GC ,0 , mmRLC_PG_CNTL), data); - }else { - data |=RLC_PG_CNTL__CP_PG_DISABLE_MASK ; -if (default_data != data) -WREG32 (SOC15_REG_OFFSET (GC ,0 , mmRLC_PG_CNTL), data); - } + data =REG_SET_FIELD (data,RLC_PG_CNTL , +CP_PG_DISABLE , + enable ?0 :1 ); +if (default_data != data) +WREG32 (SOC15_REG_OFFSET (GC ,0 , mmRLC_PG_CNTL), data); } static void gfx_v9_0_enable_gfx_cg_power_gating(struct amdgpu_device *adev,
Signature · 6 lines
2.12.0 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 8/14 drm/amd/amdgpu: Tidy up gfx_v9_0_enable_gfx_cg_power_gating()
In reply to a message not in the archiveMake it consistent in style with the other CG/PG enable functions...
--- drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-)
drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c +3 -4
@@ -1876,10 +1876,9 @@ static void gfx_v9_0_enable_gfx_cg_power_gating(struct amdgpu_device *adev,uint32_t data, default_data; default_data = data =RREG32 (SOC15_REG_OFFSET (GC ,0 , mmRLC_PG_CNTL)); -if (enable == true) - data |=RLC_PG_CNTL__GFX_POWER_GATING_ENABLE_MASK ; -else - data &= ~RLC_PG_CNTL__GFX_POWER_GATING_ENABLE_MASK ; + data =REG_SET_FIELD (data,RLC_PG_CNTL , +GFX_POWER_GATING_ENABLE , + enable ?1 :0 );if (default_data != data)WREG32 (SOC15_REG_OFFSET (GC ,0 , mmRLC_PG_CNTL), data); }
Signature · 6 lines
2.12.0 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 9/14 drm/amd/amdgpu: Tidy up gfx_v9_0_enable_gfx_pipeline_powergating()
In reply to a message not in the archive--- drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-)
drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c +3 -4
@@ -1889,10 +1889,9 @@ static void gfx_v9_0_enable_gfx_pipeline_powergating(struct amdgpu_device *adev,uint32_t data, default_data; default_data = data =RREG32 (SOC15_REG_OFFSET (GC ,0 , mmRLC_PG_CNTL)); -if (enable == true) - data |=RLC_PG_CNTL__GFX_PIPELINE_PG_ENABLE_MASK ; -else - data &= ~RLC_PG_CNTL__GFX_PIPELINE_PG_ENABLE_MASK ; + data =REG_SET_FIELD (data,RLC_PG_CNTL , +GFX_PIPELINE_PG_ENABLE , + enable ?1 :0 );if (default_data != data)WREG32 (SOC15_REG_OFFSET (GC ,0 , mmRLC_PG_CNTL), data);
Signature · 6 lines
2.12.0 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 10/14 drm/amd/amdgpu: Tidy up gfx_v9_0_enable_gfx_static_mg_power_gating()
In reply to a message not in the archive--- drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-)
drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c +3 -4
@@ -1906,10 +1906,9 @@ static void gfx_v9_0_enable_gfx_static_mg_power_gating(struct amdgpu_device *adeuint32_t data, default_data; default_data = data =RREG32 (SOC15_REG_OFFSET (GC ,0 , mmRLC_PG_CNTL)); -if (enable == true) - data |=RLC_PG_CNTL__STATIC_PER_CU_PG_ENABLE_MASK ; -else - data &= ~RLC_PG_CNTL__STATIC_PER_CU_PG_ENABLE_MASK ; + data =REG_SET_FIELD (data,RLC_PG_CNTL , +STATIC_PER_CU_PG_ENABLE , + enable ?1 :0 );if (default_data != data)WREG32 (SOC15_REG_OFFSET (GC ,0 , mmRLC_PG_CNTL), data); }
Signature · 6 lines
2.12.0 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 11/14 drm/amd/amdgpu: Tidy up gfx_v9_0_enable_gfx_dynamic_mg_power_gating()
In reply to a message not in the archive--- drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-)
drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c +3 -4
@@ -1919,10 +1919,9 @@ static void gfx_v9_0_enable_gfx_dynamic_mg_power_gating(struct amdgpu_device *aduint32_t data, default_data; default_data = data =RREG32 (SOC15_REG_OFFSET (GC ,0 , mmRLC_PG_CNTL)); -if (enable == true) - data |=RLC_PG_CNTL__DYN_PER_CU_PG_ENABLE_MASK ; -else - data &= ~RLC_PG_CNTL__DYN_PER_CU_PG_ENABLE_MASK ; + data =REG_SET_FIELD (data,RLC_PG_CNTL , +DYN_PER_CU_PG_ENABLE , + enable ?1 :0 );if (default_data != data)WREG32 (SOC15_REG_OFFSET (GC ,0 , mmRLC_PG_CNTL), data); }
Signature · 6 lines
2.12.0 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 12/14 drm/amd/amdgpu: Tidy up gfx_v9_0_rlc_stop()
In reply to a message not in the archive--- drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-)
drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c +1 -6
@@ -1961,13 +1961,8 @@ static void gfx_v9_0_init_pg(struct amdgpu_device *adev)void gfx_v9_0_rlc_stop (struct amdgpu_device *adev) { -u32 tmp =RREG32_SOC15 (GC ,0 , mmRLC_CNTL); - - tmp =REG_SET_FIELD (tmp,RLC_CNTL ,RLC_ENABLE_F32 ,0 ); -WREG32_SOC15 (GC ,0 , mmRLC_CNTL, tmp); - +WREG32_FIELD15 (GC ,0 ,RLC_CNTL ,RLC_ENABLE_F32 ,0 );gfx_v9_0_enable_gui_idle_interrupt (adev, false); -gfx_v9_0_wait_for_rlc_serdes (adev); }
Signature · 6 lines
2.12.0 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 13/14 drm/amd/amdgpu: Fix indentation in gfx_v9_0_mqd_init()
In reply to a message not in the archive--- drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c +2 -2
@@ -2482,10 +2482,10 @@ static int gfx_v9_0_mqd_init(struct amdgpu_ring *ring) DOORBELL_SOURCE, 0); tmp =REG_SET_FIELD (tmp,CP_HQD_PQ_DOORBELL_CONTROL ,DOORBELL_HIT ,0 ); - } -else + }else { tmp =REG_SET_FIELD (tmp,CP_HQD_PQ_DOORBELL_CONTROL ,DOORBELL_EN ,0 ); + } mqd->cp_hqd_pq_doorbell_control = tmp;
Signature · 6 lines
2.12.0 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 14/14 drm/amd/amdgpu: Simplify gfx_v9_0_wait_for_idle()
In reply to a message not in the archive--- drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-)
drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c +1 -6
@@ -2930,15 +2930,10 @@ static bool gfx_v9_0_is_idle(void *handle)static int gfx_v9_0_wait_for_idle (void *handle) {unsigned i; -u32 tmp;struct amdgpu_device *adev = (struct amdgpu_device *)handle;for (i =0 ; i < adev->usec_timeout; i++) { -/* read MC_STATUS */ - tmp =RREG32_SOC15 (GC ,0 , mmGRBM_STATUS) & -GRBM_STATUS__GUI_ACTIVE_MASK ; - -if (!REG_GET_FIELD (tmp,GRBM_STATUS ,GUI_ACTIVE )) +if (gfx_v9_0_is_idle (handle))return 0 ;udelay (1 ); }
Signature · 6 lines
2.12.0 _______________________________________________ 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]
Alex Deucher
Reviewed-byRe: [PATCH 14/14] drm/amd/amdgpu: Simplify gfx_v9_0_wait_for_idle()
Quoted 1 line · Tom St Denis
Signed-off-by Tom St Denis <[email protected]>
One comment on patch 3. The rest are:
Quoted 28 lines
--- drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-)drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c +1
-7@@ -2930,15 +2930,10 @@ static bool gfx_v9_0_is_idle(void *handle)static int gfx_v9_0_wait_for_idle (void *handle) {unsigned i; -u32 tmp;struct amdgpu_device *adev = (struct amdgpu_device *)handle;for (i =0 ; i < adev->usec_timeout; i++) { -/* read MC_STATUS */ - tmp =RREG32_SOC15 (GC ,0 , mmGRBM_STATUS) & -GRBM_STATUS__GUI_ACTIVE_MASK ; - -if (!REG_GET_FIELD (tmp,GRBM_STATUS ,GUI_ACTIVE )) +if (gfx_v9_0_is_idle (handle))return 0 ;udelay (1 ); } --2.12.0
Quoted 4 lines
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx