diff options
| author | Dave Airlie <airlied@redhat.com> | 2017-04-26 00:21:47 +0100 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2017-06-01 14:46:32 +1000 |
| commit | 8ae92c227c3dcfe41d9d9d7a8a291d15878e73ba (patch) | |
| tree | 01e4a7b95e2e82de5c905b0900bc6444e6923bbb | |
| parent | e3271c1fda4187fd53eb0cf343de0303e76b5af5 (diff) | |
Dma-fence hack timeoutdrm-syncobj-sem
| -rw-r--r-- | drivers/dma-buf/dma-fence.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/dma-buf/dma-fence.c b/drivers/dma-buf/dma-fence.c index 0918d3f003d6..58659025bb9a 100644 --- a/drivers/dma-buf/dma-fence.c +++ b/drivers/dma-buf/dma-fence.c @@ -380,6 +380,9 @@ dma_fence_default_wait(struct dma_fence *fence, bool intr, signed long timeout) if (test_bit(DMA_FENCE_FLAG_SIGNALED_BIT, &fence->flags)) return ret; + if (timeout == 0) + return 0; + spin_lock_irqsave(fence->lock, flags); if (intr && signal_pending(current)) { |