diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-03-25 18:48:31 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-03-25 18:48:31 +0300 |
| commit | f98c2135f8e73f1cfba640dfb80beb0dad75f278 (patch) | |
| tree | 4c97f1a81474ba6f3cb3c281685f0c79eb226859 /include/linux/fence.h | |
| parent | 11caf57f6a4b8e380001548b8af0a3ae3f7b4354 (diff) | |
| parent | 4604202ca8d2a5e33b4bca0812b5d92975ed1bd8 (diff) | |
| download | linux-f98c2135f8e73f1cfba640dfb80beb0dad75f278.tar.xz | |
Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux
Pull drm fixes from Dave Airlie:
"Just a couple of dma-buf related fixes and some amdgpu fixes, along
with a regression fix for radeon off but default feature, but makes my
30" monitor happy again"
* 'drm-next' of git://people.freedesktop.org/~airlied/linux:
drm/radeon/mst: cleanup code indentation
drm/radeon/mst: fix regression in lane/link handling.
drm/amdgpu: add invalidate_page callback for userptrs
drm/amdgpu: Revert "remove the userptr rmn->lock"
drm/amdgpu: clean up path handling for powerplay
drm/amd/powerplay: fix memory leak of tdp_table
dma-buf/fence: fix fence_is_later v2
dma-buf: Update docs for SYNC ioctl
drm: remove excess description
dma-buf, drm, ion: Propagate error code from dma_buf_start_cpu_access()
drm/atmel-hlcdc: use helper to get crtc state
drm/atomic: use helper to get crtc state
Diffstat (limited to 'include/linux/fence.h')
| -rw-r--r-- | include/linux/fence.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/fence.h b/include/linux/fence.h index 605bd88246a6..2b17698b60b8 100644 --- a/include/linux/fence.h +++ b/include/linux/fence.h @@ -294,7 +294,7 @@ static inline bool fence_is_later(struct fence *f1, struct fence *f2) if (WARN_ON(f1->context != f2->context)) return false; - return f1->seqno - f2->seqno < INT_MAX; + return (int)(f1->seqno - f2->seqno) > 0; } /** |