Revert "drm/amd/display: Use HW lock mgr for PSR1"

Tom Chung · alexdeucher · commit f245b400a223 · 2025-02-04T17:47:34.000-05:00
This reverts commit a2b5a99 ("drm/amd/display: Use HW lock mgr for PSR1") Because it may cause system hang while connect with two edp panel. Acked-by: Wayne Lin <wayne.lin@amd.com> Signed-off-by: Tom Chung <chiahsuan.chung@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
diff --git a/drivers/gpu/drm/amd/display/dc/dce/dmub_hw_lock_mgr.c b/drivers/gpu/drm/amd/display/dc/dce/dmub_hw_lock_mgr.c
@@ -63,8 +63,7 @@ void dmub_hw_lock_mgr_inbox0_cmd(struct dc_dmub_srv *dmub_srv,
 
 bool should_use_dmub_lock(struct dc_link *link)
 {
-	if (link->psr_settings.psr_version == DC_PSR_VERSION_SU_1 ||
-	    link->psr_settings.psr_version == DC_PSR_VERSION_1)
+	if (link->psr_settings.psr_version == DC_PSR_VERSION_SU_1)
 		return true;
 
 	if (link->replay_settings.replay_feature_enabled)

Original file line number	Diff line number	Diff line change
`@@ -63,8 +63,7 @@ void dmub_hw_lock_mgr_inbox0_cmd(struct dc_dmub_srv *dmub_srv,`
`63`	`63`
`64`	`64`	`bool should_use_dmub_lock(struct dc_link *link)`
`65`	`65`	`{`
`66`		`- if (link->psr_settings.psr_version == DC_PSR_VERSION_SU_1 \|\|`
`67`		`- link->psr_settings.psr_version == DC_PSR_VERSION_1)`
	`66`	`+ if (link->psr_settings.psr_version == DC_PSR_VERSION_SU_1)`
`68`	`67`	`return true;`
`69`	`68`
`70`	`69`	`if (link->replay_settings.replay_feature_enabled)`