]> git.dujemihanovic.xyz Git - linux.git/commitdiff
drm/amd/display: Replace dm_execute_dmub_cmd with dc_wake_and_execute_dmub_cmd
authorRodrigo Siqueira <Rodrigo.Siqueira@amd.com>
Mon, 4 Dec 2023 21:35:04 +0000 (16:35 -0500)
committerAlex Deucher <alexander.deucher@amd.com>
Wed, 7 Aug 2024 22:13:31 +0000 (18:13 -0400)
In the commit c2cec7a872b6 ("drm/amd/display: Wake DMCUB before sending
a command for replay feature"), replaced dm_execute_dmub_cmd with
dc_wake_and_execute_dmub_cmd in multiple areas, but due to merge issues
the replacement of this function in the dmub_replay_copy_settings was
missed. This commit replaces the old dm_execute_dmub_cmd with
dc_wake_and_execute_dmub_cmd.

Fixes: 3601a35a2e9d ("drm/amd/display: Wake DMCUB before sending a command for replay feature")
Reviewed-by: Aurabindo Pillai <aurabindo.pillai@amd.com>
Tested-by: Daniel Wheeler <daniel.wheeler@amd.com>
Signed-off-by: Rodrigo Siqueira <Rodrigo.Siqueira@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
(cherry picked from commit 6cc213b9aa34bc3213e20f9256345c5cc1495b0b)

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

index 2a21bcf5224f452b6bc8584a614844524df06f48..4d960dc5ce8935f1d12c9a8fc4f3e4045adadf42 100644 (file)
@@ -185,8 +185,7 @@ static bool dmub_replay_copy_settings(struct dmub_replay *dmub,
        else
                copy_settings_data->flags.bitfields.force_wakeup_by_tps3 = 0;
 
-
-       dm_execute_dmub_cmd(dc, &cmd, DM_DMUB_WAIT_TYPE_WAIT);
+       dc_wake_and_execute_dmub_cmd(dc, &cmd, DM_DMUB_WAIT_TYPE_WAIT);
 
        return true;
 }