diff options
author | Chris Metcalf <cmetcalf@tilera.com> | 2010-06-25 14:38:16 -0400 |
---|---|---|
committer | Chris Metcalf <cmetcalf@tilera.com> | 2010-06-25 14:38:16 -0400 |
commit | 9c78965ca18594fe0a34a1a1b13781b10f85e4bc (patch) | |
tree | 60c9e83d3c2b56e3c7f5169b63577a72bf7ddb57 /include/drm/radeon_drm.h | |
parent | 139ef32b0e6b88b00b5e3e74d052d938f178dc9b (diff) | |
parent | 7e27d6e778cd87b6f2415515d7127eba53fe5d02 (diff) | |
download | kernel_samsung_espresso10-9c78965ca18594fe0a34a1a1b13781b10f85e4bc.zip kernel_samsung_espresso10-9c78965ca18594fe0a34a1a1b13781b10f85e4bc.tar.gz kernel_samsung_espresso10-9c78965ca18594fe0a34a1a1b13781b10f85e4bc.tar.bz2 |
Merge branch 'master' into for-linus
Diffstat (limited to 'include/drm/radeon_drm.h')
-rw-r--r-- | include/drm/radeon_drm.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/drm/radeon_drm.h b/include/drm/radeon_drm.h index 3ff9fc0..5347063 100644 --- a/include/drm/radeon_drm.h +++ b/include/drm/radeon_drm.h @@ -903,6 +903,7 @@ struct drm_radeon_cs { #define RADEON_INFO_NUM_Z_PIPES 0x02 #define RADEON_INFO_ACCEL_WORKING 0x03 #define RADEON_INFO_CRTC_FROM_ID 0x04 +#define RADEON_INFO_ACCEL_WORKING2 0x05 struct drm_radeon_info { uint32_t request; |