diff options
| author |   Leo (Sunpeng) Li <sunpeng.li@amd.com> | 2018-06-26 10:50:16 -0400 |
|---|---|---|
| committer |   Alex Deucher <alexander.deucher@amd.com> | 2018-07-13 14:50:52 -0500 |
| commit | edf6ffe4f47e6749cfd45c1489feea2dbb0041c7 (patch) | |
| tree | b87b54b64ff81df701c227f49e44dd2d156d4006 /drivers/gpu/drm/amd/display/dc/core/dc_link_ddc.c | |
| parent | drm/amd/display: Right shift AUX reply value sooner than later (diff) | |
| download | linux-dev-edf6ffe4f47e6749cfd45c1489feea2dbb0041c7.tar.xz linux-dev-edf6ffe4f47e6749cfd45c1489feea2dbb0041c7.zip | |
drm/amd/display: Read AUX channel even if only status byte is returned
[Why]
get_channel_status() can return 0 in returned_bytes, and report a
successful operation result. This is because it prunes the first status
byte out. This was preventing read_channel_reply() from being called
(due to the faulty condition), and consequently preventing the AUX
reply status from being set.
[How]
Fix the conditional so that it accounts for when get_channel_status()
returns 0 bytes read.
[Fixes]
Fixes possible edid read failures during S3 resume, where we are now
relying on DRM's DP AUX handling. This was an regression introduced by:
Author: Harry Wentland <harry.wentland@amd.com>
drm/amd/display: Return aux replies directly to DRM
Signed-off-by: Leo (Sunpeng) Li <sunpeng.li@amd.com>
Reviewed-by: Harry Wentland <Harry.Wentland@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'drivers/gpu/drm/amd/display/dc/core/dc_link_ddc.c')
| -rw-r--r-- | drivers/gpu/drm/amd/display/dc/core/dc_link_ddc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/amd/display/dc/core/dc_link_ddc.c b/drivers/gpu/drm/amd/display/dc/core/dc_link_ddc.c index d108ccfc5cf9..08c9d73b9ab7 100644 --- a/drivers/gpu/drm/amd/display/dc/core/dc_link_ddc.c +++ b/drivers/gpu/drm/amd/display/dc/core/dc_link_ddc.c @@ -671,7 +671,7 @@ int dc_link_aux_transfer(struct ddc_service *ddc, case AUX_CHANNEL_OPERATION_SUCCEEDED: res = returned_bytes; - if (res <= size && res > 0) + if (res <= size && res >= 0) res = engine->funcs->read_channel_reply(engine, size, buffer, reply, &status); |