diff options
author | Takashi Iwai <tiwai@suse.de> | 2010-06-02 14:18:06 +0200 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2010-06-02 14:18:06 +0200 |
commit | c7a441bba9de3b4e166b6a4449208bc906d70558 (patch) | |
tree | 346fdf11e464c8201a9aaa8abdd1c1b6dc4f86e0 /include/drm | |
parent | ead54d878465291746c91c95749990d62742a6cf (diff) | |
parent | e4caa8bab3862a7694ab7c6dfede223227ad7fc5 (diff) | |
download | linux-c7a441bba9de3b4e166b6a4449208bc906d70558.tar.bz2 |
Merge branch 'fix/hda' into for-linus
Diffstat (limited to 'include/drm')
-rw-r--r-- | include/drm/i915_drm.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/include/drm/i915_drm.h b/include/drm/i915_drm.h index b64a8d7cdf6d..7f0028e1010b 100644 --- a/include/drm/i915_drm.h +++ b/include/drm/i915_drm.h @@ -275,6 +275,7 @@ typedef struct drm_i915_irq_wait { #define I915_PARAM_HAS_OVERLAY 7 #define I915_PARAM_HAS_PAGEFLIPPING 8 #define I915_PARAM_HAS_EXECBUF2 9 +#define I915_PARAM_HAS_BSD 10 typedef struct drm_i915_getparam { int param; @@ -616,7 +617,9 @@ struct drm_i915_gem_execbuffer2 { __u32 num_cliprects; /** This is a struct drm_clip_rect *cliprects */ __u64 cliprects_ptr; - __u64 flags; /* currently unused */ +#define I915_EXEC_RENDER (1<<0) +#define I915_EXEC_BSD (1<<1) + __u64 flags; __u64 rsvd1; __u64 rsvd2; }; |