diff options
| author | Sinclair Yeh <syeh@vmware.com> | 2017-04-24 14:12:38 -0700 |
|---|---|---|
| committer | Sinclair Yeh <syeh@vmware.com> | 2017-05-30 17:56:34 -0700 |
| commit | df40e6422207a2acfafbc448fe94c639edf07890 (patch) | |
| tree | 995e59c6bd5ebfff11ff00ad596c9e5bdd8b89e2 /vmwgfx_prime.c | |
| parent | 569a791e902bef5a18375c58cee03708a011a4c5 (diff) | |
vmwgfx: Update dma_buf_ops handlers
Extracted out of commit f9b67f0014cb ("dma-buf: Rename dma-ops to
prevent conflict with kunmap_atomic macro")
The fields have been renamed in Kernel 4.12
Signed-off-by: Sinclair Yeh <syeh@vmware.com>
Reviewed-by: Thomas Hellstrom <thellstrom@vmware.com>
Diffstat (limited to 'vmwgfx_prime.c')
| -rw-r--r-- | vmwgfx_prime.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/vmwgfx_prime.c b/vmwgfx_prime.c index c3ecce4..eb37a1f 100644 --- a/vmwgfx_prime.c +++ b/vmwgfx_prime.c @@ -114,10 +114,18 @@ const struct dma_buf_ops vmw_prime_dmabuf_ops = { .map_dma_buf = vmw_prime_map_dma_buf, .unmap_dma_buf = vmw_prime_unmap_dma_buf, .release = NULL, +#if (LINUX_VERSION_CODE > KERNEL_VERSION(4, 11, 0)) + .map = vmw_prime_dmabuf_kmap, + .map_atomic = vmw_prime_dmabuf_kmap_atomic, + .unmap = vmw_prime_dmabuf_kunmap, + .unmap_atomic = vmw_prime_dmabuf_kunmap_atomic, +#else .kmap = vmw_prime_dmabuf_kmap, .kmap_atomic = vmw_prime_dmabuf_kmap_atomic, .kunmap = vmw_prime_dmabuf_kunmap, .kunmap_atomic = vmw_prime_dmabuf_kunmap_atomic, +#endif + #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 5, 0) && \ !defined(DMA_BUF_STANDALONE)) .mmap = vmw_prime_dmabuf_mmap, |