aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlex Deucher <alexander.deucher@amd.com>2017-05-02 15:49:36 -0400
committerAlex Deucher <alexander.deucher@amd.com>2017-05-05 18:14:04 -0400
commitf47b77b4e4baeb7922b5652ae7040d4d5de684a7 (patch)
tree9409b64c2d850ab8d9f0796925b96f69384d7172
parent327fce0c0d265b14be575bfe21a98c7c0dd932d8 (diff)
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>
-rw-r--r--drivers/gpu/drm/amd/amdgpu/amdgpu.h1
-rw-r--r--drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c2
-rw-r--r--drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c1
3 files changed, 1 insertions, 3 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu.h b/drivers/gpu/drm/amd/amdgpu/amdgpu.h
index c9f935710d40..8033001b913a 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu.h
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu.h
@@ -969,7 +969,6 @@ struct amdgpu_gfx_config {
969 unsigned num_rbs; 969 unsigned num_rbs;
970 unsigned gs_vgt_table_depth; 970 unsigned gs_vgt_table_depth;
971 unsigned gs_prim_buffer_depth; 971 unsigned gs_prim_buffer_depth;
972 unsigned max_gs_waves_per_vgt;
973 972
974 uint32_t tile_mode_array[32]; 973 uint32_t tile_mode_array[32];
975 uint32_t macrotile_mode_array[16]; 974 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 4f2b6679f72f..1a7830a291d6 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
560 dev_info.num_tcc_blocks = adev->gfx.config.max_texture_channel_caches; 560 dev_info.num_tcc_blocks = adev->gfx.config.max_texture_channel_caches;
561 dev_info.gs_vgt_table_depth = adev->gfx.config.gs_vgt_table_depth; 561 dev_info.gs_vgt_table_depth = adev->gfx.config.gs_vgt_table_depth;
562 dev_info.gs_prim_buffer_depth = adev->gfx.config.gs_prim_buffer_depth; 562 dev_info.gs_prim_buffer_depth = adev->gfx.config.gs_prim_buffer_depth;
563 dev_info.max_gs_waves_per_vgt = adev->gfx.config.max_gs_waves_per_vgt; 563 dev_info.max_gs_waves_per_vgt = adev->gfx.config.max_gs_threads;
564 564
565 return copy_to_user(out, &dev_info, 565 return copy_to_user(out, &dev_info,
566 min((size_t)size, sizeof(dev_info))) ? -EFAULT : 0; 566 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 5f2ae4cb510f..484ead2a20a4 100644
--- 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)
786 adev->gfx.config.sc_earlyz_tile_fifo_size = 0x4C0; 786 adev->gfx.config.sc_earlyz_tile_fifo_size = 0x4C0;
787 adev->gfx.config.gs_vgt_table_depth = 32; 787 adev->gfx.config.gs_vgt_table_depth = 32;
788 adev->gfx.config.gs_prim_buffer_depth = 1792; 788 adev->gfx.config.gs_prim_buffer_depth = 1792;
789 adev->gfx.config.max_gs_waves_per_vgt = 32;
790 gb_addr_config = VEGA10_GB_ADDR_CONFIG_GOLDEN; 789 gb_addr_config = VEGA10_GB_ADDR_CONFIG_GOLDEN;
791 break; 790 break;
792 default: 791 default: