diff options
| author | Dave Airlie <airlied@redhat.com> | 2016-09-19 17:16:02 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2016-09-19 17:16:02 +1000 |
| commit | 9f8cf165c62913244479832f04c44cd77ffc9293 (patch) | |
| tree | 7d36f015040f39837a7a0f32c1f0853f33405c44 /drivers/dma-buf/sync_file.c | |
| parent | 8506912b969b60aacc733315eeeb46b014d920a4 (diff) | |
| parent | a988588b1806b40ae115fe1c9ab38706fd1a7c2b (diff) | |
| download | talos-obmc-linux-9f8cf165c62913244479832f04c44cd77ffc9293.tar.gz talos-obmc-linux-9f8cf165c62913244479832f04c44cd77ffc9293.zip | |
Merge tag 'topic/drm-misc-2016-09-19' of git://anongit.freedesktop.org/drm-intel into drm-next
Just random misc stuff that Sean/Sumit&Archit picked up while I relaxed.
Well except for one commit:
* tag 'topic/drm-misc-2016-09-19' of git://anongit.freedesktop.org/drm-intel:
drm: Only use compat ioctl for addfb2 on X86/IA64
drm/qxl: squash lines for simple wrapper functions
drm/bridge: analogix_dp: squash lines for simple wrapper functions
drm/radeon: squash lines for simple wrapper functions
drm/amdgpu: squash lines for simple wrapper functions
dma-buf/sync-file: Avoid enable fence signaling if poll(.timeout=0)
drm/fence: allow fence waiting to be interrupted by userspace
drm: Move property validation to a helper, v2.
drm/bridge: adv7511: add support for the 2nd chip
Diffstat (limited to 'drivers/dma-buf/sync_file.c')
| -rw-r--r-- | drivers/dma-buf/sync_file.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/dma-buf/sync_file.c b/drivers/dma-buf/sync_file.c index 486d29c1a830..abb5fdab75fd 100644 --- a/drivers/dma-buf/sync_file.c +++ b/drivers/dma-buf/sync_file.c @@ -306,7 +306,8 @@ static unsigned int sync_file_poll(struct file *file, poll_table *wait) poll_wait(file, &sync_file->wq, wait); - if (!test_and_set_bit(POLL_ENABLED, &sync_file->fence->flags)) { + if (!poll_does_not_wait(wait) && + !test_and_set_bit(POLL_ENABLED, &sync_file->fence->flags)) { if (fence_add_callback(sync_file->fence, &sync_file->cb, fence_check_cb_func) < 0) wake_up_all(&sync_file->wq); |
