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

[Lin, Wayne]

[Public]

Feel free to add:
Acked-by: Wayne Lin <wayne.lin at amd.com>

> -----Original Message-----
> From: Tom Chung <chiahsuan.chung at amd.com>
> Sent: Tuesday, February 4, 2025 3:13 PM
> To: amd-gfx at lists.freedesktop.org
> Cc: Lin, Wayne <Wayne.Lin at amd.com>; Li, Sun peng (Leo)
> <Sunpeng.Li at amd.com>; Chung, ChiaHsuan (Tom)
> <ChiaHsuan.Chung at amd.com>
> Subject: [PATCH] Revert "drm/amd/display: Use HW lock mgr for PSR1"
>
> This reverts commit
> 2a69ae1e1354 ("drm/amd/display: Use HW lock mgr for PSR1")
>
> Because it may cause system hang while connect with two edp panel.
>
> Signed-off-by: Tom Chung <chiahsuan.chung at amd.com>
> ---
>  drivers/gpu/drm/amd/display/dc/dce/dmub_hw_lock_mgr.c | 3 +--
>  1 file changed, 1 insertion(+), 2 deletions(-)
>
> 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
> index 5bb8b78bf250..bf636b28e3e1 100644
> --- 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)
> --
> 2.34.1