drm/amdgpu/gfx: drop max_gs_waves_per_vgt

We already have this info: max_gs_threads.  Drop the duplicate.

Reviewed-by: Junwei Zhang <Jerry.Zhang@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu.h b/drivers/gpu/drm/amd/amdgpu/amdgpu.h
index c9f935710d40649a63f74ce869664472548b9981..8033001b913a1803bf348a17c077db565f1c9fce 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu.h
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu.h
@@ -969,7 +969,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 4f2b6679f72f28dfe397fc4d17bf57cf3916801e..1a7830a291d6209d3884d8b8d5658e39a35adc9b 100644 (file)
--- 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 5f2ae4cb510f1e5f32fb32a0355dcc2e7db08944..484ead2a20a44476ae5960f478c82ae19daa6832 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c
@@ -786,7 +786,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: