diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2015-10-07 11:24:27 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2015-10-07 11:24:27 +1100 |
| commit | 29461e7068b3eb618078e87aaaf1e0fca3a77e7c (patch) | |
| tree | 7c5d412f05486ec14e693c66f4c0b79b62e3ba2e /include/uapi | |
| parent | f5d39e3f163ae227d6dd7916e1424bd9f4cbb296 (diff) | |
| parent | dcf07a2b492b0efd400d858bc9a15f26a5c22fc2 (diff) | |
Merge remote-tracking branch 'drm-intel/for-linux-next'
Diffstat (limited to 'include/uapi')
| -rw-r--r-- | include/uapi/drm/i915_drm.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/uapi/drm/i915_drm.h b/include/uapi/drm/i915_drm.h index fd5aa47bd689..484a9fb20479 100644 --- a/include/uapi/drm/i915_drm.h +++ b/include/uapi/drm/i915_drm.h @@ -690,7 +690,8 @@ struct drm_i915_gem_exec_object2 { #define EXEC_OBJECT_NEEDS_FENCE (1<<0) #define EXEC_OBJECT_NEEDS_GTT (1<<1) #define EXEC_OBJECT_WRITE (1<<2) -#define __EXEC_OBJECT_UNKNOWN_FLAGS -(EXEC_OBJECT_WRITE<<1) +#define EXEC_OBJECT_SUPPORTS_48B_ADDRESS (1<<3) +#define __EXEC_OBJECT_UNKNOWN_FLAGS -(EXEC_OBJECT_SUPPORTS_48B_ADDRESS<<1) __u64 flags; __u64 rsvd1; |