Merge tag 'drm/tegra/for-4.12-rc1' of git://anongit.freedesktop.org/tegra/linux into...

[karo-tx-linux.git] / drivers / gpu / drm / tegra / gem.c

diff --git a/drivers/gpu/drm/tegra/gem.c b/drivers/gpu/drm/tegra/gem.c
index 050ba78d3fab689587e684e6106daf8bd55f64c8..424569b53e5701538e1b6c9dcbfc0d9a36376d4a 100644 (file)
--- a/drivers/gpu/drm/tegra/gem.c
+++ b/drivers/gpu/drm/tegra/gem.c
@@ -627,10 +627,10 @@ static const struct dma_buf_ops tegra_gem_prime_dmabuf_ops = {
        .map_dma_buf = tegra_gem_prime_map_dma_buf,
        .unmap_dma_buf = tegra_gem_prime_unmap_dma_buf,
        .release = tegra_gem_prime_release,
-       .kmap_atomic = tegra_gem_prime_kmap_atomic,
-       .kunmap_atomic = tegra_gem_prime_kunmap_atomic,
-       .kmap = tegra_gem_prime_kmap,
-       .kunmap = tegra_gem_prime_kunmap,
+       .map_atomic = tegra_gem_prime_kmap_atomic,
+       .unmap_atomic = tegra_gem_prime_kunmap_atomic,
+       .map = tegra_gem_prime_kmap,
+       .unmap = tegra_gem_prime_kunmap,
        .mmap = tegra_gem_prime_mmap,
        .vmap = tegra_gem_prime_vmap,
        .vunmap = tegra_gem_prime_vunmap,