drm/amd/pm: allow the user to force BACO on smu v13.0.0/7

Kenneth Feng · alexdeucher · commit e49311c44a6e · 2023-08-16T11:34:30.000-04:00
allow the user to force BACO on smu v13.0.0/7

Signed-off-by: Kenneth Feng &lt;kenneth.feng@amd.com&gt;
Acked-by: Alex Deucher &lt;alexander.deucher@amd.com&gt;
Signed-off-by: Alex Deucher &lt;alexander.deucher@amd.com&gt;
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
@@ -2263,7 +2263,7 @@ int smu_v13_0_baco_set_state(struct smu_context *smu,
 	if (state == SMU_BACO_STATE_ENTER) {
 		ret = smu_cmn_send_smc_msg_with_param(smu,
 						      SMU_MSG_EnterBaco,
-						      smu_baco->maco_support ?
+						      (smu_baco->maco_support && amdgpu_runtime_pm != 1) ?
 						      BACO_SEQ_BAMACO : BACO_SEQ_BACO,
 						      NULL);
 	} else {
diff --git a/drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_0_ppt.c b/drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_0_ppt.c
@@ -2206,7 +2206,8 @@ static int smu_v13_0_0_baco_enter(struct smu_context *smu)
 
 	if (adev->in_runpm && smu_cmn_is_audio_func_enabled(adev))
 		return smu_v13_0_baco_set_armd3_sequence(smu,
-				smu_baco->maco_support ? BACO_SEQ_BAMACO : BACO_SEQ_BACO);
+				(smu_baco->maco_support && amdgpu_runtime_pm != 1) ?
+					BACO_SEQ_BAMACO : BACO_SEQ_BACO);
 	else
 		return smu_v13_0_baco_enter(smu);
 }
diff --git a/drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_7_ppt.c b/drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_7_ppt.c
@@ -2134,7 +2134,8 @@ static int smu_v13_0_7_baco_enter(struct smu_context *smu)
 
 	if (adev->in_runpm && smu_cmn_is_audio_func_enabled(adev))
 		return smu_v13_0_baco_set_armd3_sequence(smu,
-				smu_baco->maco_support ? BACO_SEQ_BAMACO : BACO_SEQ_BACO);
+				(smu_baco->maco_support && amdgpu_runtime_pm != 1) ?
+					BACO_SEQ_BAMACO : BACO_SEQ_BACO);
 	else
 		return smu_v13_0_baco_enter(smu);
 }

Original file line number	Diff line number	Diff line change
`@@ -2206,7 +2206,8 @@ static int smu_v13_0_0_baco_enter(struct smu_context *smu)`
`2206`	`2206`
`2207`	`2207`	`if (adev->in_runpm && smu_cmn_is_audio_func_enabled(adev))`
`2208`	`2208`	`return smu_v13_0_baco_set_armd3_sequence(smu,`
`2209`		`- smu_baco->maco_support ? BACO_SEQ_BAMACO : BACO_SEQ_BACO);`
	`2209`	`+ (smu_baco->maco_support && amdgpu_runtime_pm != 1) ?`
	`2210`	`+ BACO_SEQ_BAMACO : BACO_SEQ_BACO);`
`2210`	`2211`	`else`
`2211`	`2212`	`return smu_v13_0_baco_enter(smu);`
`2212`	`2213`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2134,7 +2134,8 @@ static int smu_v13_0_7_baco_enter(struct smu_context *smu)`
`2134`	`2134`
`2135`	`2135`	`if (adev->in_runpm && smu_cmn_is_audio_func_enabled(adev))`
`2136`	`2136`	`return smu_v13_0_baco_set_armd3_sequence(smu,`
`2137`		`- smu_baco->maco_support ? BACO_SEQ_BAMACO : BACO_SEQ_BACO);`
	`2137`	`+ (smu_baco->maco_support && amdgpu_runtime_pm != 1) ?`
	`2138`	`+ BACO_SEQ_BAMACO : BACO_SEQ_BACO);`
`2138`	`2139`	`else`
`2139`	`2140`	`return smu_v13_0_baco_enter(smu);`
`2140`	`2141`	`}`