diff options
| author | Dave Airlie <airlied@redhat.com> | 2014-01-21 10:26:50 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2014-01-21 10:26:50 +1000 |
| commit | 8c9b2e322d5c9b4e77fd308984ea303de4b63e1c (patch) | |
| tree | 707c3d6731c78f8d1d50d7e0a24898b3ad428020 /drivers/gpu/drm/omapdrm/omap_plane.c | |
| parent | cfd72a4c2089aa3938f37281a34d6eb3306d5fd8 (diff) | |
| parent | 5d029339bb8ce69aeb68280c3de67d3cea456146 (diff) | |
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
...
Diffstat (limited to 'drivers/gpu/drm/omapdrm/omap_plane.c')
0 files changed, 0 insertions, 0 deletions