Hi Dave, New tree with the INFO ioctl merge fixed up. This also adds a couple of additional minor fixes. The following changes since commit cfd72a4c2089aa3938f37281a34d6eb3306d5fd8: Merge branch 'drm-intel-next' of git://people.freedesktop.org/~danvet/drm-intel into drm-next (2014-01-20 10:21:54 +1000) are available in the git repository at: git://people.freedesktop.org/~agd5f/linux drm-next-3.14 for you to fetch changes up to 5d029339bb8ce69aeb68280c3de67d3cea456146: drm/radeon: add UVD support for OLAND (2014-01-20 18:20:58 -0500) ---------------------------------------------------------------- Alex Deucher (21): Revert "drm/radeon: disable CIK CP semaphores for now" drm/radeon: consolidate cp hdp flushing code for CIK drm/radeon: consolidate sdma hdp flushing code for CIK drm/radeon/cik: use POLL_REG_MEM special op for sDMA HDP flush drm/radeon/cik: use WAIT_REG_MEM special op for CP HDP flush drm/radeon: disable dpm on BTC drm/radeon/cik: use hw defaults for TC_CFG registers drm/radeon: disable ss on DP for DCE3.x drm/radeon/dp: bump i2c-over-aux retries to 7 drm/radeon/dp: use usleep_range rather than udelay drm/radeon/dp: sleep after powering up the display drm/radeon: add query to fetch the max engine clock (v2) drm/radeon: handle ss percentage divider properly drm/radeon: bail early from enable ss in certain cases drm/radeon: write gfx pg bases even when gfx pg is disabled drm/radeon: fix endian handling in radeon_atom_init_mc_reg_table drm/radeon/dpm: disable mclk switching on desktop RV770 drm/radeon: fix surface sync in fence on cayman (v2) drm/radeon: set the full cache bit for fences on r7xx+ drm/radeon: fix minor typos in si_dpm.c drm/radeon: add UVD support for OLAND Christian König (1): drm/radeon: don't power gate paused UVD streams drivers/gpu/drm/radeon/atombios_crtc.c | 32 +++++++---- drivers/gpu/drm/radeon/atombios_dp.c | 18 +++--- drivers/gpu/drm/radeon/cik.c | 95 ++++++++++++++++---------------- drivers/gpu/drm/radeon/cik_sdma.c | 43 +++++++++++---- drivers/gpu/drm/radeon/ni.c | 16 +++--- drivers/gpu/drm/radeon/nid.h | 1 + drivers/gpu/drm/radeon/r600.c | 13 +++-- drivers/gpu/drm/radeon/r600d.h | 1 + drivers/gpu/drm/radeon/radeon_atombios.c | 19 +++++-- drivers/gpu/drm/radeon/radeon_kms.c | 7 +++ drivers/gpu/drm/radeon/radeon_mode.h | 1 + drivers/gpu/drm/radeon/radeon_pm.c | 10 +++- drivers/gpu/drm/radeon/radeon_uvd.c | 3 + drivers/gpu/drm/radeon/rv770_dpm.c | 20 ++++--- drivers/gpu/drm/radeon/si.c | 3 + drivers/gpu/drm/radeon/si_dpm.c | 4 +- drivers/gpu/drm/radeon/uvd_v2_2.c | 1 + include/uapi/drm/radeon_drm.h | 2 + 18 files changed, 178 insertions(+), 111 deletions(-) _______________________________________________ dri-devel mailing list dri-devel@xxxxxxxxxxxxxxxxxxxxx http://lists.freedesktop.org/mailman/listinfo/dri-devel