drm/amdgpu: update atom_firmware_info_v3_4 (v2)

v1: Added some pspbl parameters
v2: fix fallthrough issue

Signed-off-by: Feifei Xu <Feifei.Xu@amd.com>
Reviewed-by: Hawking Zhang <Hawking.Zhang@amd.com>
Reviewed-by: Kevin Wang <kevin1.wang@amd.com>
Reviewed-by: Lazar Lijo <Lijo.Lazar@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/include/atomfirmware.h b/drivers/gpu/drm/amd/include/atomfirmware.h
index ec43a4fb761a460c350d7c7466ca8e1d89499e07..1c0034df59f80b5d06225adb87ca567b7c7fe2bb 100644 (file)
--- a/drivers/gpu/drm/amd/include/atomfirmware.h
+++ b/drivers/gpu/drm/amd/include/atomfirmware.h
@@ -596,7 +596,10 @@ struct atom_firmware_info_v3_4 {
        uint32_t maco_pwrlimit_mw;                // bomaco mode power limit in unit of m-watt
        uint32_t usb_pwrlimit_mw;                 // power limit when USB is enable in unit of m-watt
        uint32_t fw_reserved_size_in_kb;          // VBIOS reserved extra fw size in unit of kb.
-       uint32_t reserved[5];
+        uint32_t pspbl_init_done_reg_addr;
+        uint32_t pspbl_init_done_value;
+        uint32_t pspbl_init_done_check_timeout;   // time out in unit of us when polling pspbl init done
+        uint32_t reserved[2];
 };
 
 /* 

diff --git a/drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0.c b/drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0.c
index 0db4f157208680c7f4fed87ad44974d4765262bf..7589cfe86f5492ddc9cca209121d303479d0270a 100644 (file)
--- a/drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0.c
+++ b/drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0.c
@@ -508,6 +508,7 @@ int smu_v13_0_get_vbios_bootup_values(struct smu_context *smu)
                smu->smu_table.boot_values.vdd_gfx = v_3_3->bootup_vddgfx_mv;
                smu->smu_table.boot_values.cooling_id = v_3_3->coolingsolution_id;
                smu->smu_table.boot_values.pp_table_id = v_3_3->pplib_pptable_id;
+               break;
        case 4:
        default:
                v_3_4 = (struct atom_firmware_info_v3_4 *)header;
@@ -522,6 +523,7 @@ int smu_v13_0_get_vbios_bootup_values(struct smu_context *smu)
                smu->smu_table.boot_values.vdd_gfx = v_3_4->bootup_vddgfx_mv;
                smu->smu_table.boot_values.cooling_id = v_3_4->coolingsolution_id;
                smu->smu_table.boot_values.pp_table_id = v_3_4->pplib_pptable_id;
+               break;
        }
 
        smu->smu_table.boot_values.format_revision = header->format_revision;