diff options
| author | Yongqiang Sun | 2019-02-26 16:52:22 +0100 |
|---|---|---|
| committer | Alex Deucher | 2019-03-21 05:39:47 +0100 |
| commit | 335d5d7bbd3c4fe71ae765ad106d21b39ba85fd1 (patch) | |
| tree | 754ef6c93b3fb665ab886cf40097b6c046791b45 /drivers/gpu/drm/amd/display/dc/dce/dce_aux.c | |
| parent | drm/amd/display: Reset alpha state for planes to the correct values (diff) | |
| download | kernel-qcow2-linux-335d5d7bbd3c4fe71ae765ad106d21b39ba85fd1.tar.gz kernel-qcow2-linux-335d5d7bbd3c4fe71ae765ad106d21b39ba85fd1.tar.xz kernel-qcow2-linux-335d5d7bbd3c4fe71ae765ad106d21b39ba85fd1.zip | |
drm/amd/display: change generic_reg_wait to void.
we were only checking the return value in one place, thus changing
generic_reg_wait from int to void and reading the register instead of
getting it from generic_reg_wait, when we need the return value.
Signed-off-by: Yongqiang Sun <yongqiang.sun@amd.com>
Reviewed-by: Tony Cheng <Tony.Cheng@amd.com>
Acked-by: Bhawanpreet Lakha <Bhawanpreet.Lakha@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'drivers/gpu/drm/amd/display/dc/dce/dce_aux.c')
| -rw-r--r-- | drivers/gpu/drm/amd/display/dc/dce/dce_aux.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/gpu/drm/amd/display/dc/dce/dce_aux.c b/drivers/gpu/drm/amd/display/dc/dce/dce_aux.c index cdb3042e1ae1..937b5cffd7ef 100644 --- a/drivers/gpu/drm/amd/display/dc/dce/dce_aux.c +++ b/drivers/gpu/drm/amd/display/dc/dce/dce_aux.c @@ -317,9 +317,10 @@ static enum aux_channel_operation_result get_channel_status( *returned_bytes = 0; /* poll to make sure that SW_DONE is asserted */ - value = REG_WAIT(AUX_SW_STATUS, AUX_SW_DONE, 1, + REG_WAIT(AUX_SW_STATUS, AUX_SW_DONE, 1, 10, aux110->timeout_period/10); + value = REG_READ(AUX_SW_STATUS); /* in case HPD is LOW, exit AUX transaction */ if ((value & AUX_SW_STATUS__AUX_SW_HPD_DISCON_MASK)) return AUX_CHANNEL_OPERATION_FAILED_HPD_DISCON; |