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

Tom Chung · alexdeucher · commit b5c764d6ed55 · 2025-01-10T13:40:48.000-05:00
[Why] Without the dmub hw lock, it may cause the lock timeout issue while do modeset on PSR1 eDP panel. [How] Allow dmub hw lock for PSR1. Reviewed-by: Sun peng Li <sunpeng.li@amd.com> Signed-off-by: Tom Chung <chiahsuan.chung@amd.com> Tested-by: Daniel Wheeler <daniel.wheeler@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com> (cherry picked from commit a2b5a99)
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,7 +63,8 @@ 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)
+	if (link->psr_settings.psr_version == DC_PSR_VERSION_SU_1 ||
+	    link->psr_settings.psr_version == DC_PSR_VERSION_1)
 		return true;
 
 	if (link->replay_settings.replay_feature_enabled)

Original file line number	Diff line number	Diff line change
`@@ -63,7 +63,8 @@ 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)`
	`66`	`+ if (link->psr_settings.psr_version == DC_PSR_VERSION_SU_1 \|\|`
	`67`	`+ link->psr_settings.psr_version == DC_PSR_VERSION_1)`
`67`	`68`	`return true;`
`68`	`69`
`69`	`70`	`if (link->replay_settings.replay_feature_enabled)`