* [PATCH] drm/amdgpu/gfx: drop max_gs_waves_per_vgt
@ 2017-05-02 19:50 Alex Deucher
[not found] ` <1493754651-14245-1-git-send-email-alexander.deucher-5C7GfCeVMHo@public.gmane.org>
0 siblings, 1 reply; 4+ messages in thread
From: Alex Deucher @ 2017-05-02 19:50 UTC (permalink / raw)
To: amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW; +Cc: Alex Deucher
We already have this info: max_gs_threads. Drop the duplicate.
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
---
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(-)
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu.h b/drivers/gpu/drm/amd/amdgpu/amdgpu.h
index 0ee4d87..e7fe649 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu.h
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu.h
@@ -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];
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c
index d40b8ac..8d7e4d4 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c
@@ -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;
diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c b/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c
index 2b2a2c2..8b281df 100644
--- a/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c
@@ -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:
--
2.5.5
_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
^ permalink raw reply related [flat|nested] 4+ messages in thread[parent not found: <1493754651-14245-1-git-send-email-alexander.deucher-5C7GfCeVMHo@public.gmane.org>]
* Re: [PATCH] drm/amdgpu/gfx: drop max_gs_waves_per_vgt [not found] ` <1493754651-14245-1-git-send-email-alexander.deucher-5C7GfCeVMHo@public.gmane.org> @ 2017-05-03 5:44 ` Zhang, Jerry (Junwei) 2017-05-03 12:41 ` Nicolai Hähnle 1 sibling, 0 replies; 4+ messages in thread From: Zhang, Jerry (Junwei) @ 2017-05-03 5:44 UTC (permalink / raw) To: Alex Deucher, amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW; +Cc: Alex Deucher On 05/03/2017 03:50 AM, Alex Deucher wrote: > We already have this info: max_gs_threads. Drop the duplicate. > > Signed-off-by: Alex Deucher <alexander.deucher@amd.com> Reviewed-by: Junwei Zhang <Jerry.Zhang@amd.com> Also confirmed with Vulkan guys. > --- > 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(-) > > diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu.h b/drivers/gpu/drm/amd/amdgpu/amdgpu.h > index 0ee4d87..e7fe649 100644 > --- a/drivers/gpu/drm/amd/amdgpu/amdgpu.h > +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu.h > @@ -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]; > diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c > index d40b8ac..8d7e4d4 100644 > --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c > +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c > @@ -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; > diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c b/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c > index 2b2a2c2..8b281df 100644 > --- a/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c > +++ b/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c > @@ -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 amd-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/amd-gfx ^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] drm/amdgpu/gfx: drop max_gs_waves_per_vgt [not found] ` <1493754651-14245-1-git-send-email-alexander.deucher-5C7GfCeVMHo@public.gmane.org> 2017-05-03 5:44 ` Zhang, Jerry (Junwei) @ 2017-05-03 12:41 ` Nicolai Hähnle [not found] ` <f45601ff-9070-6992-0d53-a27a0745ac4d-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> 1 sibling, 1 reply; 4+ messages in thread From: Nicolai Hähnle @ 2017-05-03 12:41 UTC (permalink / raw) To: Alex Deucher, amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW; +Cc: Alex Deucher On 02.05.2017 21:50, Alex Deucher wrote: > 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 > > Signed-off-by: Alex Deucher <alexander.deucher@amd.com> > --- > 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(-) > > diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu.h b/drivers/gpu/drm/amd/amdgpu/amdgpu.h > index 0ee4d87..e7fe649 100644 > --- a/drivers/gpu/drm/amd/amdgpu/amdgpu.h > +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu.h > @@ -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]; > diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c > index d40b8ac..8d7e4d4 100644 > --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c > +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c > @@ -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; > diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c b/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c > index 2b2a2c2..8b281df 100644 > --- a/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c > +++ b/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c > @@ -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: > -- Lerne, wie die Welt wirklich ist, Aber vergiss niemals, wie sie sein sollte. _______________________________________________ amd-gfx mailing list amd-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/amd-gfx ^ permalink raw reply [flat|nested] 4+ messages in thread
[parent not found: <f45601ff-9070-6992-0d53-a27a0745ac4d-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>]
* Re: [PATCH] drm/amdgpu/gfx: drop max_gs_waves_per_vgt [not found] ` <f45601ff-9070-6992-0d53-a27a0745ac4d-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> @ 2017-05-03 13:19 ` Alex Deucher 0 siblings, 0 replies; 4+ messages in thread From: Alex Deucher @ 2017-05-03 13:19 UTC (permalink / raw) To: Nicolai Hähnle; +Cc: Alex Deucher, amd-gfx list On Wed, May 3, 2017 at 8:41 AM, Nicolai Hähnle <nhaehnle@gmail.com> wrote: > On 02.05.2017 21:50, Alex Deucher wrote: >> >> 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. I could change it, but it'd more invasive since I'd have to change all the previous asics. Alex > > Cheers, > Nicolai > > >> >> Signed-off-by: Alex Deucher <alexander.deucher@amd.com> >> --- >> 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(-) >> >> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu.h >> b/drivers/gpu/drm/amd/amdgpu/amdgpu.h >> index 0ee4d87..e7fe649 100644 >> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu.h >> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu.h >> @@ -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]; >> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c >> b/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c >> index d40b8ac..8d7e4d4 100644 >> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c >> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c >> @@ -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; >> diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c >> b/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c >> index 2b2a2c2..8b281df 100644 >> --- a/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c >> +++ b/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c >> @@ -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: >> > > > -- > Lerne, wie die Welt wirklich ist, > Aber vergiss niemals, wie sie sein sollte. _______________________________________________ amd-gfx mailing list amd-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/amd-gfx ^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2017-05-03 13:19 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-05-02 19:50 [PATCH] drm/amdgpu/gfx: drop max_gs_waves_per_vgt Alex Deucher
[not found] ` <1493754651-14245-1-git-send-email-alexander.deucher-5C7GfCeVMHo@public.gmane.org>
2017-05-03 5:44 ` Zhang, Jerry (Junwei)
2017-05-03 12:41 ` Nicolai Hähnle
[not found] ` <f45601ff-9070-6992-0d53-a27a0745ac4d-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2017-05-03 13:19 ` Alex Deucher
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.