Skip to content

Commit 81b5c6f

Browse files
Wayne Linalexdeucher
authored andcommitted
drm/amd/display: Remove incorrect checking in dmub aux handler
[Why & How] "Request length != reply length" is expected behavior defined in spec. It's not an invalid reply. Besides, replied data handling logic is not designed to be written in amdgpu_dm_process_dmub_aux_transfer_sync(). Remove the incorrectly handling section. Fixes: ead08b9 ("drm/amd/display: Fix race condition in DPIA AUX transfer") Cc: Mario Limonciello <[email protected]> Cc: Alex Deucher <[email protected]> Reviewed-by: Ray Wu <[email protected]> Signed-off-by: Wayne Lin <[email protected]> Signed-off-by: Ray Wu <[email protected]> Tested-by: Daniel Wheeler <[email protected]> Signed-off-by: Alex Deucher <[email protected]>
1 parent 1db6c9e commit 81b5c6f

File tree

1 file changed

+1
-11
lines changed

1 file changed

+1
-11
lines changed

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

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -12854,19 +12854,9 @@ int amdgpu_dm_process_dmub_aux_transfer_sync(
1285412854
payload->reply[0] = (adev->dm.dmub_notify->aux_reply.command >> 4) & 0xF;
1285512855

1285612856
if (!payload->write && p_notify->aux_reply.length &&
12857-
(payload->reply[0] == AUX_TRANSACTION_REPLY_AUX_ACK)) {
12858-
12859-
if (payload->length != p_notify->aux_reply.length) {
12860-
drm_warn(adev_to_drm(adev), "invalid read length %d from DPIA AUX 0x%x(%d)!\n",
12861-
p_notify->aux_reply.length,
12862-
payload->address, payload->length);
12863-
*operation_result = AUX_RET_ERROR_INVALID_REPLY;
12864-
goto out;
12865-
}
12866-
12857+
(payload->reply[0] == AUX_TRANSACTION_REPLY_AUX_ACK))
1286712858
memcpy(payload->data, p_notify->aux_reply.data,
1286812859
p_notify->aux_reply.length);
12869-
}
1287012860

1287112861
/* success */
1287212862
ret = p_notify->aux_reply.length;

0 commit comments

Comments
 (0)