diff options
author | Dave Airlie <airlied@redhat.com> | 2014-10-07 04:26:40 (GMT) |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2014-10-07 04:26:40 (GMT) |
commit | ccb09a8e36b64a4d161dd61d4066a5c54181615b (patch) | |
tree | 203617ce94b249d1c8f8cd5da257cc622d199741 /drivers/gpu/drm/i915/intel_display.c | |
parent | 7a42e83d36d2d0a68622320900dc4e880b1d920a (diff) | |
parent | 369283bfbd953a5d34c919746b3587737c0a47c8 (diff) | |
download | linux-ccb09a8e36b64a4d161dd61d4066a5c54181615b.tar.xz |
Merge branch 'drm-next-3.18' of git://people.freedesktop.org/~agd5f/linux into drm-next
It looks like you missed my last 3.18 pull from 9/24. This one
includes those patches and a few more on top. The additional patches are:
- Maarten's radeon fence updates
- Some additional debugging output
From the previous pull request:
- Re-enable some dpm features that were previously disabled due
to a bug that was fixed in 3.16
- Make some arrays static
- re-arrange some audio code to properly reflect connected status
in the audio driver
* 'drm-next-3.18' of git://people.freedesktop.org/~agd5f/linux:
drm/radeon/kv: add uvd/vce info to dpm debugfs output
drm/radeon/ci: add uvd/vce info to dpm debugfs output
drm/radeon: export reservation_object from dmabuf to ttm
drm/radeon: cope with foreign fences inside the reservation object
drm/radeon: cope with foreign fences inside display
drm/radeon/cik: write gfx ucode version to ucode addr reg
drm/radeon/si: print full CS when we hit a packet 0
drm/radeon: remove unecessary includes
drm/radeon/combios: declare legacy_connector_convert as static
drm/radeon/atombios: declare connector convert tables as static
drm/radeon: drop btc_get_max_clock_from_voltage_dependency_table
drm/radeon/dpm: drop clk/voltage dependency filters for BTC
drm/radeon/dpm: drop clk/voltage dependency filters for CI
drm/radeon/dpm: drop clk/voltage dependency filters for SI
drm/radeon/dpm: drop clk/voltage dependency filters for NI
drm/radeon: disable audio when we disable hdmi (v2)
drm/radeon: split audio enable between eg and r600 (v2)
drm/radeon: consolidate r600_audio.c into r600_hdmi.c
drm/radeon: consolidate duplicate encode is digital function
drm/radeon: fix register name to match internal name
Diffstat (limited to 'drivers/gpu/drm/i915/intel_display.c')
0 files changed, 0 insertions, 0 deletions