diff options
| author | Dave Airlie | 2017-04-21 05:51:59 +0200 |
|---|---|---|
| committer | Dave Airlie | 2017-04-21 05:51:59 +0200 |
| commit | 6b1462700b4a6a1244c018cdd2fa97ded43090a0 (patch) | |
| tree | fd6051c0334e456bf5d55c9473eb64cdb82db681 /drivers/gpu/drm/vmwgfx/vmwgfx_prime.c | |
| parent | Merge tag 'sunxi-drm-for-4.12' of https://git.kernel.org/pub/scm/linux/kernel... (diff) | |
| parent | dma-buf: Rename dma-ops to prevent conflict with kunmap_atomic macro (diff) | |
| download | kernel-qcow2-linux-6b1462700b4a6a1244c018cdd2fa97ded43090a0.tar.gz kernel-qcow2-linux-6b1462700b4a6a1244c018cdd2fa97ded43090a0.tar.xz kernel-qcow2-linux-6b1462700b4a6a1244c018cdd2fa97ded43090a0.zip | |
Merge tag 'drm-misc-next-fixes-2017-04-20' of git://anongit.freedesktop.org/git/drm-misc into drm-next
drm-misc-next-fixes-2017-04-20
Core changes:
- Maintain sti via drm-misc (Vincent)
- Rename dma_buf_ops->kmap_* to avoid naming collision (Logan)
Driver changes:
- Fix UHD displays on stih407 (Vincent)
- Fix uninitialized var return in atmel-hlcdc (Dan)
* tag 'drm-misc-next-fixes-2017-04-20' of git://anongit.freedesktop.org/git/drm-misc:
dma-buf: Rename dma-ops to prevent conflict with kunmap_atomic macro
drm: atmel-hlcdc: Uninitialized return in atmel_hlcdc_create_outputs()
drm/sti: fix GDP size to support up to UHD resolution
MAINTAINERS: add drm/sti driver into drm-misc
Diffstat (limited to 'drivers/gpu/drm/vmwgfx/vmwgfx_prime.c')
| -rw-r--r-- | drivers/gpu/drm/vmwgfx/vmwgfx_prime.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_prime.c b/drivers/gpu/drm/vmwgfx/vmwgfx_prime.c index 31fe32d8d65a..0d42a46521fc 100644 --- a/drivers/gpu/drm/vmwgfx/vmwgfx_prime.c +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_prime.c @@ -108,10 +108,10 @@ 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, - .kmap = vmw_prime_dmabuf_kmap, - .kmap_atomic = vmw_prime_dmabuf_kmap_atomic, - .kunmap = vmw_prime_dmabuf_kunmap, - .kunmap_atomic = vmw_prime_dmabuf_kunmap_atomic, + .map = vmw_prime_dmabuf_kmap, + .map_atomic = vmw_prime_dmabuf_kmap_atomic, + .unmap = vmw_prime_dmabuf_kunmap, + .unmap_atomic = vmw_prime_dmabuf_kunmap_atomic, .mmap = vmw_prime_dmabuf_mmap, .vmap = vmw_prime_dmabuf_vmap, .vunmap = vmw_prime_dmabuf_vunmap, |