diff options
| author |   Dave Airlie <airlied@redhat.com> | 2017-04-21 13:51:59 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2017-04-21 13:51:59 +1000 |
| commit | 6b1462700b4a6a1244c018cdd2fa97ded43090a0 (patch) | |
| tree | fd6051c0334e456bf5d55c9473eb64cdb82db681 /drivers/staging | |
| parent | Merge tag 'sunxi-drm-for-4.12' of https://git.kernel.org/pub/scm/linux/kernel/git/mripard/linux into drm-next (diff) | |
| parent | dma-buf: Rename dma-ops to prevent conflict with kunmap_atomic macro (diff) | |
| download | linux-dev-6b1462700b4a6a1244c018cdd2fa97ded43090a0.tar.xz linux-dev-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/staging')
| -rw-r--r-- | drivers/staging/android/ion/ion.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/staging/android/ion/ion.c b/drivers/staging/android/ion/ion.c index f45115fce4eb..95a7f1648c00 100644 --- a/drivers/staging/android/ion/ion.c +++ b/drivers/staging/android/ion/ion.c @@ -1020,10 +1020,10 @@ static const struct dma_buf_ops dma_buf_ops = { .release = ion_dma_buf_release, .begin_cpu_access = ion_dma_buf_begin_cpu_access, .end_cpu_access = ion_dma_buf_end_cpu_access, - .kmap_atomic = ion_dma_buf_kmap, - .kunmap_atomic = ion_dma_buf_kunmap, - .kmap = ion_dma_buf_kmap, - .kunmap = ion_dma_buf_kunmap, + .map_atomic = ion_dma_buf_kmap, + .unmap_atomic = ion_dma_buf_kunmap, + .map = ion_dma_buf_kmap, + .unmap = ion_dma_buf_kunmap, }; struct dma_buf *ion_share_dma_buf(struct ion_client *client, |