Skip to content

Commit e931c98

Browse files
Wayne Linsmb49
authored andcommitted
drm/amd/display: Copy AUX read reply data whenever length > 0
BugLink: https://bugs.launchpad.net/bugs/2115252 commit 3924f45d4de7250a603fd7b50379237a6a0e5adf upstream. [Why] amdgpu_dm_process_dmub_aux_transfer_sync() should return all exact data reply from the sink side. Don't do the analysis job in it. [How] Remove unnecessary check condition AUX_TRANSACTION_REPLY_AUX_ACK. Fixes: ead08b9 ("drm/amd/display: Fix race condition in DPIA AUX transfer") Cc: Mario Limonciello <mario.limonciello@amd.com> Cc: Alex Deucher <alexander.deucher@amd.com> Reviewed-by: Ray Wu <ray.wu@amd.com> Signed-off-by: Wayne Lin <Wayne.Lin@amd.com> Signed-off-by: Ray Wu <ray.wu@amd.com> Tested-by: Daniel Wheeler <daniel.wheeler@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com> (cherry picked from commit 9b540e3fe6796fec4fb1344f3be8952fc2f084d4) Cc: stable@vger.kernel.org Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Signed-off-by: Manuel Diewald <manuel.diewald@canonical.com> Signed-off-by: Stefan Bader <stefan.bader@canonical.com>
1 parent dd9aeed commit e931c98

File tree

1 file changed

+1
-2
lines changed

1 file changed

+1
-2
lines changed

drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12632,8 +12632,7 @@ int amdgpu_dm_process_dmub_aux_transfer_sync(
1263212632
/* The reply is stored in the top nibble of the command. */
1263312633
payload->reply[0] = (adev->dm.dmub_notify->aux_reply.command >> 4) & 0xF;
1263412634

12635-
if (!payload->write && p_notify->aux_reply.length &&
12636-
(payload->reply[0] == AUX_TRANSACTION_REPLY_AUX_ACK))
12635+
if (!payload->write && p_notify->aux_reply.length)
1263712636
memcpy(payload->data, p_notify->aux_reply.data,
1263812637
p_notify->aux_reply.length);
1263912638

0 commit comments

Comments
 (0)