summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2017-11-10 09:59:41 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2017-11-10 09:59:41 -0800
commit3e81277a6edd6b568c3a091a372dfe6368697b21 (patch)
treec3a4a2dc72a6b499d8c0f2a962d695bf300960c6 /include
parent1c9dbd4615fd751e5e0b99807a3c7c8612e28e20 (diff)
parent60ccb31bd680469ee0db92b0b6594d79bd13ff87 (diff)
downloadlinux-3e81277a6edd6b568c3a091a372dfe6368697b21.tar.bz2
Merge tag 'drm-fixes-for-v4.14-rc9' of git://people.freedesktop.org/~airlied/linux
Pull drm fixes from Dave Airlie: "Last few patches to wrap up. Two i915 fixes that are on their way to stable, one vmware black screen bug, and one const patch that I was going to drop, but it was clearly a pretty safe one liner" * tag 'drm-fixes-for-v4.14-rc9' of git://people.freedesktop.org/~airlied/linux: drm/i915: Deconstruct struct sgt_dma initialiser drm/i915: Reject unknown syncobj flags drm/vmwgfx: Fix Ubuntu 17.10 Wayland black screen issue drm/vmwgfx: constify vmw_fence_ops
Diffstat (limited to 'include')
-rw-r--r--include/uapi/drm/i915_drm.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/include/uapi/drm/i915_drm.h b/include/uapi/drm/i915_drm.h
index 6598fb76d2c2..9816590d3ad2 100644
--- a/include/uapi/drm/i915_drm.h
+++ b/include/uapi/drm/i915_drm.h
@@ -829,6 +829,7 @@ struct drm_i915_gem_exec_fence {
#define I915_EXEC_FENCE_WAIT (1<<0)
#define I915_EXEC_FENCE_SIGNAL (1<<1)
+#define __I915_EXEC_FENCE_UNKNOWN_FLAGS (-(I915_EXEC_FENCE_SIGNAL << 1))
__u32 flags;
};