diff options
| author | Dave Airlie <airlied@redhat.com> | 2014-02-19 08:20:14 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2014-02-19 08:20:14 +1000 |
| commit | 560591f13e2f000977d887b31689f6b4d090ac4e (patch) | |
| tree | 83e381ab52bd5cdaa87d82b3a0ac9915f3ceecb9 /drivers/gpu/drm/cirrus/cirrus_main.c | |
| parent | c2288d4d3830946d91ae7aba599d34828d07f103 (diff) | |
| parent | 21ed4947fdfe19b60a27b84162622e56439c7937 (diff) | |
Merge branch 'drm-fixes-3.14' of git://people.freedesktop.org/~agd5f/linux into drm-fixes
Fix for 128x128 cursors, along with some misc fixes.
* 'drm-fixes-3.14' of git://people.freedesktop.org/~agd5f/linux:
drm/radeon/ni: fix typo in dpm sq ramping setup
drm/radeon/si: fix typo in dpm sq ramping setup
drm/radeon: fix CP semaphores on CIK
drm/radeon: delete a stray tab
drm/radeon: fix display tiling setup on SI
drm/radeon/dpm: reduce r7xx vblank mclk threshold to 200
drm/radeon: fill in DRM_CAPs for cursor size
drm: add DRM_CAPs for cursor size
drm/radeon: unify bpc handling
Diffstat (limited to 'drivers/gpu/drm/cirrus/cirrus_main.c')
0 files changed, 0 insertions, 0 deletions