diff options
| author | Dave Airlie <airlied@redhat.com> | 2017-11-09 11:17:32 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2017-11-09 11:17:32 +1000 |
| commit | 60ccb31bd680469ee0db92b0b6594d79bd13ff87 (patch) | |
| tree | ab9617f03341392ddd182866f73a454cd1330dec /include | |
| parent | 17208f1dec433b60eb9b427c17598adc431ab6de (diff) | |
| parent | 423a8a942e95493b73228ba6a3f176dcc7f35fa9 (diff) | |
| download | linux-60ccb31bd680469ee0db92b0b6594d79bd13ff87.tar.bz2 | |
Merge tag 'drm-intel-fixes-2017-11-08' of git://anongit.freedesktop.org/drm/drm-intel into drm-fixes
- Fix possible NULL dereference (Chris).
- Avoid miss usage of syncobj by rejecting unknown flags (Tvrtko).
* tag 'drm-intel-fixes-2017-11-08' of git://anongit.freedesktop.org/drm/drm-intel:
drm/i915: Deconstruct struct sgt_dma initialiser
drm/i915: Reject unknown syncobj flags
Diffstat (limited to 'include')
| -rw-r--r-- | include/uapi/drm/i915_drm.h | 1 |
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; }; |