drm/amdgpu: update gc info from bios table

Handle newer gc info tables.

Signed-off-by: Hawking Zhang <Hawking.Zhang@amd.com>
Reviewed-by: Likun Gao <Likun.Gao@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_atomfirmware.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_atomfirmware.c
index 6034578..0900912 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_atomfirmware.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_atomfirmware.c
@@ -653,6 +653,7 @@ int amdgpu_atomfirmware_get_clock_info(struct amdgpu_device *adev)
 union gfx_info {
        struct atom_gfx_info_v2_4 v24;
        struct atom_gfx_info_v2_7 v27;
+       struct atom_gfx_info_v3_0 v30;
 };
 
 int amdgpu_atomfirmware_get_gfx_info(struct amdgpu_device *adev)
@@ -668,42 +669,58 @@ int amdgpu_atomfirmware_get_gfx_info(struct amdgpu_device *adev)
                                   &frev, &crev, &data_offset)) {
                union gfx_info *gfx_info = (union gfx_info *)
                        (mode_info->atom_context->bios + data_offset);
-               switch (crev) {
-               case 4:
-                       adev->gfx.config.max_shader_engines = gfx_info->v24.max_shader_engines;
-                       adev->gfx.config.max_cu_per_sh = gfx_info->v24.max_cu_per_sh;
-                       adev->gfx.config.max_sh_per_se = gfx_info->v24.max_sh_per_se;
-                       adev->gfx.config.max_backends_per_se = gfx_info->v24.max_backends_per_se;
-                       adev->gfx.config.max_texture_channel_caches = gfx_info->v24.max_texture_channel_caches;
-                       adev->gfx.config.max_gprs = le16_to_cpu(gfx_info->v24.gc_num_gprs);
-                       adev->gfx.config.max_gs_threads = gfx_info->v24.gc_num_max_gs_thds;
-                       adev->gfx.config.gs_vgt_table_depth = gfx_info->v24.gc_gs_table_depth;
-                       adev->gfx.config.gs_prim_buffer_depth =
-                               le16_to_cpu(gfx_info->v24.gc_gsprim_buff_depth);
-                       adev->gfx.config.double_offchip_lds_buf =
-                               gfx_info->v24.gc_double_offchip_lds_buffer;
-                       adev->gfx.cu_info.wave_front_size = le16_to_cpu(gfx_info->v24.gc_wave_size);
-                       adev->gfx.cu_info.max_waves_per_simd = le16_to_cpu(gfx_info->v24.gc_max_waves_per_simd);
-                       adev->gfx.cu_info.max_scratch_slots_per_cu = gfx_info->v24.gc_max_scratch_slots_per_cu;
-                       adev->gfx.cu_info.lds_size = le16_to_cpu(gfx_info->v24.gc_lds_size);
-                       return 0;
-               case 7:
-                       adev->gfx.config.max_shader_engines = gfx_info->v27.max_shader_engines;
-                       adev->gfx.config.max_cu_per_sh = gfx_info->v27.max_cu_per_sh;
-                       adev->gfx.config.max_sh_per_se = gfx_info->v27.max_sh_per_se;
-                       adev->gfx.config.max_backends_per_se = gfx_info->v27.max_backends_per_se;
-                       adev->gfx.config.max_texture_channel_caches = gfx_info->v27.max_texture_channel_caches;
-                       adev->gfx.config.max_gprs = le16_to_cpu(gfx_info->v27.gc_num_gprs);
-                       adev->gfx.config.max_gs_threads = gfx_info->v27.gc_num_max_gs_thds;
-                       adev->gfx.config.gs_vgt_table_depth = gfx_info->v27.gc_gs_table_depth;
-                       adev->gfx.config.gs_prim_buffer_depth = le16_to_cpu(gfx_info->v27.gc_gsprim_buff_depth);
-                       adev->gfx.config.double_offchip_lds_buf = gfx_info->v27.gc_double_offchip_lds_buffer;
-                       adev->gfx.cu_info.wave_front_size = le16_to_cpu(gfx_info->v27.gc_wave_size);
-                       adev->gfx.cu_info.max_waves_per_simd = le16_to_cpu(gfx_info->v27.gc_max_waves_per_simd);
-                       adev->gfx.cu_info.max_scratch_slots_per_cu = gfx_info->v27.gc_max_scratch_slots_per_cu;
-                       adev->gfx.cu_info.lds_size = le16_to_cpu(gfx_info->v27.gc_lds_size);
-                       return 0;
-               default:
+               if (frev == 2) {
+                       switch (crev) {
+                       case 4:
+                               adev->gfx.config.max_shader_engines = gfx_info->v24.max_shader_engines;
+                               adev->gfx.config.max_cu_per_sh = gfx_info->v24.max_cu_per_sh;
+                               adev->gfx.config.max_sh_per_se = gfx_info->v24.max_sh_per_se;
+                               adev->gfx.config.max_backends_per_se = gfx_info->v24.max_backends_per_se;
+                               adev->gfx.config.max_texture_channel_caches = gfx_info->v24.max_texture_channel_caches;
+                               adev->gfx.config.max_gprs = le16_to_cpu(gfx_info->v24.gc_num_gprs);
+                               adev->gfx.config.max_gs_threads = gfx_info->v24.gc_num_max_gs_thds;
+                               adev->gfx.config.gs_vgt_table_depth = gfx_info->v24.gc_gs_table_depth;
+                               adev->gfx.config.gs_prim_buffer_depth =
+                                       le16_to_cpu(gfx_info->v24.gc_gsprim_buff_depth);
+                               adev->gfx.config.double_offchip_lds_buf =
+                                       gfx_info->v24.gc_double_offchip_lds_buffer;
+                               adev->gfx.cu_info.wave_front_size = le16_to_cpu(gfx_info->v24.gc_wave_size);
+                               adev->gfx.cu_info.max_waves_per_simd = le16_to_cpu(gfx_info->v24.gc_max_waves_per_simd);
+                               adev->gfx.cu_info.max_scratch_slots_per_cu = gfx_info->v24.gc_max_scratch_slots_per_cu;
+                               adev->gfx.cu_info.lds_size = le16_to_cpu(gfx_info->v24.gc_lds_size);
+                               return 0;
+                       case 7:
+                               adev->gfx.config.max_shader_engines = gfx_info->v27.max_shader_engines;
+                               adev->gfx.config.max_cu_per_sh = gfx_info->v27.max_cu_per_sh;
+                               adev->gfx.config.max_sh_per_se = gfx_info->v27.max_sh_per_se;
+                               adev->gfx.config.max_backends_per_se = gfx_info->v27.max_backends_per_se;
+                               adev->gfx.config.max_texture_channel_caches = gfx_info->v27.max_texture_channel_caches;
+                               adev->gfx.config.max_gprs = le16_to_cpu(gfx_info->v27.gc_num_gprs);
+                               adev->gfx.config.max_gs_threads = gfx_info->v27.gc_num_max_gs_thds;
+                               adev->gfx.config.gs_vgt_table_depth = gfx_info->v27.gc_gs_table_depth;
+                               adev->gfx.config.gs_prim_buffer_depth = le16_to_cpu(gfx_info->v27.gc_gsprim_buff_depth);
+                               adev->gfx.config.double_offchip_lds_buf = gfx_info->v27.gc_double_offchip_lds_buffer;
+                               adev->gfx.cu_info.wave_front_size = le16_to_cpu(gfx_info->v27.gc_wave_size);
+                               adev->gfx.cu_info.max_waves_per_simd = le16_to_cpu(gfx_info->v27.gc_max_waves_per_simd);
+                               adev->gfx.cu_info.max_scratch_slots_per_cu = gfx_info->v27.gc_max_scratch_slots_per_cu;
+                               adev->gfx.cu_info.lds_size = le16_to_cpu(gfx_info->v27.gc_lds_size);
+                               return 0;
+                       default:
+                               return -EINVAL;
+                       }
+               } else if (frev == 3) {
+                       switch (crev) {
+                       case 0:
+                               adev->gfx.config.max_shader_engines = gfx_info->v30.max_shader_engines;
+                               adev->gfx.config.max_cu_per_sh = gfx_info->v30.max_cu_per_sh;
+                               adev->gfx.config.max_sh_per_se = gfx_info->v30.max_sh_per_se;
+                               adev->gfx.config.max_backends_per_se = gfx_info->v30.max_backends_per_se;
+                               adev->gfx.config.max_texture_channel_caches = gfx_info->v30.max_texture_channel_caches;
+                               return 0;
+                       default:
+                               return -EINVAL;
+                       }
+               } else {
                        return -EINVAL;
                }