From: Monk Liu <monk....@amd.com>

original method get wrong smc fw version.

Signed-off-by: Monk Liu <monk....@amd.com>
Reviewed-by: Alex Deucher <alexander.deuc...@amd.com>
Signed-off-by: Alex Deucher <alexander.deuc...@amd.com>
---
 drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c 
b/drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c
index f1c53a2..f6dbdf8 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c
@@ -743,12 +743,13 @@ static int amdgpu_cgs_get_firmware_info(struct cgs_device 
*cgs_device,
                info->version = 
(uint16_t)le32_to_cpu(header->header.ucode_version);
                info->feature_version = 
(uint16_t)le32_to_cpu(header->ucode_feature_version);
        } else {
+               uint32_t fw_ver;
                char fw_name[30] = {0};
                int err = 0;
                uint32_t ucode_size;
                uint32_t ucode_start_address;
                const uint8_t *src;
-               const struct smc_firmware_header_v1_0 *hdr;
+               struct smc_firmware_header_v1_0 *hdr;
 
                if (!adev->pm.fw) {
                        switch (adev->asic_type) {
@@ -793,12 +794,15 @@ static int amdgpu_cgs_get_firmware_info(struct cgs_device 
*cgs_device,
                        }
                }
 
-               hdr = (const struct smc_firmware_header_v1_0 *) 
adev->pm.fw->data;
+               hdr = (struct smc_firmware_header_v1_0 *)adev->pm.fw->data;
+               /* firmware version is located at 69 dw from begining */
+               fw_ver = *((uint32_t *)adev->pm.fw->data + 69);
+               hdr->header.ucode_version = fw_ver;
                amdgpu_ucode_print_smc_hdr(&hdr->header);
                adev->pm.fw_version = le32_to_cpu(hdr->header.ucode_version);
                ucode_size = le32_to_cpu(hdr->header.ucode_size_bytes);
                ucode_start_address = le32_to_cpu(hdr->ucode_start_addr);
-               src = (const uint8_t *)(adev->pm.fw->data +
+               src = (uint8_t *)(adev->pm.fw->data +
                       le32_to_cpu(hdr->header.ucode_array_offset_bytes));
 
                info->version = adev->pm.fw_version;
-- 
2.5.5

_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

Reply via email to