drm/amdgpu: add PSP IP v14.0.4 support
Subsystems (3)
PATCH 1/7 drm/amdgpu: add PSP IP v14.0.4 support
This patch is to add PSP 14.0.4 support.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 1 + drivers/gpu/drm/amd/amdgpu/psp_v13_0.c | 1 + 2 files changed, 2 insertions(+)
drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c +1 -0
@@ -219,6 +219,7 @@ static int psp_early_init(void *handle)case IP_VERSION (13 ,0 ,11 ):case IP_VERSION (14 ,0 ,0 ):case IP_VERSION (14 ,0 ,1 ): +case IP_VERSION (14 ,0 ,4 ):psp_v13_0_set_psp_funcs (psp); psp->boot_time_tmr = false;break ;
drivers/gpu/drm/amd/amdgpu/psp_v13_0.c +1 -0
@@ -106,6 +106,7 @@ static int psp_v13_0_init_microcode(struct psp_context *psp)case IP_VERSION (13 ,0 ,11 ):case IP_VERSION (14 ,0 ,0 ):case IP_VERSION (14 ,0 ,1 ): +case IP_VERSION (14 ,0 ,4 ): err =psp_init_toc_microcode (psp, ucode_prefix);if (err)return err;
Signature · 1 line
2.43.0
PATCH 2/7 drm/amdgpu: add PSP IP v14.0.4 discovery support
This patch is to add PSP 14.0.4 support.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c | 1 + 1 file changed, 1 insertion(+)
drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c +1 -0
@@ -1964,6 +1964,7 @@ static int amdgpu_discovery_set_psp_ip_blocks(struct amdgpu_device *adev)case IP_VERSION (13 ,0 ,14 ):case IP_VERSION (14 ,0 ,0 ):case IP_VERSION (14 ,0 ,1 ): +case IP_VERSION (14 ,0 ,4 ):amdgpu_device_ip_block_add (adev, &psp_v13_0_ip_block);break ;case IP_VERSION (13 ,0 ,4 ):
Signature · 1 line
2.43.0
PATCH 3/7 drm/amd/pm: smu v14.0.4 reuse smu v14.0.0 dpmtable
In reply to Tim HuangFrom: Li Ma <[email protected]>
Replace IP VERSION with smu->is_apu in if condition. And the dpmtable of smu v14.0.4 is same as smu v14.0.0.
--- .../gpu/drm/amd/pm/swsmu/smu14/smu_v14_0.c | 18 ++++------- .../drm/amd/pm/swsmu/smu14/smu_v14_0_0_ppt.c | 30 +++++++++---------- 2 files changed, 21 insertions(+), 27 deletions(-)
drivers/gpu/drm/amd/pm/swsmu/smu14/smu_v14_0.c +6 -12
@@ -136,8 +136,7 @@ int smu_v14_0_load_microcode(struct smu_context *smu) 1 & ~MP1_SMN_PUB_CTRL__LX3_RESET_MASK);for (i =0 ; i < adev->usec_timeout; i++) { -if (amdgpu_ip_version (adev,MP1_HWIP ,0 ) ==IP_VERSION (14 ,0 ,0 ) || -amdgpu_ip_version (adev,MP1_HWIP ,0 ) ==IP_VERSION (14 ,0 ,1 )) +if (smu->is_apu) mp1_fw_flags =RREG32_PCIE (MP1_Public | (smnMP1_FIRMWARE_FLAGS_14_0_0 &0xffffffff ));else
@@ -210,8 +209,7 @@ int smu_v14_0_check_fw_status(struct smu_context *smu)struct amdgpu_device *adev = smu->adev;uint32_t mp1_fw_flags; -if (amdgpu_ip_version (adev,MP1_HWIP ,0 ) ==IP_VERSION (14 ,0 ,0 ) || -amdgpu_ip_version (adev,MP1_HWIP ,0 ) ==IP_VERSION (14 ,0 ,1 )) +if (smu->is_apu) mp1_fw_flags =RREG32_PCIE (MP1_Public | (smnMP1_FIRMWARE_FLAGS_14_0_0 &0xffffffff ));else
@@ -866,8 +864,7 @@ static int smu_v14_0_set_irq_state(struct amdgpu_device *adev,WREG32_SOC15 (THM ,0 , regTHM_THERMAL_INT_ENA,0 );/* For MP1 SW irqs */ -if (amdgpu_ip_version (adev,MP1_HWIP ,0 ) ==IP_VERSION (14 ,0 ,0 ) || -amdgpu_ip_version (adev,MP1_HWIP ,0 ) ==IP_VERSION (14 ,0 ,1 )) { +if (smu->is_apu) { val =RREG32_SOC15 (MP1 ,0 , regMP1_SMN_IH_SW_INT_CTRL_mp1_14_0_0); val =REG_SET_FIELD (val,MP1_SMN_IH_SW_INT_CTRL ,INT_MASK ,1 );WREG32_SOC15 (MP1 ,0 , regMP1_SMN_IH_SW_INT_CTRL_mp1_14_0_0, val);
@@ -900,8 +897,7 @@ static int smu_v14_0_set_irq_state(struct amdgpu_device *adev,WREG32_SOC15 (THM ,0 , regTHM_THERMAL_INT_ENA, val);/* For MP1 SW irqs */ -if (amdgpu_ip_version (adev,MP1_HWIP ,0 ) ==IP_VERSION (14 ,0 ,0 ) || -amdgpu_ip_version (adev,MP1_HWIP ,0 ) ==IP_VERSION (14 ,0 ,1 )) { +if (smu->is_apu) { val =RREG32_SOC15 (MP1 ,0 , regMP1_SMN_IH_SW_INT_mp1_14_0_0); val =REG_SET_FIELD (val,MP1_SMN_IH_SW_INT ,ID ,0xFE ); val =REG_SET_FIELD (val,MP1_SMN_IH_SW_INT ,VALID ,0 );
@@ -1494,8 +1490,7 @@ int smu_v14_0_set_vcn_enable(struct smu_context *smu,if (adev->vcn.harvest_config & (1 << i))continue ; -if (amdgpu_ip_version (adev,MP1_HWIP ,0 ) ==IP_VERSION (14 ,0 ,0 ) || -amdgpu_ip_version (adev,MP1_HWIP ,0 ) ==IP_VERSION (14 ,0 ,1 )) { +if (smu->is_apu) {if (i ==0 ) ret = smu_cmn_send_smc_msg_with_param(smu, enable ? SMU_MSG_PowerUpVcn0 : SMU_MSG_PowerDownVcn0,
@@ -1527,8 +1522,7 @@ int smu_v14_0_set_jpeg_enable(struct smu_context *smu,if (adev->jpeg.harvest_config & (1 << i))continue ; -if (amdgpu_ip_version (adev,MP1_HWIP ,0 ) ==IP_VERSION (14 ,0 ,0 ) || -amdgpu_ip_version (adev,MP1_HWIP ,0 ) ==IP_VERSION (14 ,0 ,1 )) { +if (smu->is_apu) {if (i ==0 ) ret = smu_cmn_send_smc_msg_with_param(smu, enable ? SMU_MSG_PowerUpJpeg0 : SMU_MSG_PowerDownJpeg0,
drivers/gpu/drm/amd/pm/swsmu/smu14/smu_v14_0_0_ppt.c +15 -15
@@ -723,10 +723,10 @@ static int smu_v14_0_common_get_dpm_freq_by_index(struct smu_context *smu,uint32_t dpm_level, uint32_t *freq) { - if (amdgpu_ip_version(smu->adev, MP1_HWIP, 0) == IP_VERSION(14, 0, 0)) - smu_v14_0_0_get_dpm_freq_by_index(smu, clk_type, dpm_level, freq); - else if (amdgpu_ip_version(smu->adev, MP1_HWIP, 0) == IP_VERSION(14, 0, 1)) + if (amdgpu_ip_version(smu->adev, MP1_HWIP, 0) == IP_VERSION(14, 0, 1)) smu_v14_0_1_get_dpm_freq_by_index(smu, clk_type, dpm_level, freq); + else +smu_v14_0_0_get_dpm_freq_by_index (smu ,clk_type ,dpm_level ,freq );return 0 ; }
@@ -999,10 +999,10 @@ static int smu_v14_0_common_get_dpm_ultimate_freq(struct smu_context *smu, uint32_t *min, uint32_t *max) { -if (amdgpu_ip_version (smu->adev,MP1_HWIP ,0 ) ==IP_VERSION (14 ,0 ,0 )) -smu_v14_0_0_get_dpm_ultimate_freq (smu, clk_type, min, max); -else if (amdgpu_ip_version (smu->adev,MP1_HWIP ,0 ) ==IP_VERSION (14 ,0 ,1 )) +if (amdgpu_ip_version (smu->adev,MP1_HWIP ,0 ) ==IP_VERSION (14 ,0 ,1 ))smu_v14_0_1_get_dpm_ultimate_freq (smu, clk_type, min, max); +else +smu_v14_0_0_get_dpm_ultimate_freq (smu, clk_type, min, max);return 0 ; }
@@ -1104,10 +1104,10 @@ static int smu_v14_0_common_get_dpm_level_count(struct smu_context *smu,enum smu_clk_type clk_type, uint32_t *count) { - if (amdgpu_ip_version(smu->adev, MP1_HWIP, 0) == IP_VERSION(14, 0, 0)) - smu_v14_0_0_get_dpm_level_count(smu, clk_type, count); - else if (amdgpu_ip_version(smu->adev, MP1_HWIP, 0) == IP_VERSION(14, 0, 1)) + if (amdgpu_ip_version(smu->adev, MP1_HWIP, 0) == IP_VERSION(14, 0, 1)) smu_v14_0_1_get_dpm_level_count(smu, clk_type, count); + else +smu_v14_0_0_get_dpm_level_count (smu ,clk_type ,count );return 0 ; }
@@ -1372,10 +1372,10 @@ static int smu_v14_0_0_set_fine_grain_gfx_freq_parameters(struct smu_context *smstatic int smu_v14_0_common_set_fine_grain_gfx_freq_parameters (struct smu_context *smu) { -if (amdgpu_ip_version (smu->adev,MP1_HWIP ,0 ) ==IP_VERSION (14 ,0 ,0 )) -smu_v14_0_0_set_fine_grain_gfx_freq_parameters (smu); -else if (amdgpu_ip_version (smu->adev,MP1_HWIP ,0 ) ==IP_VERSION (14 ,0 ,1 )) +if (amdgpu_ip_version (smu->adev,MP1_HWIP ,0 ) ==IP_VERSION (14 ,0 ,1 ))smu_v14_0_1_set_fine_grain_gfx_freq_parameters (smu); +else +smu_v14_0_0_set_fine_grain_gfx_freq_parameters (smu);return 0 ; }
@@ -1436,10 +1436,10 @@ static int smu_14_0_0_get_dpm_table(struct smu_context *smu, struct dpm_clocks *static int smu_v14_0_common_get_dpm_table (struct smu_context *smu,struct dpm_clocks *clock_table) { -if (amdgpu_ip_version (smu->adev,MP1_HWIP ,0 ) ==IP_VERSION (14 ,0 ,0 )) -smu_14_0_0_get_dpm_table (smu, clock_table); -else if (amdgpu_ip_version (smu->adev,MP1_HWIP ,0 ) ==IP_VERSION (14 ,0 ,1 )) +if (amdgpu_ip_version (smu->adev,MP1_HWIP ,0 ) ==IP_VERSION (14 ,0 ,1 ))smu_14_0_1_get_dpm_table (smu, clock_table); +else +smu_14_0_0_get_dpm_table (smu, clock_table);return 0 ; }
Signature · 1 line
2.43.0
PATCH 4/7 drm/amd/pm: add SMU IP v14.0.4 support
In reply to Tim HuangThis patch is to add SMU 14.0.4 support.
--- drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c | 1 + drivers/gpu/drm/amd/pm/swsmu/smu14/smu_v14_0.c | 2 ++ 2 files changed, 3 insertions(+)
drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c +1 -0
@@ -727,6 +727,7 @@ static int smu_set_funcs(struct amdgpu_device *adev)break ;case IP_VERSION (14 ,0 ,0 ):case IP_VERSION (14 ,0 ,1 ): +case IP_VERSION (14 ,0 ,4 ):smu_v14_0_0_set_ppt_funcs (smu);break ;case IP_VERSION (14 ,0 ,2 ):
drivers/gpu/drm/amd/pm/swsmu/smu14/smu_v14_0.c +2 -0
@@ -243,6 +243,7 @@ int smu_v14_0_check_fw_version(struct smu_context *smu)switch (amdgpu_ip_version (adev,MP1_HWIP ,0 )) {case IP_VERSION (14 ,0 ,0 ): +case IP_VERSION (14 ,0 ,4 ): smu->smc_driver_if_version =SMU14_DRIVER_IF_VERSION_SMU_V14_0_0 ;break ;case IP_VERSION (14 ,0 ,1 ):
@@ -757,6 +758,7 @@ int smu_v14_0_gfx_off_control(struct smu_context *smu, bool enable)case IP_VERSION (14 ,0 ,1 ):case IP_VERSION (14 ,0 ,2 ):case IP_VERSION (14 ,0 ,3 ): +case IP_VERSION (14 ,0 ,4 ):if (!(adev->pm.pp_feature &PP_GFXOFF_MASK ))return 0 ;if (enable)
Signature · 1 line
2.43.0
PATCH 5/7 drm/amdgpu: add SMU IP v14.0.4 discovery support
In reply to Tim HuangThis patch is to add SMU 14.0.4 support
--- drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c | 1 + 1 file changed, 1 insertion(+)
drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c +1 -0
@@ -2028,6 +2028,7 @@ static int amdgpu_discovery_set_smu_ip_blocks(struct amdgpu_device *adev)case IP_VERSION (14 ,0 ,1 ):case IP_VERSION (14 ,0 ,2 ):case IP_VERSION (14 ,0 ,3 ): +case IP_VERSION (14 ,0 ,4 ):amdgpu_device_ip_block_add (adev, &smu_v14_0_ip_block);break ;default :
Signature · 1 line
2.43.0
PATCH 6/7 drm/amdgpu: enable mode2 reset for SMU IP v14.0.4
In reply to Tim HuangSet the default reset method to mode2 for SMU 14.0.4.
--- drivers/gpu/drm/amd/amdgpu/soc21.c | 1 + 1 file changed, 1 insertion(+)
drivers/gpu/drm/amd/amdgpu/soc21.c +1 -0
@@ -389,6 +389,7 @@ soc21_asic_reset_method(struct amdgpu_device *adev)case IP_VERSION (13 ,0 ,11 ):case IP_VERSION (14 ,0 ,0 ):case IP_VERSION (14 ,0 ,1 ): +case IP_VERSION (14 ,0 ,4 ):return AMD_RESET_METHOD_MODE2 ;default :if (amdgpu_dpm_is_baco_supported (adev))
Signature · 1 line
2.43.0
PATCH 7/7 drm/amdgpu: add firmware for PSP IP v14.0.4
In reply to Tim HuangThis patch is to add firmware for PSP 14.0.4.
--- drivers/gpu/drm/amd/amdgpu/psp_v13_0.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/gpu/drm/amd/amdgpu/psp_v13_0.c +2 -0
@@ -57,6 +57,8 @@ MODULE_FIRMWARE("amdgpu/psp_14_0_0_toc.bin");MODULE_FIRMWARE ("amdgpu/psp_14_0_0_ta.bin" );MODULE_FIRMWARE ("amdgpu/psp_14_0_1_toc.bin" );MODULE_FIRMWARE ("amdgpu/psp_14_0_1_ta.bin" ); +MODULE_FIRMWARE ("amdgpu/psp_14_0_4_toc.bin" ); +MODULE_FIRMWARE ("amdgpu/psp_14_0_4_ta.bin" );/* For large FW files the time to complete can be very long */ #define USBC_PD_POLLING_LIMIT_S 240
Signature · 1 line
2.43.0
Re: [PATCH 7/7] drm/amdgpu: add firmware for PSP IP v14.0.4
[AMD Official Use Only - AMD Internal Distribution Only]
Series is:
________________________________
From: Huang, Tim <[email protected]>
Sent: Sunday, June 30, 2024 10:58 AM
To: [email protected] <[email protected]>
Cc: Deucher, Alexander <[email protected]>; Zhang, Yifan <[email protected]>; Huang, Tim <[email protected]>; Zhang, Yifan <[email protected]>
Subject: [PATCH 7/7] drm/amdgpu: add firmware for PSP IP v14.0.4
This patch is to add firmware for PSP 14.0.4.
--- drivers/gpu/drm/amd/amdgpu/psp_v13_0.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/gpu/drm/amd/amdgpu/psp_v13_0.c +2 -0
@@ -57,6 +57,8 @@ MODULE_FIRMWARE("amdgpu/psp_14_0_0_toc.bin");MODULE_FIRMWARE ("amdgpu/psp_14_0_0_ta.bin" );MODULE_FIRMWARE ("amdgpu/psp_14_0_1_toc.bin" );MODULE_FIRMWARE ("amdgpu/psp_14_0_1_ta.bin" ); +MODULE_FIRMWARE ("amdgpu/psp_14_0_4_toc.bin" ); +MODULE_FIRMWARE ("amdgpu/psp_14_0_4_ta.bin" );/* For large FW files the time to complete can be very long */ #define USBC_PD_POLLING_LIMIT_S 240
--
2.43.0