diff options
| author |   Dave Airlie <airlied@redhat.com> | 2015-06-19 11:55:29 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2015-06-19 11:55:29 +1000 |
| commit | 031fea43670c265a55aa5037dd08f8d5a10d2803 (patch) | |
| tree | 760f4476788856c7f20fcafc14a1d12db2761f91 /include | |
| parent | drm/mgag200: Reject non-character-cell-aligned mode widths (diff) | |
| parent | drm/radeon: don't probe MST on hw we don't support it on (diff) | |
| download | linux-dev-031fea43670c265a55aa5037dd08f8d5a10d2803.tar.xz linux-dev-031fea43670c265a55aa5037dd08f8d5a10d2803.zip | |
Merge branch 'drm-fixes-4.1' of git://people.freedesktop.org/~deathsimple/linux into drm-fixes
two radeon fixes
one MST fix,
one query addition, destined for stable, and to fix a regression
* 'drm-fixes-4.1' of git://people.freedesktop.org/~deathsimple/linux:
drm/radeon: don't probe MST on hw we don't support it on
drm/radeon: Add RADEON_INFO_VA_UNMAP_WORKING query
Diffstat (limited to 'include')
| -rw-r--r-- | include/uapi/drm/radeon_drm.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/uapi/drm/radeon_drm.h b/include/uapi/drm/radeon_drm.h index 871e73f99a4d..94d44ab2fda1 100644 --- a/include/uapi/drm/radeon_drm.h +++ b/include/uapi/drm/radeon_drm.h @@ -1038,6 +1038,7 @@ struct drm_radeon_cs { #define RADEON_INFO_CURRENT_GPU_SCLK 0x22 #define RADEON_INFO_CURRENT_GPU_MCLK 0x23 #define RADEON_INFO_READ_REG 0x24 +#define RADEON_INFO_VA_UNMAP_WORKING 0x25 struct drm_radeon_info { uint32_t request; |