OSDN Git Service

drm/amdgpu: switch to cached fw flags for sram ecc cap
authorHawking Zhang <Hawking.Zhang@amd.com>
Thu, 13 May 2021 14:02:29 +0000 (22:02 +0800)
committerAlex Deucher <alexander.deucher@amd.com>
Thu, 20 May 2021 02:30:09 +0000 (22:30 -0400)
Check cached firmware_flags to determine whether
sram ecc is supported or not.

Signed-off-by: Hawking Zhang <Hawking.Zhang@amd.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Reviewed-by: John Clements <john.clements@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
drivers/gpu/drm/amd/amdgpu/amdgpu_atomfirmware.c

index 2cb8546..9f25db0 100644 (file)
@@ -437,33 +437,19 @@ bool amdgpu_atomfirmware_mem_ecc_supported(struct amdgpu_device *adev)
 }
 
 /*
+ * Helper function to query sram ecc capablity
+ *
+ * @adev: amdgpu_device pointer
+ *
  * Return true if vbios supports sram ecc or false if not
  */
 bool amdgpu_atomfirmware_sram_ecc_supported(struct amdgpu_device *adev)
 {
-       struct amdgpu_mode_info *mode_info = &adev->mode_info;
-       int index;
-       u16 data_offset, size;
-       union firmware_info *firmware_info;
-       u8 frev, crev;
-       bool sram_ecc_supported = false;
-
-       index = get_index_into_master_table(atom_master_list_of_data_tables_v2_1,
-                       firmwareinfo);
+       u32 fw_cap;
 
-       if (amdgpu_atom_parse_data_header(adev->mode_info.atom_context,
-                               index, &size, &frev, &crev, &data_offset)) {
-               /* support firmware_info 3.1 + */
-               if ((frev == 3 && crev >=1) || (frev > 3)) {
-                       firmware_info = (union firmware_info *)
-                               (mode_info->atom_context->bios + data_offset);
-                       sram_ecc_supported =
-                               (le32_to_cpu(firmware_info->v31.firmware_capability) &
-                                ATOM_FIRMWARE_CAP_SRAM_ECC) ? true : false;
-               }
-       }
+       fw_cap = adev->mode_info.firmware_flags;
 
-       return sram_ecc_supported;
+       return (fw_cap & ATOM_FIRMWARE_CAP_SRAM_ECC) ? true : false;
 }
 
 union smu_info {