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

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

diff --git a/drivers/gpu/drm/drm_gem.c b/drivers/gpu/drm/drm_gem.c
index 668bbf3..133dfae 100644 (file)
--- a/drivers/gpu/drm/drm_gem.c
+++ b/drivers/gpu/drm/drm_gem.c
@@ -25,10 +25,10 @@
  *
  */
 
-#include <linux/dma-buf-map.h>
 #include <linux/dma-buf.h>
 #include <linux/file.h>
 #include <linux/fs.h>
+#include <linux/iosys-map.h>
 #include <linux/mem_encrypt.h>
 #include <linux/mm.h>
 #include <linux/mman.h>
@@ -1166,7 +1166,7 @@ void drm_gem_unpin(struct drm_gem_object *obj)
                obj->funcs->unpin(obj);
 }
 
-int drm_gem_vmap(struct drm_gem_object *obj, struct dma_buf_map *map)
+int drm_gem_vmap(struct drm_gem_object *obj, struct iosys_map *map)
 {
        int ret;
 
@@ -1176,23 +1176,23 @@ int drm_gem_vmap(struct drm_gem_object *obj, struct dma_buf_map *map)
        ret = obj->funcs->vmap(obj, map);
        if (ret)
                return ret;
-       else if (dma_buf_map_is_null(map))
+       else if (iosys_map_is_null(map))
                return -ENOMEM;
 
        return 0;
 }
 EXPORT_SYMBOL(drm_gem_vmap);
 
-void drm_gem_vunmap(struct drm_gem_object *obj, struct dma_buf_map *map)
+void drm_gem_vunmap(struct drm_gem_object *obj, struct iosys_map *map)
 {
-       if (dma_buf_map_is_null(map))
+       if (iosys_map_is_null(map))
                return;
 
        if (obj->funcs->vunmap)
                obj->funcs->vunmap(obj, map);
 
        /* Always set the mapping to NULL. Callers may rely on this. */
-       dma_buf_map_clear(map);
+       iosys_map_clear(map);
 }
 EXPORT_SYMBOL(drm_gem_vunmap);