drm/amdgpu: modify system reference clock source for navi+ (V2)
authorAaron Liu <aaron.liu@amd.com>
Mon, 17 May 2021 09:45:35 +0000 (17:45 +0800)
committerAlex Deucher <alexander.deucher@amd.com>
Thu, 20 May 2021 02:44:48 +0000 (22:44 -0400)
Starting from Navi+, the rlc reference clock is used for system clock
from vbios gfx_info table. It is incorrect to use core_refclk_10khz of
vbios smu_info table as system clock.

Signed-off-by: Aaron Liu <aaron.liu@amd.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Acked-by: Huang Rui <ray.huang@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
drivers/gpu/drm/amd/amdgpu/amdgpu_atomfirmware.c

index 8c41701..3b5d131 100644 (file)
@@ -546,6 +546,21 @@ int amdgpu_atomfirmware_get_clock_info(struct amdgpu_device *adev)
                ret = 0;
        }
 
+       /* if asic is Navi+, the rlc reference clock is used for system clock
+        * from vbios gfx_info table */
+       if (adev->asic_type >= CHIP_NAVI10) {
+               index = get_index_into_master_table(atom_master_list_of_data_tables_v2_1,
+                                                  gfx_info);
+               if (amdgpu_atom_parse_data_header(mode_info->atom_context, index, NULL,
+                                         &frev, &crev, &data_offset)) {
+                       struct atom_gfx_info_v2_2 *gfx_info = (struct atom_gfx_info_v2_2*)
+                               (mode_info->atom_context->bios + data_offset);
+                       if ((frev == 2) && (crev >= 2))
+                               spll->reference_freq = le32_to_cpu(gfx_info->rlc_gpu_timer_refclk);
+                       ret = 0;
+               }
+       }
+
        return ret;
 }