<div dir="ltr"><div>Just curious, but I noticed this new lock manager isn't being used because of the definitive false return value in display/dc/dce/dmub_hw_lock_mgr.c:<span style="color:rgb(0,0,0);font-size:13.3333px">should_use_dmub_lock.</span></div><div>Was this supposed to be enabled?</div><div><br></div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex"><pre style="font-family:courier,"courier new",monospace;font-size:14px;white-space:pre-wrap;margin-top:0px;margin-bottom:0px;color:rgb(0,0,0)">From: Wyatt Wood <<a href="mailto:wyatt.w...@amd.com">wyatt.w...@amd.com</a>>

[Why]
Feature requires synchronization of dig, pipe, and cursor locking
between driver and fw.</pre><pre style="font-family:courier,"courier new",monospace;font-size:14px;white-space:pre-wrap;margin-top:0px;margin-bottom:0px;color:rgb(0,0,0)">[How]
Set flag to force psr to use hw lock mgr.

Signed-off-by: Wyatt Wood <<a href="mailto:wyatt.w...@amd.com">wyatt.w...@amd.com</a>>
Reviewed-by: Anthony Koo <<a href="mailto:anthony....@amd.com">anthony....@amd.com</a>>
Acked-by: Eryk Brol <<a href="mailto:eryk.b...@amd.com">eryk.b...@amd.com</a>>
---
 drivers/gpu/drm/amd/display/dc/dce/dmub_psr.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/amd/display/dc/dce/dmub_psr.c 
b/drivers/gpu/drm/amd/display/dc/dce/dmub_psr.c
index 82e67bd81f2d..5167d6b8a48d 100644
--- a/drivers/gpu/drm/amd/display/dc/dce/dmub_psr.c
+++ b/drivers/gpu/drm/amd/display/dc/dce/dmub_psr.c
@@ -233,8 +233,8 @@ static bool dmub_psr_copy_settings(struct dmub_psr *dmub,
        copy_settings_data->frame_cap_ind                       = 
psr_context->psrFrameCaptureIndicationReq;
        copy_settings_data->debug.bitfields.visual_confirm      = 
dc->dc->debug.visual_confirm == VISUAL_CONFIRM_PSR ?
                                                                        true : 
false;
+       copy_settings_data->debug.bitfields.use_hw_lock_mgr     = 1;
        copy_settings_data->init_sdp_deadline                   = 
psr_context->sdpTransmitLineNumDeadline;
-       copy_settings_data->debug.bitfields.use_hw_lock_mgr     = 0;
 
        dc_dmub_srv_cmd_queue(dc->dmub_srv, &cmd);
        dc_dmub_srv_cmd_execute(dc->dmub_srv);
-- 
2.25.1</pre></blockquote></div>