diff options
author | Dave Airlie <airlied@gmail.com> | 2014-04-19 11:16:02 +1000 |
---|---|---|
committer | Dave Airlie <airlied@gmail.com> | 2014-04-19 11:16:02 +1000 |
commit | a42892ed10585c5511e8a3e53f0350b4e2242050 (patch) | |
tree | 75cc2ac053bd81a441e083a970a39a58691a8667 /include/drm | |
parent | c044330baa91b6885597cfaaa58b00b6aa690958 (diff) | |
parent | 8902e6f2b832e00e10c6f9e9532f6f63feb4972f (diff) | |
download | talos-obmc-linux-a42892ed10585c5511e8a3e53f0350b4e2242050.tar.gz talos-obmc-linux-a42892ed10585c5511e8a3e53f0350b4e2242050.zip |
Merge branch 'drm-next-3.15-wip' of git://people.freedesktop.org/~deathsimple/linux into drm-next
Some i2c fixes over DisplayPort.
* 'drm-next-3.15-wip' of git://people.freedesktop.org/~deathsimple/linux:
drm/radeon: Improve vramlimit module param documentation
drm/radeon: fix audio pin counts for DCE6+ (v2)
drm/radeon/dp: switch to the common i2c over aux code
drm/dp/i2c: Update comments about common i2c over dp assumptions (v3)
drm/dp/i2c: send bare addresses to properly reset i2c connections (v4)
drm/radeon/dp: handle zero sized i2c over aux transactions (v2)
drm/i915: support address only i2c-over-aux transactions
drm/tegra: dp: Support address-only I2C-over-AUX transactions
Diffstat (limited to 'include/drm')
-rw-r--r-- | include/drm/drm_dp_helper.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/include/drm/drm_dp_helper.h b/include/drm/drm_dp_helper.h index b4f58914bf7d..cfcacec5b89d 100644 --- a/include/drm/drm_dp_helper.h +++ b/include/drm/drm_dp_helper.h @@ -456,6 +456,10 @@ struct drm_dp_aux_msg { * transactions. The drm_dp_aux_register_i2c_bus() function registers an * I2C adapter that can be passed to drm_probe_ddc(). Upon removal, drivers * should call drm_dp_aux_unregister_i2c_bus() to remove the I2C adapter. + * + * Note that the aux helper code assumes that the .transfer() function + * only modifies the reply field of the drm_dp_aux_msg structure. The + * retry logic and i2c helpers assume this is the case. */ struct drm_dp_aux { const char *name; |