On Wed, May 3, 2017 at 8:41 AM, Nicolai Hähnle <nhaehnle at 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 at 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.
