diff options
| author | Dave Airlie <airlied@redhat.com> | 2016-11-17 09:43:56 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2016-11-17 09:43:56 +1000 |
| commit | b7c0e47d98249c2ddf21ea197b651093c6aaee00 (patch) | |
| tree | 2209b84a346d987d65332016738a488ef1501b82 /include | |
| parent | 25bfe018c1c57955e763ebfa2c1fa54283e426e9 (diff) | |
| parent | c778cc5df944291dcdb1ca7a6bb781fbc22550c5 (diff) | |
Merge tag 'drm-vc4-next-2016-11-16' of https://github.com/anholt/linux into drm-next
This pull request brings in fragment shader threading and ETC1 support
for vc4.
Diffstat (limited to 'include')
| -rw-r--r-- | include/uapi/drm/vc4_drm.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/uapi/drm/vc4_drm.h b/include/uapi/drm/vc4_drm.h index ad7edc3edf7c..f07a09016726 100644 --- a/include/uapi/drm/vc4_drm.h +++ b/include/uapi/drm/vc4_drm.h @@ -286,6 +286,8 @@ struct drm_vc4_get_hang_state { #define DRM_VC4_PARAM_V3D_IDENT1 1 #define DRM_VC4_PARAM_V3D_IDENT2 2 #define DRM_VC4_PARAM_SUPPORTS_BRANCHES 3 +#define DRM_VC4_PARAM_SUPPORTS_ETC1 4 +#define DRM_VC4_PARAM_SUPPORTS_THREADED_FS 5 struct drm_vc4_get_param { __u32 param; |