Skip to content

Commit acbf16a

Browse files
superm1alexdeucher
authored andcommitted
drm/amd/display: Use HW lock mgr for PSR1 when only one eDP
[WHY] DMUB locking is important to make sure that registers aren't accessed while in PSR. Previously it was enabled but caused a deadlock in situations with multiple eDP panels. [HOW] Detect if multiple eDP panels are in use to decide whether to use lock. Refactor the function so that the first check is for PSR-SU and then replay is in use to prevent having to look up number of eDP panels for those configurations. Fixes: f245b40 ("Revert "drm/amd/display: Use HW lock mgr for PSR1"") Closes: https://gitlab.freedesktop.org/drm/amd/-/issues/3965 Reviewed-by: ChiaHsuan Chung <chiahsuan.chung@amd.com> Signed-off-by: Mario Limonciello <mario.limonciello@amd.com> Signed-off-by: Alex Hung <alex.hung@amd.com> Tested-by: Daniel Wheeler <daniel.wheeler@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com> (cherry picked from commit ed569e1) Cc: stable@vger.kernel.org
1 parent 35f0f9f commit acbf16a

File tree

1 file changed

+11
-0
lines changed

1 file changed

+11
-0
lines changed

drivers/gpu/drm/amd/display/dc/dce/dmub_hw_lock_mgr.c

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,5 +69,16 @@ bool should_use_dmub_lock(struct dc_link *link)
6969
if (link->replay_settings.replay_feature_enabled)
7070
return true;
7171

72+
/* only use HW lock for PSR1 on single eDP */
73+
if (link->psr_settings.psr_version == DC_PSR_VERSION_1) {
74+
struct dc_link *edp_links[MAX_NUM_EDP];
75+
int edp_num;
76+
77+
dc_get_edp_links(link->dc, edp_links, &edp_num);
78+
79+
if (edp_num == 1)
80+
return true;
81+
}
82+
7283
return false;
7384
}

0 commit comments

Comments
 (0)