drm/amd/powerplay: correct swSMU baco reset related settings
Subsystems (2)
PATCH 1/2 drm/amd/powerplay: correct swSMU baco reset related settings
Added bif doorbell interrupt setting and applied different settings for BACO reset for RAS recovery.
--- drivers/gpu/drm/amd/powerplay/smu_v11_0.c | 30 ++++++++++++++++++++--- 1 file changed, 27 insertions(+), 3 deletions(-)
drivers/gpu/drm/amd/powerplay/smu_v11_0.c +27 -3
@@ -1667,6 +1667,10 @@ int smu_v11_0_baco_set_state(struct smu_context *smu, enum smu_baco_state state) {struct smu_baco_context *smu_baco = &smu->smu_baco; +struct amdgpu_device *adev = smu->adev; +struct amdgpu_ras *ras =amdgpu_ras_get_context (adev); +uint32_t bif_doorbell_intr_cntl; +uint32_t data;int ret =0 ;if (smu_v11_0_baco_get_state (smu) == state)
@@ -1674,10 +1678,30 @@ int smu_v11_0_baco_set_state(struct smu_context *smu, enum smu_baco_state state)mutex_lock (&smu_baco->mutex); -if (state ==SMU_BACO_STATE_ENTER ) - ret =smu_send_smc_msg_with_param (smu, SMU_MSG_EnterBaco,BACO_SEQ_BACO ); -else + bif_doorbell_intr_cntl =RREG32_SOC15 (NBIO ,0 , mmBIF_DOORBELL_INT_CNTL); + +if (state ==SMU_BACO_STATE_ENTER ) { + bif_doorbell_intr_cntl =REG_SET_FIELD (bif_doorbell_intr_cntl, +BIF_DOORBELL_INT_CNTL , +DOORBELL_INTERRUPT_DISABLE ,1 ); +WREG32_SOC15 (NBIO ,0 , mmBIF_DOORBELL_INT_CNTL, bif_doorbell_intr_cntl); + +if (!ras || !ras->supported) { + data =RREG32_SOC15 (THM ,0 , mmTHM_BACO_CNTL); + data |=0x80000000 ; +WREG32_SOC15 (THM ,0 , mmTHM_BACO_CNTL, data); + + ret =smu_send_smc_msg_with_param (smu, SMU_MSG_EnterBaco,0 ); + }else { + ret =smu_send_smc_msg_with_param (smu, SMU_MSG_EnterBaco,1 ); + } + }else { ret =smu_send_smc_msg (smu, SMU_MSG_ExitBaco); + bif_doorbell_intr_cntl =REG_SET_FIELD (bif_doorbell_intr_cntl, +BIF_DOORBELL_INT_CNTL , +DOORBELL_INTERRUPT_DISABLE ,0 ); +WREG32_SOC15 (NBIO ,0 , mmBIF_DOORBELL_INT_CNTL, bif_doorbell_intr_cntl); + }if (ret) goto out;
Signature · 6 lines
2.24.0 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
A message that is not in the archive (sent off-list or not yet received): [email protected]
PATCH 2/2 drm/amd/powerplay: add Arcturus baco reset support
Enable baco reset support on Arcturus.
--- drivers/gpu/drm/amd/amdgpu/soc15.c | 1 + drivers/gpu/drm/amd/powerplay/arcturus_ppt.c | 7 +++++++ drivers/gpu/drm/amd/powerplay/smu_v11_0.c | 14 ++++++++++---- 3 files changed, 18 insertions(+), 4 deletions(-)
drivers/gpu/drm/amd/amdgpu/soc15.c +1 -0
@@ -565,6 +565,7 @@ soc15_asic_reset_method(struct amdgpu_device *adev)return AMD_RESET_METHOD_MODE2 ;case CHIP_VEGA10 :case CHIP_VEGA12 : +case CHIP_ARCTURUS :soc15_asic_get_baco_capability (adev, &baco_reset);break ;case CHIP_VEGA20 :
drivers/gpu/drm/amd/powerplay/arcturus_ppt.c +7 -0
@@ -495,6 +495,7 @@ static int arcturus_store_powerplay_table(struct smu_context *smu) {struct smu_11_0_powerplay_table *powerplay_table =NULL ;struct smu_table_context *table_context = &smu->smu_table; +struct smu_baco_context *smu_baco = &smu->smu_baco;int ret =0 ;if (!table_context->power_play_table)
@@ -507,6 +508,12 @@ static int arcturus_store_powerplay_table(struct smu_context *smu) table_context->thermal_controller_type = powerplay_table->thermal_controller_type; +mutex_lock (&smu_baco->mutex); +if (powerplay_table->platform_caps &SMU_11_0_PP_PLATFORM_CAP_BACO || + powerplay_table->platform_caps &SMU_11_0_PP_PLATFORM_CAP_MACO ) + smu_baco->platform_support = true; +mutex_unlock (&smu_baco->mutex); +return ret; }
drivers/gpu/drm/amd/powerplay/smu_v11_0.c +10 -4
@@ -1641,7 +1641,9 @@ bool smu_v11_0_baco_is_support(struct smu_context *smu)if (!baco_support)return false; -if (!smu_feature_is_enabled (smu,SMU_FEATURE_BACO_BIT )) +/* Arcturus does not support this bit mask */ +if (smu_feature_is_supported (smu,SMU_FEATURE_BACO_BIT ) && + !smu_feature_is_enabled (smu,SMU_FEATURE_BACO_BIT ))return false; val =RREG32_SOC15 (NBIO ,0 , mmRCC_BIF_STRAP0);
@@ -1713,11 +1715,15 @@ int smu_v11_0_baco_set_state(struct smu_context *smu, enum smu_baco_state state)int smu_v11_0_baco_reset (struct smu_context *smu) { +struct amdgpu_device *adev = smu->adev;int ret =0 ; - ret =smu_v11_0_baco_set_armd3_sequence (smu,BACO_SEQ_BACO ); -if (ret) -return ret; +/* Arcturus does not need this audio workaround */ +if (adev->asic_type !=CHIP_ARCTURUS ) { + ret =smu_v11_0_baco_set_armd3_sequence (smu,BACO_SEQ_BACO ); +if (ret) +return ret; + } ret =smu_v11_0_baco_set_state (smu,SMU_BACO_STATE_ENTER );if (ret)
Signature · 6 lines
2.24.0 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
A message that is not in the archive (sent off-list or not yet received): [email protected]
Zhang, Hawking
Reviewed-by Hawking ZhangRE: [PATCH 2/2] drm/amd/powerplay: add Arcturus baco reset support
Series is
Regards,
Hawking
-----Original Message-----
From: amd-gfx <[email protected]> On Behalf Of Evan Quan
Sent: 2019年11月18日 17:20
To: [email protected]
Cc: Quan, Evan <[email protected]>
Subject: [PATCH 2/2] drm/amd/powerplay: add Arcturus baco reset support
Enable baco reset support on Arcturus.
--- drivers/gpu/drm/amd/amdgpu/soc15.c | 1 + drivers/gpu/drm/amd/powerplay/arcturus_ppt.c | 7 +++++++ drivers/gpu/drm/amd/powerplay/smu_v11_0.c | 14 ++++++++++---- 3 files changed, 18 insertions(+), 4 deletions(-)
drivers/gpu/drm/amd/amdgpu/soc15.c +1 -0
@@ -565,6 +565,7 @@ soc15_asic_reset_method(struct amdgpu_device *adev)return AMD_RESET_METHOD_MODE2 ;case CHIP_VEGA10 :case CHIP_VEGA12 : +case CHIP_ARCTURUS :soc15_asic_get_baco_capability (adev, &baco_reset);break ;case CHIP_VEGA20 :
drivers/gpu/drm/amd/powerplay/arcturus_ppt.c +7 -0
@@ -495,6 +495,7 @@ static int arcturus_store_powerplay_table(struct smu_context *smu) {struct smu_11_0_powerplay_table *powerplay_table =NULL ;struct smu_table_context *table_context = &smu->smu_table; +struct smu_baco_context *smu_baco = &smu->smu_baco;int ret =0 ;if (!table_context->power_play_table)
@@ -507,6 +508,12 @@ static int arcturus_store_powerplay_table(struct smu_context *smu) table_context->thermal_controller_type = powerplay_table->thermal_controller_type; +mutex_lock (&smu_baco->mutex); +if (powerplay_table->platform_caps &SMU_11_0_PP_PLATFORM_CAP_BACO || + powerplay_table->platform_caps &SMU_11_0_PP_PLATFORM_CAP_MACO ) + smu_baco->platform_support = true; +mutex_unlock (&smu_baco->mutex); +return ret; }
drivers/gpu/drm/amd/powerplay/smu_v11_0.c +3 -1
@@ -1641,7 +1641,9 @@ bool smu_v11_0_baco_is_support(struct smu_context *smu)if (!baco_support)return false; -if (!smu_feature_is_enabled (smu,SMU_FEATURE_BACO_BIT )) +/* Arcturus does not support this bit mask */ +if (smu_feature_is_supported (smu,SMU_FEATURE_BACO_BIT ) && + !smu_feature_is_enabled (smu,SMU_FEATURE_BACO_BIT ))return false; val = RREG32_SOC15(NBIO, 0, mmRCC_BIF_STRAP0); @@ -1713,11 +1715,15 @@ int smu_v11_0_baco_set_state(struct smu_context *smu, enum smu_baco_state state)
int smu_v11_0_baco_reset(struct smu_context *smu) {
+ struct amdgpu_device *adev = smu->adev;
int ret = 0;
- ret = smu_v11_0_baco_set_armd3_sequence(smu, BACO_SEQ_BACO);
- if (ret)
- return ret;
+ /* Arcturus does not need this audio workaround */
+ if (adev->asic_type != CHIP_ARCTURUS) {
+ ret = smu_v11_0_baco_set_armd3_sequence(smu, BACO_SEQ_BACO);
+ if (ret)
+ return ret;
+ }
ret = smu_v11_0_baco_set_state(smu, SMU_BACO_STATE_ENTER); if (ret)
--
2.24.0
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx