Commit 30155493 authored by Tom Chung's avatar Tom Chung Committed by Wen Zhiwei
Browse files

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

stable inclusion
from stable-v6.6.75
commit 758abba3dd413dc5de2016f8588403294263a30a
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/IBSPQB

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=758abba3dd413dc5de2016f8588403294263a30a



--------------------------------

[ Upstream commit b5c764d6ed556c4e81fbe3fd976da77ec450c08e ]

[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: default avatarSun peng Li <sunpeng.li@amd.com>
Signed-off-by: default avatarTom Chung <chiahsuan.chung@amd.com>
Tested-by: default avatarDaniel Wheeler <daniel.wheeler@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
(cherry picked from commit a2b5a9956269f4c1a09537177f18ab0229fe79f7)
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
Signed-off-by: default avatarWen Zhiwei <wenzhiwei@kylinos.cn>
parent 241f5987

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

+2 −1
Original line number Diff line number Diff line
@@ -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;

	return false;

}