drm/amdgpu: add new member in gpu_info fw

Signed-off-by: Hawking Zhang <Hawking.Zhang@amd.com>
Reviewed-by: Alex Deucher <alexander.deucher@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 e7aa3046321055f8dc7d88aa718b25920e27a83b..c26761f0e05ea615e4a96909a502bed2a6cb67b7 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu.h
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu.h
@@ -1028,7 +1028,10 @@ struct amdgpu_gfx_config {
 struct amdgpu_cu_info {
        uint32_t number; /* total active CU number */
        uint32_t ao_cu_mask;
+       uint32_t max_waves_per_simd;
        uint32_t wave_front_size;
+       uint32_t max_scratch_slots_per_cu;
+       uint32_t lds_size;
        uint32_t bitmap[4][4];
 };
 

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
index de2abef922f55648c737445f42fd6f2d5246f428..5d6175ede20b71deae8ab8528af1fd3ebc176015 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
@@ -1480,6 +1480,11 @@ static int amdgpu_device_parse_gpu_info_fw(struct amdgpu_device *adev)
                adev->gfx.config.double_offchip_lds_buf =
                        le32_to_cpu(gpu_info_fw->gc_double_offchip_lds_buffer);
                adev->gfx.cu_info.wave_front_size = le32_to_cpu(gpu_info_fw->gc_wave_size);
+               adev->gfx.cu_info.max_waves_per_simd =
+                       le32_to_cpu(gpu_info_fw->gc_max_waves_per_simd);
+               adev->gfx.cu_info.max_scratch_slots_per_cu =
+                       le32_to_cpu(gpu_info_fw->gc_max_scratch_slots_per_cu);
+               adev->gfx.cu_info.lds_size = le32_to_cpu(gpu_info_fw->gc_lds_size);
                break;
        }
        default:

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.h
index 9f31c9d2ea9adf4b0d810705a8cfdd58fa7dfe82..30b5500dc152140ca5ef49f3d6f217e04cdf2fc8 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.h
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.h
@@ -127,6 +127,9 @@ struct gpu_info_firmware_v1_0 {
        uint32_t gc_parameter_cache_depth;
        uint32_t gc_double_offchip_lds_buffer;
        uint32_t gc_wave_size;
+       uint32_t gc_max_waves_per_simd;
+       uint32_t gc_max_scratch_slots_per_cu;
+       uint32_t gc_lds_size;
 };
 
 /* version_major=1, version_minor=0 */