[pull] radeon drm-next-3.15 (original) (raw)
Christian König deathsimple at vodafone.de
Tue Feb 18 10:32:26 PST 2014
- Previous message: [PATCH 1/2] drm/radeon: improve ring lockup detection code
- Next message: Multiple simultaneous masters?
- Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]
Hi Dave,
Just for a change I'm going to manage radeon patches for 3.15 instead of Alex, but before you start cheering he's probably back for 3.16.
So this is the initial pull request for radeon drm-next 3.15. Highlights:
- VCE bringup including DPM support
- Few cleanups for the ring handling code
The following changes since commit 1c61eae469e0d1d2fb9d7b77f51ca50c1f8f3ce9:
drm/radeon: fix CP semaphores on CIK (2014-02-18 11:30:59 +0100)
are available in the git repository at:
git://people.freedesktop.org/~deathsimple/linux drm-next-3.15
for you to fetch changes up to 82dc62a31ce3ed7b4eeea9c65a3b69e81e2ea688:
drm/radeon: cleanup false positive lockup handling (2014-02-18 17:50:07 +0100)
Alex Deucher (12): drm/radeon: add callback for setting vce clocks drm/radeon/dpm: move platform caps fetching to a separate function drm/radeon/dpm: fill in some initial vce infrastructure drm/radeon/dpm: fetch vce states from the vbios drm/radeon: fill in set_vce_clocks for CIK asics drm/radeon: add vce dpm support for CI drm/radeon: enable vce dpm on CI drm/radeon: add vce dpm support for KV/KB drm/radeon/dpm: enable dynamic vce state switching v2 drm/radeon/dpm: properly enable/disable vce when vce pg is enabled drm/radeon: add support for vce 2.0 clock gating drm/radeon/cik: enable/disable vce cg when encoding v2
Christian König (6): drm/radeon: initial VCE support v4 drm/radeon: add VCE ring query drm/radeon: add VCE version parsing and checking drm/radeon: drop drivers copy of the rptr drm/radeon: drop radeon_ring_force_activity drm/radeon: cleanup false positive lockup handling
drivers/gpu/drm/radeon/Makefile | 6 + drivers/gpu/drm/radeon/btc_dpm.c | 4 + drivers/gpu/drm/radeon/ci_dpm.c | 67 ++++++++-- drivers/gpu/drm/radeon/cik.c | 109 +++++++++++++++- drivers/gpu/drm/radeon/cik_sdma.c | 6 +- drivers/gpu/drm/radeon/cikd.h | 49 +++++++ drivers/gpu/drm/radeon/cypress_dpm.c | 4 + drivers/gpu/drm/radeon/evergreen.c | 6 +- drivers/gpu/drm/radeon/evergreen_dma.c | 4 +- drivers/gpu/drm/radeon/kv_dpm.c | 64 +++++++--- drivers/gpu/drm/radeon/ni.c | 8 +- drivers/gpu/drm/radeon/ni_dma.c | 6 +- drivers/gpu/drm/radeon/ni_dpm.c | 7 +- drivers/gpu/drm/radeon/r100.c | 5 +- drivers/gpu/drm/radeon/r600.c | 6 +- drivers/gpu/drm/radeon/r600_dma.c | 6 +- drivers/gpu/drm/radeon/r600_dpm.c | 48 ++++++- drivers/gpu/drm/radeon/r600_dpm.h | 2 + drivers/gpu/drm/radeon/radeon.h | 96 ++++++++++++-- drivers/gpu/drm/radeon/radeon_asic.c | 19 +++ drivers/gpu/drm/radeon/radeon_asic.h | 14 ++ drivers/gpu/drm/radeon/radeon_cs.c | 7 + drivers/gpu/drm/radeon/radeon_kms.c | 10 ++ drivers/gpu/drm/radeon/radeon_pm.c | 25 ++++ drivers/gpu/drm/radeon/radeon_ring.c | 74 +++-------- drivers/gpu/drm/radeon/radeon_test.c | 39 +++++- drivers/gpu/drm/radeon/radeon_vce.c | 694 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ drivers/gpu/drm/radeon/rs780_dpm.c | 7 +- drivers/gpu/drm/radeon/rv6xx_dpm.c | 7 +- drivers/gpu/drm/radeon/rv770_dpm.c | 7 +- drivers/gpu/drm/radeon/si.c | 10 +- drivers/gpu/drm/radeon/si_dma.c | 4 +- drivers/gpu/drm/radeon/si_dpm.c | 7 +- drivers/gpu/drm/radeon/sid.h | 47 +++++++ drivers/gpu/drm/radeon/sumo_dpm.c | 7 +- drivers/gpu/drm/radeon/trinity_dpm.c | 7 +- drivers/gpu/drm/radeon/uvd_v1_0.c | 2 +- drivers/gpu/drm/radeon/vce_v1_0.c | 187 +++++++++++++++++++++++++++ drivers/gpu/drm/radeon/vce_v2_0.c | 181 ++++++++++++++++++++++++++ include/uapi/drm/radeon_drm.h | 5 + 40 files changed, 1688 insertions(+), 175 deletions(-) create mode 100644 drivers/gpu/drm/radeon/radeon_vce.c create mode 100644 drivers/gpu/drm/radeon/vce_v1_0.c create mode 100644 drivers/gpu/drm/radeon/vce_v2_0.c
-------------- next part -------------- An HTML attachment was scrubbed... URL: <http://lists.freedesktop.org/archives/dri-devel/attachments/20140218/05490dc1/attachment-0001.html>
- Previous message: [PATCH 1/2] drm/radeon: improve ring lockup detection code
- Next message: Multiple simultaneous masters?
- Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]