drm/amdgpu/gfx9: simplify and fix GRBM index selection
Subsystems (2)
PATCH 1/1 drm/amdgpu/gfx9: simplify and fix GRBM index selection
From: Nicolai Hähnle <[email protected]>
Copy the approach taken by gfx8, which simplifies the code, and set the instance index properly. The latter is required for debugging, e.g. for reading wave status by UMR.
--- drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-)
drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c +13 -11
@@ -1468,35 +1468,37 @@ static int gfx_v9_0_sw_fini(void *handle) }static void gfx_v9_0_tiling_mode_table_init (struct amdgpu_device *adev) {/* TODO */ }static void gfx_v9_0_select_se_sh (struct amdgpu_device *adev,u32 se_num,u32 sh_num,u32 instance) { -u32 data =REG_SET_FIELD (0 ,GRBM_GFX_INDEX ,INSTANCE_BROADCAST_WRITES ,1 ); +u32 data; -if ((se_num ==0xffffffff ) && (sh_num ==0xffffffff )) { - data =REG_SET_FIELD (data,GRBM_GFX_INDEX ,SH_BROADCAST_WRITES ,1 ); - data =REG_SET_FIELD (data,GRBM_GFX_INDEX ,SE_BROADCAST_WRITES ,1 ); - }else if (se_num ==0xffffffff ) { - data =REG_SET_FIELD (data,GRBM_GFX_INDEX ,SH_INDEX , sh_num); +if (instance ==0xffffffff ) + data =REG_SET_FIELD (0 ,GRBM_GFX_INDEX ,INSTANCE_BROADCAST_WRITES ,1 ); +else + data =REG_SET_FIELD (0 ,GRBM_GFX_INDEX ,INSTANCE_INDEX , instance); + +if (se_num ==0xffffffff ) data =REG_SET_FIELD (data,GRBM_GFX_INDEX ,SE_BROADCAST_WRITES ,1 ); - }else if (sh_num ==0xffffffff ) { - data =REG_SET_FIELD (data,GRBM_GFX_INDEX ,SH_BROADCAST_WRITES ,1 ); +else data =REG_SET_FIELD (data,GRBM_GFX_INDEX ,SE_INDEX , se_num); - }else { + +if (sh_num ==0xffffffff ) + data =REG_SET_FIELD (data,GRBM_GFX_INDEX ,SH_BROADCAST_WRITES ,1 ); +else data =REG_SET_FIELD (data,GRBM_GFX_INDEX ,SH_INDEX , sh_num); - data =REG_SET_FIELD (data,GRBM_GFX_INDEX ,SE_INDEX , se_num); - } +WREG32_SOC15 (GC ,0 , mmGRBM_GFX_INDEX, data); }static u32 gfx_v9_0_get_rb_active_bitmap (struct amdgpu_device *adev) {u32 data, mask; data =RREG32_SOC15 (GC ,0 , mmCC_RB_BACKEND_DISABLE); data |=RREG32_SOC15 (GC ,0 , mmGC_USER_RB_BACKEND_DISABLE);
Signature · 6 lines
2.9.3 _______________________________________________ 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): 20170714114154.28035-1-nhaehnle-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org
Deucher, Alexander
Reviewed-by Alex DeucherQuoted 8 lines
-----Original Message-----
From: amd-gfx [mailto:[email protected]] On Behalf Of Nicolai Hähnle
Sent: Friday, July 14, 2017 7:42 AM
To: [email protected]
Cc: Haehnle, Nicolai
Subject: [PATCH] drm/amdgpu/gfx9: simplify and fix GRBM index selection
Quoted 7 lines
From: Nicolai Hähnle <[email protected]>
Copy the approach taken by gfx8, which simplifies the code, and set the instance index properly. The latter is required for debugging, e.g. for reading wave status by UMR.
Signed-off-by Nicolai Hähnle <[email protected]>
Quoted 72 lines
--- drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-)drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c +12
-9@@ -1468,35 +1468,37 @@ static int gfx_v9_0_sw_fini(void *handle) }static void gfx_v9_0_tiling_mode_table_init (struct amdgpu_device *adev) {/* TODO */ }static void gfx_v9_0_select_se_sh (struct amdgpu_device *adev,u32 se_num,u32 sh_num,u32 instance) { -u32 data =REG_SET_FIELD (0 ,GRBM_GFX_INDEX , INSTANCE_BROADCAST_WRITES, 1); +u32 data; -if ((se_num ==0xffffffff ) && (sh_num ==0xffffffff )) { - data =REG_SET_FIELD (data,GRBM_GFX_INDEX , SH_BROADCAST_WRITES, 1); - data =REG_SET_FIELD (data,GRBM_GFX_INDEX , SE_BROADCAST_WRITES, 1); - }else if (se_num ==0xffffffff ) { - data =REG_SET_FIELD (data,GRBM_GFX_INDEX ,SH_INDEX , sh_num); +if (instance ==0xffffffff ) + data =REG_SET_FIELD (0 ,GRBM_GFX_INDEX ,INSTANCE_BROADCAST_WRITES ,1 ); +else + data =REG_SET_FIELD (0 ,GRBM_GFX_INDEX ,INSTANCE_INDEX , instance); + +if (se_num ==0xffffffff ) data =REG_SET_FIELD (data,GRBM_GFX_INDEX ,SE_BROADCAST_WRITES ,1 ); - }else if (sh_num ==0xffffffff ) { - data =REG_SET_FIELD (data,GRBM_GFX_INDEX , SH_BROADCAST_WRITES, 1); + else data =REG_SET_FIELD (data,GRBM_GFX_INDEX ,SE_INDEX , se_num); - }else { + +if (sh_num ==0xffffffff ) + data =REG_SET_FIELD (data,GRBM_GFX_INDEX ,SH_BROADCAST_WRITES ,1 ); +else data = REG_SET_FIELD(data, GRBM_GFX_INDEX, SH_INDEX,
sh_num);drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c +0
-1- data = REG_SET_FIELD(data, GRBM_GFX_INDEX, SE_INDEX,
se_num);drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c +1
-1- } +WREG32_SOC15 (GC ,0 , mmGRBM_GFX_INDEX, data); }static u32 gfx_v9_0_get_rb_active_bitmap (struct amdgpu_device *adev) {u32 data, mask; data =RREG32_SOC15 (GC ,0 , mmCC_RB_BACKEND_DISABLE); data |= RREG32_SOC15(GC, 0,
mmGC_USER_RB_BACKEND_DISABLE);
Quoted 7 lines
--
2.9.3_______________________________________________
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