Hi Dave,
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
The following changes since commit 7a42e83d36d2d0a68622320900dc4e880b1d920a:
Merge branch 'for-airlied-next' of git://people.freedesktop.org/~mlankhorst/linux into drm-next (2014-10-01 19:27:38 +1000)
are available in the git repository at:
git://people.freedesktop.org/~agd5f/linux drm-next-3.18
for you to fetch changes up to 369283bfbd953a5d34c919746b3587737c0a47c8:
drm/radeon/kv: add uvd/vce info to dpm debugfs output (2014-10-03 09:19:18 -0400)
---------------------------------------------------------------- Alex Deucher (15): drm/radeon: fix register name to match internal name drm/radeon: consolidate duplicate encode is digital function drm/radeon: consolidate r600_audio.c into r600_hdmi.c drm/radeon: split audio enable between eg and r600 (v2) drm/radeon: disable audio when we disable hdmi (v2) drm/radeon/dpm: drop clk/voltage dependency filters for NI drm/radeon/dpm: drop clk/voltage dependency filters for SI drm/radeon/dpm: drop clk/voltage dependency filters for CI drm/radeon/dpm: drop clk/voltage dependency filters for BTC drm/radeon: drop btc_get_max_clock_from_voltage_dependency_table drm/radeon: remove unecessary includes drm/radeon/si: print full CS when we hit a packet 0 drm/radeon/cik: write gfx ucode version to ucode addr reg drm/radeon/ci: add uvd/vce info to dpm debugfs output drm/radeon/kv: add uvd/vce info to dpm debugfs output
Maarten Lankhorst (3): drm/radeon: cope with foreign fences inside display drm/radeon: cope with foreign fences inside the reservation object drm/radeon: export reservation_object from dmabuf to ttm
Michele Curti (2): drm/radeon/atombios: declare connector convert tables as static drm/radeon/combios: declare legacy_connector_convert as static
drivers/gpu/drm/radeon/Makefile | 2 +- drivers/gpu/drm/radeon/atombios_encoders.c | 23 ---- drivers/gpu/drm/radeon/btc_dpm.c | 51 ------- drivers/gpu/drm/radeon/btc_dpm.h | 2 - drivers/gpu/drm/radeon/ci_dpm.c | 30 +---- drivers/gpu/drm/radeon/cik.c | 23 ++-- drivers/gpu/drm/radeon/cik_sdma.c | 2 +- drivers/gpu/drm/radeon/dce3_1_afmt.c | 4 +- drivers/gpu/drm/radeon/dce6_afmt.c | 6 +- drivers/gpu/drm/radeon/evergreen.c | 7 +- drivers/gpu/drm/radeon/evergreen_dma.c | 2 +- drivers/gpu/drm/radeon/evergreen_hdmi.c | 49 ++++++- drivers/gpu/drm/radeon/kv_dpm.c | 2 + drivers/gpu/drm/radeon/ni_dpm.c | 24 ---- drivers/gpu/drm/radeon/r600.c | 6 +- drivers/gpu/drm/radeon/r600_audio.c | 207 ----------------------------- drivers/gpu/drm/radeon/r600_dma.c | 2 +- drivers/gpu/drm/radeon/r600_hdmi.c | 172 +++++++++++++++++++++++- drivers/gpu/drm/radeon/r600d.h | 17 +++ drivers/gpu/drm/radeon/radeon.h | 13 +- drivers/gpu/drm/radeon/radeon_asic.h | 1 - drivers/gpu/drm/radeon/radeon_atombios.c | 6 +- drivers/gpu/drm/radeon/radeon_benchmark.c | 4 +- drivers/gpu/drm/radeon/radeon_combios.c | 2 +- drivers/gpu/drm/radeon/radeon_cs.c | 28 +++- drivers/gpu/drm/radeon/radeon_device.c | 2 +- drivers/gpu/drm/radeon/radeon_display.c | 30 +++-- drivers/gpu/drm/radeon/radeon_encoders.c | 21 +++ drivers/gpu/drm/radeon/radeon_fence.c | 9 ++ drivers/gpu/drm/radeon/radeon_gart.c | 2 +- drivers/gpu/drm/radeon/radeon_gem.c | 2 +- drivers/gpu/drm/radeon/radeon_mode.h | 1 + drivers/gpu/drm/radeon/radeon_object.c | 8 +- drivers/gpu/drm/radeon/radeon_object.h | 1 + drivers/gpu/drm/radeon/radeon_prime.c | 5 +- drivers/gpu/drm/radeon/radeon_ring.c | 2 +- drivers/gpu/drm/radeon/radeon_sa.c | 2 +- drivers/gpu/drm/radeon/radeon_semaphore.c | 29 +++- drivers/gpu/drm/radeon/radeon_test.c | 5 +- drivers/gpu/drm/radeon/radeon_ttm.c | 2 +- drivers/gpu/drm/radeon/radeon_uvd.c | 3 +- drivers/gpu/drm/radeon/radeon_vce.c | 3 +- drivers/gpu/drm/radeon/radeon_vm.c | 9 +- drivers/gpu/drm/radeon/rv770.c | 1 - drivers/gpu/drm/radeon/rv770_dma.c | 2 +- drivers/gpu/drm/radeon/si.c | 8 +- drivers/gpu/drm/radeon/si_dma.c | 2 +- drivers/gpu/drm/radeon/si_dpm.c | 24 ---- drivers/gpu/drm/radeon/sid.h | 2 +- 49 files changed, 408 insertions(+), 452 deletions(-) delete mode 100644 drivers/gpu/drm/radeon/r600_audio.c