Merge branch 'drm-next-3.14' of git://people.freedesktop.org/~agd5f/linux into drm-next
New tree with the INFO ioctl merge fixed up. This also adds a couple of additional minor fixes. A few more changes for 3.14, mostly just bug fixes. Note that: drm/radeon: add query to fetch the max engine clock. will conflict with 3.13 final, but the fix is pretty obvious. * 'drm-next-3.14' of git://people.freedesktop.org/~agd5f/linux: (22 commits) drm/radeon: add UVD support for OLAND drm/radeon: fix minor typos in si_dpm.c drm/radeon: set the full cache bit for fences on r7xx+ drm/radeon: fix surface sync in fence on cayman (v2) drm/radeon/dpm: disable mclk switching on desktop RV770 drm/radeon: fix endian handling in radeon_atom_init_mc_reg_table drm/radeon: write gfx pg bases even when gfx pg is disabled drm/radeon: bail early from enable ss in certain cases drm/radeon: handle ss percentage divider properly drm/radeon: add query to fetch the max engine clock (v2) drm/radeon/dp: sleep after powering up the display drm/radeon/dp: use usleep_range rather than udelay drm/radeon/dp: bump i2c-over-aux retries to 7 drm/radeon: disable ss on DP for DCE3.x drm/radeon/cik: use hw defaults for TC_CFG registers drm/radeon: disable dpm on BTC drm/radeon/cik: use WAIT_REG_MEM special op for CP HDP flush drm/radeon/cik: use POLL_REG_MEM special op for sDMA HDP flush drm/radeon: consolidate sdma hdp flushing code for CIK drm/radeon: consolidate cp hdp flushing code for CIK ...
No related branches found
No related tags found
Showing
- drivers/gpu/drm/radeon/atombios_crtc.c 21 additions, 11 deletionsdrivers/gpu/drm/radeon/atombios_crtc.c
- drivers/gpu/drm/radeon/atombios_dp.c 10 additions, 8 deletionsdrivers/gpu/drm/radeon/atombios_dp.c
- drivers/gpu/drm/radeon/cik.c 48 additions, 47 deletionsdrivers/gpu/drm/radeon/cik.c
- drivers/gpu/drm/radeon/cik_sdma.c 31 additions, 12 deletionsdrivers/gpu/drm/radeon/cik_sdma.c
- drivers/gpu/drm/radeon/ni.c 7 additions, 9 deletionsdrivers/gpu/drm/radeon/ni.c
- drivers/gpu/drm/radeon/nid.h 1 addition, 0 deletionsdrivers/gpu/drm/radeon/nid.h
- drivers/gpu/drm/radeon/r600.c 7 additions, 6 deletionsdrivers/gpu/drm/radeon/r600.c
- drivers/gpu/drm/radeon/r600d.h 1 addition, 0 deletionsdrivers/gpu/drm/radeon/r600d.h
- drivers/gpu/drm/radeon/radeon_atombios.c 14 additions, 5 deletionsdrivers/gpu/drm/radeon/radeon_atombios.c
- drivers/gpu/drm/radeon/radeon_kms.c 7 additions, 0 deletionsdrivers/gpu/drm/radeon/radeon_kms.c
- drivers/gpu/drm/radeon/radeon_mode.h 1 addition, 0 deletionsdrivers/gpu/drm/radeon/radeon_mode.h
- drivers/gpu/drm/radeon/radeon_pm.c 7 additions, 3 deletionsdrivers/gpu/drm/radeon/radeon_pm.c
- drivers/gpu/drm/radeon/radeon_uvd.c 3 additions, 0 deletionsdrivers/gpu/drm/radeon/radeon_uvd.c
- drivers/gpu/drm/radeon/rv770_dpm.c 12 additions, 8 deletionsdrivers/gpu/drm/radeon/rv770_dpm.c
- drivers/gpu/drm/radeon/si.c 3 additions, 0 deletionsdrivers/gpu/drm/radeon/si.c
- drivers/gpu/drm/radeon/si_dpm.c 2 additions, 2 deletionsdrivers/gpu/drm/radeon/si_dpm.c
- drivers/gpu/drm/radeon/uvd_v2_2.c 1 addition, 0 deletionsdrivers/gpu/drm/radeon/uvd_v2_2.c
- include/uapi/drm/radeon_drm.h 2 additions, 0 deletionsinclude/uapi/drm/radeon_drm.h
Loading
Please register or sign in to comment