Merge drm-upstream/drm-next into drm-misc-next

[linux-2.6-microblaze.git] / drivers / gpu / drm / tegra / gem.c

diff --git a/drivers/gpu/drm/tegra/gem.c b/drivers/gpu/drm/tegra/gem.c
index 00a5c9f..4f80100 100644 (file)
--- a/drivers/gpu/drm/tegra/gem.c
+++ b/drivers/gpu/drm/tegra/gem.c
@@ -582,18 +582,6 @@ static int tegra_gem_prime_end_cpu_access(struct dma_buf *buf,
        return 0;
 }
 
-static void *tegra_gem_prime_kmap_atomic(struct dma_buf *buf,
-                                        unsigned long page)
-{
-       return NULL;
-}
-
-static void tegra_gem_prime_kunmap_atomic(struct dma_buf *buf,
-                                         unsigned long page,
-                                         void *addr)
-{
-}
-
 static void *tegra_gem_prime_kmap(struct dma_buf *buf, unsigned long page)
 {
        return NULL;
@@ -634,8 +622,6 @@ static const struct dma_buf_ops tegra_gem_prime_dmabuf_ops = {
        .release = tegra_gem_prime_release,
        .begin_cpu_access = tegra_gem_prime_begin_cpu_access,
        .end_cpu_access = tegra_gem_prime_end_cpu_access,
-       .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,