Code Review
/
kvmfornfv.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
These changes are a raw update to a vanilla kernel 4.1.10, with the
[kvmfornfv.git]
/
kernel
/
drivers
/
gpu
/
drm
/
radeon
/
radeon_dp_auxch.c
diff --git
a/kernel/drivers/gpu/drm/radeon/radeon_dp_auxch.c
b/kernel/drivers/gpu/drm/radeon/radeon_dp_auxch.c
index
fcbd60b
..
3b0c229
100644
(file)
--- a/
kernel/drivers/gpu/drm/radeon/radeon_dp_auxch.c
+++ b/
kernel/drivers/gpu/drm/radeon/radeon_dp_auxch.c
@@
-116,8
+116,8
@@
radeon_dp_aux_transfer_native(struct drm_dp_aux *aux, struct drm_dp_aux_msg *msg
AUX_SW_WR_BYTES(bytes));
/* write the data header into the registers */
AUX_SW_WR_BYTES(bytes));
/* write the data header into the registers */
- /* request, addres, msg size */
- byte = (msg->request << 4);
+ /* request, addres
s
, msg size */
+ byte = (msg->request << 4)
| ((msg->address >> 16) & 0xf)
;
WREG32(AUX_SW_DATA + aux_offset[instance],
AUX_SW_DATA_MASK(byte) | AUX_SW_AUTOINCREMENT_DISABLE);
WREG32(AUX_SW_DATA + aux_offset[instance],
AUX_SW_DATA_MASK(byte) | AUX_SW_AUTOINCREMENT_DISABLE);