diff options
| author | Dave Airlie <airlied@redhat.com> | 2014-02-18 17:20:14 -0500 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2014-02-18 17:20:14 -0500 |
| commit | 560591f13e2f000977d887b31689f6b4d090ac4e (patch) | |
| tree | 83e381ab52bd5cdaa87d82b3a0ac9915f3ceecb9 /include/uapi | |
| 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 'include/uapi')
| -rw-r--r-- | include/uapi/drm/drm.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/uapi/drm/drm.h b/include/uapi/drm/drm.h index 3c9a833992e8..b06c8ed68707 100644 --- a/include/uapi/drm/drm.h +++ b/include/uapi/drm/drm.h | |||
| @@ -619,6 +619,8 @@ struct drm_gem_open { | |||
| 619 | #define DRM_PRIME_CAP_EXPORT 0x2 | 619 | #define DRM_PRIME_CAP_EXPORT 0x2 |
| 620 | #define DRM_CAP_TIMESTAMP_MONOTONIC 0x6 | 620 | #define DRM_CAP_TIMESTAMP_MONOTONIC 0x6 |
| 621 | #define DRM_CAP_ASYNC_PAGE_FLIP 0x7 | 621 | #define DRM_CAP_ASYNC_PAGE_FLIP 0x7 |
| 622 | #define DRM_CAP_CURSOR_WIDTH 0x8 | ||
| 623 | #define DRM_CAP_CURSOR_HEIGHT 0x9 | ||
| 622 | 624 | ||
| 623 | /** DRM_IOCTL_GET_CAP ioctl argument type */ | 625 | /** DRM_IOCTL_GET_CAP ioctl argument type */ |
| 624 | struct drm_get_cap { | 626 | struct drm_get_cap { |