Merge branch 'drm-next-3.15' of git://people.freedesktop.org/~deathsimple/linux into drm-next

Browse source

this is the third pull request for 3.15 radeon changes. Highlights this time:
- More DP work from Alex, especially making use of the new DP aux helpers
- Marek's 1D and linear tiling fixes for CIK

* 'drm-next-3.15' of git://people.freedesktop.org/~deathsimple/linux:
  drm/radeon: set PIPE_CONFIG for 1D and linear tiling modes on CIK
  drm/radeon: use drm_dp_dpcd_read_link_status()
  drm/radeon: use the new drm helpers for dp aux
  drm/dp: make aux retries less chatty
  drm/radeon: clarify special handling in i2c over aux
  drm/radeon/atom: rework encoder enable/disable sequence
  drm/radeon/dp: move sink power control to a separate function
  drm/radeon/dp: use i2c_get_adapdata rather than casting

...

This commit is contained in:

Dave Airlie 2014-03-26 14:00:53 +10:00

parent 63ac07cdee 020ff54676

commit 23c73b24a0

7 changed files with 202 additions and 203 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

4

drivers/gpu/drm/drm_dp_helper.c

View file

264

drivers/gpu/drm/radeon/atombios_dp.c

View file

82

drivers/gpu/drm/radeon/atombios_encoders.c

View file

27

drivers/gpu/drm/radeon/cik.c

View file

17

drivers/gpu/drm/radeon/radeon_connectors.c

View file

3

drivers/gpu/drm/radeon/radeon_drv.c

View file

4

drivers/gpu/drm/radeon/radeon_mode.h

View file