diff options
| author | Dave Airlie <airlied@redhat.com> | 2017-08-10 03:07:13 +0300 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2017-08-10 03:07:13 +0300 |
| commit | 9157822b9d7282611093886acd237168691de383 (patch) | |
| tree | 4a53ff820197143d965412c1118a9104cb615e05 /include | |
| parent | db488ab0f5e6653b256d8af60033c363c2f0a9d6 (diff) | |
| parent | 80c471ea040ad9006ebff6d64221a04e8fa1b7f6 (diff) | |
| download | linux-9157822b9d7282611093886acd237168691de383.tar.xz | |
Merge tag 'drm-misc-fixes-2017-08-08' of git://anongit.freedesktop.org/git/drm-misc into drm-fixes
Core Changes:
- dma-buf: Allow multiple sync_files to wrap a single dma-fence (Chris)
Driver Changes:
- rockchip: misc fixes to vop driver from the downstream rockchip tree (Mark)
- Error path cleanups to tc358767 & host1x (Lucas & Paul, respectively)
* tag 'drm-misc-fixes-2017-08-08' of git://anongit.freedesktop.org/git/drm-misc:
drm/rockchip: vop: report error when check resource error
drm/rockchip: vop: round_up pitches to word align
drm/rockchip: vop: fix NV12 video display error
drm/rockchip: vop: fix iommu page fault when resume
dma-buf/sync_file: Allow multiple sync_files to wrap a single dma-fence
drm/bridge: tc358767: fix probe without attached output node
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/sync_file.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/linux/sync_file.h b/include/linux/sync_file.h index 5726107963b2..0ad87c434ae6 100644 --- a/include/linux/sync_file.h +++ b/include/linux/sync_file.h @@ -43,12 +43,13 @@ struct sync_file { #endif wait_queue_head_t wq; + unsigned long flags; struct dma_fence *fence; struct dma_fence_cb cb; }; -#define POLL_ENABLED DMA_FENCE_FLAG_USER_BITS +#define POLL_ENABLED 0 struct sync_file *sync_file_create(struct dma_fence *fence); struct dma_fence *sync_file_get_fence(int fd); |