Skip to content

Commit 396dc51

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]> (cherry picked from commit 81b5c6f) Cc: [email protected]
1 parent bc70e11 commit 396dc51

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
@@ -12764,19 +12764,9 @@ int amdgpu_dm_process_dmub_aux_transfer_sync(
1276412764
payload->reply[0] = (adev->dm.dmub_notify->aux_reply.command >> 4) & 0xF;
1276512765

1276612766
if (!payload->write && p_notify->aux_reply.length &&
12767-
(payload->reply[0] == AUX_TRANSACTION_REPLY_AUX_ACK)) {
12768-
12769-
if (payload->length != p_notify->aux_reply.length) {
12770-
DRM_WARN("invalid read length %d from DPIA AUX 0x%x(%d)!\n",
12771-
p_notify->aux_reply.length,
12772-
payload->address, payload->length);
12773-
*operation_result = AUX_RET_ERROR_INVALID_REPLY;
12774-
goto out;
12775-
}
12776-
12767+
(payload->reply[0] == AUX_TRANSACTION_REPLY_AUX_ACK))
1277712768
memcpy(payload->data, p_notify->aux_reply.data,
1277812769
p_notify->aux_reply.length);
12779-
}
1278012770

1278112771
/* success */
1278212772
ret = p_notify->aux_reply.length;

0 commit comments

Comments
 (0)