drm/amdgpu/gfx: drop max_gs_waves_per_vgt
Subsystems (2)
PATCH 1/1 drm/amdgpu/gfx: drop max_gs_waves_per_vgt
We already have this info: max_gs_threads. Drop the duplicate.
--- drivers/gpu/drm/amd/amdgpu/amdgpu.h | 1 - drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 2 +- drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 1 - 3 files changed, 1 insertion(+), 3 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu.h +0 -1
@@ -972,7 +972,6 @@ struct amdgpu_gfx_config {unsigned num_rbs;unsigned gs_vgt_table_depth;unsigned gs_prim_buffer_depth; -unsigned max_gs_waves_per_vgt;uint32_t tile_mode_array[32 ];uint32_t macrotile_mode_array[16 ];
drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c +1 -1
@@ -560,7 +560,7 @@ static int amdgpu_info_ioctl(struct drm_device *dev, void *data, struct drm_file dev_info.num_tcc_blocks = adev->gfx.config.max_texture_channel_caches; dev_info.gs_vgt_table_depth = adev->gfx.config.gs_vgt_table_depth; dev_info.gs_prim_buffer_depth = adev->gfx.config.gs_prim_buffer_depth; - dev_info.max_gs_waves_per_vgt = adev->gfx.config.max_gs_waves_per_vgt; + dev_info.max_gs_waves_per_vgt = adev->gfx.config.max_gs_threads;return copy_to_user (out, &dev_info,min ((size_t )size,sizeof (dev_info))) ? -EFAULT :0 ;
drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c +0 -1
@@ -796,7 +796,6 @@ static void gfx_v9_0_gpu_early_init(struct amdgpu_device *adev) adev->gfx.config.sc_earlyz_tile_fifo_size =0x4C0 ; adev->gfx.config.gs_vgt_table_depth =32 ; adev->gfx.config.gs_prim_buffer_depth =1792 ; - adev->gfx.config.max_gs_waves_per_vgt =32 ; gb_addr_config =VEGA10_GB_ADDR_CONFIG_GOLDEN ;break ;default :
Signature · 6 lines
2.5.5 _______________________________________________ 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): 1493754651-14245-1-git-send-email-alexander.deucher-5C7GfCeVMHo@public.gmane.org
Zhang, Jerry (Junwei)
Reviewed-by Junwei ZhangQuoted 3 lines · Alex Deucher
We already have this info:
max_gs_threads. Drop the duplicate.Signed-off-by Alex Deucher <[email protected]>
Also confirmed with Vulkan guys.
Quoted 37 lines
--- drivers/gpu/drm/amd/amdgpu/amdgpu.h | 1 - drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 2 +- drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 1 - 3 files changed, 1 insertion(+), 3 deletions(-)drivers/gpu/drm/amd/amdgpu/amdgpu.h +0
-1@@ -972,7 +972,6 @@ struct amdgpu_gfx_config {unsigned num_rbs;unsigned gs_vgt_table_depth;unsigned gs_prim_buffer_depth; -unsigned max_gs_waves_per_vgt;uint32_t tile_mode_array[32 ];uint32_t macrotile_mode_array[16 ];drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c +1
-1@@ -560,7 +560,7 @@ static int amdgpu_info_ioctl(struct drm_device *dev, void *data, struct drm_file dev_info.num_tcc_blocks = adev->gfx.config.max_texture_channel_caches; dev_info.gs_vgt_table_depth = adev->gfx.config.gs_vgt_table_depth; dev_info.gs_prim_buffer_depth = adev->gfx.config.gs_prim_buffer_depth; - dev_info.max_gs_waves_per_vgt = adev->gfx.config.max_gs_waves_per_vgt; + dev_info.max_gs_waves_per_vgt = adev->gfx.config.max_gs_threads;return copy_to_user (out, &dev_info,min ((size_t )size,sizeof (dev_info))) ? -EFAULT :0 ;drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c +0
-0
drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c static void gfx_v9_0_gpu_early_init(struct amdgpu_device *adev) · line 801
Quoted 7 lines
drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c +0
-1@@ -796,7 +796,6 @@ static void gfx_v9_0_gpu_early_init(struct amdgpu_device *adev) adev->gfx.config.sc_earlyz_tile_fifo_size =0x4C0 ; adev->gfx.config.gs_vgt_table_depth =32 ; adev->gfx.config.gs_prim_buffer_depth =1792 ; - adev->gfx.config.max_gs_waves_per_vgt =32 ; gb_addr_config =VEGA10_GB_ADDR_CONFIG_GOLDEN ;break ;default :
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Quoted 1 line · Alex Deucher
We already have this info:
max_gs_threads. Drop the duplicate.
max_gs_waves_per_vgt seems to be the better name for this number though. Threads is usually what we call an item, of which each wave has 64.
Cheers,
Nicolai
Quoted 46 lines
Signed-off-by Alex Deucher <[email protected]>--- drivers/gpu/drm/amd/amdgpu/amdgpu.h | 1 - drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 2 +- drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 1 - 3 files changed, 1 insertion(+), 3 deletions(-)drivers/gpu/drm/amd/amdgpu/amdgpu.h +0
-1@@ -972,7 +972,6 @@ struct amdgpu_gfx_config {unsigned num_rbs;unsigned gs_vgt_table_depth;unsigned gs_prim_buffer_depth; -unsigned max_gs_waves_per_vgt;uint32_t tile_mode_array[32 ];uint32_t macrotile_mode_array[16 ];drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c +1
-1@@ -560,7 +560,7 @@ static int amdgpu_info_ioctl(struct drm_device *dev, void *data, struct drm_file dev_info.num_tcc_blocks = adev->gfx.config.max_texture_channel_caches; dev_info.gs_vgt_table_depth = adev->gfx.config.gs_vgt_table_depth; dev_info.gs_prim_buffer_depth = adev->gfx.config.gs_prim_buffer_depth; - dev_info.max_gs_waves_per_vgt = adev->gfx.config.max_gs_waves_per_vgt; + dev_info.max_gs_waves_per_vgt = adev->gfx.config.max_gs_threads;return copy_to_user (out, &dev_info,min ((size_t )size,sizeof (dev_info))) ? -EFAULT :0 ;drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c +0
-1@@ -796,7 +796,6 @@ static void gfx_v9_0_gpu_early_init(struct amdgpu_device *adev) adev->gfx.config.sc_earlyz_tile_fifo_size =0x4C0 ; adev->gfx.config.gs_vgt_table_depth =32 ; adev->gfx.config.gs_prim_buffer_depth =1792 ; - adev->gfx.config.max_gs_waves_per_vgt =32 ; gb_addr_config =VEGA10_GB_ADDR_CONFIG_GOLDEN ;break ;default :
Signature · 6 lines
Lerne, wie die Welt wirklich ist, Aber vergiss niemals, wie sie sein sollte. _______________________________________________ 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): f45601ff-9070-6992-0d53-a27a0745ac4d-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org
Quoted 7 lines · Nicolai Hähnle
Quoted 2 lines · Alex Deucher
We already have this info:
max_gs_threads. Drop the duplicate.
max_gs_waves_per_vgtseems to be the better name for this number though. Threads is usually what we call an item, of which each wave has 64.
I could change it, but it'd more invasive since I'd have to change all the previous asics.
Alex
Quoted 59 lines
Cheers,
NicolaiQuoted 54 lines
Signed-off-by Alex Deucher <[email protected]>--- drivers/gpu/drm/amd/amdgpu/amdgpu.h | 1 - drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 2 +- drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 1 - 3 files changed, 1 insertion(+), 3 deletions(-)drivers/gpu/drm/amd/amdgpu/amdgpu.h +0
-1@@ -972,7 +972,6 @@ struct amdgpu_gfx_config {unsigned num_rbs;unsigned gs_vgt_table_depth;unsigned gs_prim_buffer_depth; -unsigned max_gs_waves_per_vgt;uint32_t tile_mode_array[32 ];uint32_t macrotile_mode_array[16 ];drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c +0
-0@@ -560,7 +560,7 @@ static int amdgpu_info_ioctl(struct drm_device *dev,void *data, struct
drm_file
dev_info.num_tcc_blocks =adev->gfx.config.max_texture_channel_caches;
dev_info.gs_vgt_table_depth =adev->gfx.config.gs_vgt_table_depth;
dev_info.gs_prim_buffer_depth =adev->gfx.config.gs_prim_buffer_depth;
- dev_info.max_gs_waves_per_vgt =adev->gfx.config.max_gs_waves_per_vgt;
+ dev_info.max_gs_waves_per_vgt =adev->gfx.config.max_gs_threads;return copy_to_user(out,
&dev_info,
min((size_t)size, sizeof(dev_info))) ?drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c +0
-1-EFAULT :0 ;drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c +0
-1@@ -796,7 +796,6 @@ static void gfx_v9_0_gpu_early_init(struct amdgpu_device *adev) adev->gfx.config.sc_earlyz_tile_fifo_size = 0x4C0; adev->gfx.config.gs_vgt_table_depth =32 ; adev->gfx.config.gs_prim_buffer_depth =1792 ; - adev->gfx.config.max_gs_waves_per_vgt =32 ; gb_addr_config =VEGA10_GB_ADDR_CONFIG_GOLDEN ;
Quoted 8 lines
Quoted 3 lines
drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c +0
-0break ;default:
--
Lerne, wie die Welt wirklich ist,
Aber vergiss niemals, wie sie sein sollte.
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx