[Nouveau] [PATCH 07/14] drm/i915: Replace dma-buf-map with iosys-map

[Lucas De Marchi]

iosys-map is the new name for dma-buf-map and will gain new
capabitilities. Replace with the new API in i915.

Signed-off-by: Lucas De Marchi <lucas.demar...@intel.com>
---
 drivers/gpu/drm/i915/gem/i915_gem_dmabuf.c           | 8 +++++---
 drivers/gpu/drm/i915/gem/selftests/i915_gem_dmabuf.c | 6 +++---
 drivers/gpu/drm/i915/gem/selftests/mock_dmabuf.c     | 6 +++---
 3 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/drivers/gpu/drm/i915/gem/i915_gem_dmabuf.c 
b/drivers/gpu/drm/i915/gem/i915_gem_dmabuf.c
index 1b526039a60d..14fdb0796c52 100644
--- a/drivers/gpu/drm/i915/gem/i915_gem_dmabuf.c
+++ b/drivers/gpu/drm/i915/gem/i915_gem_dmabuf.c
@@ -74,7 +74,8 @@ static void i915_gem_unmap_dma_buf(struct dma_buf_attachment 
*attachment,
        kfree(sg);
 }
 
-static int i915_gem_dmabuf_vmap(struct dma_buf *dma_buf, struct dma_buf_map 
*map)
+static int i915_gem_dmabuf_vmap(struct dma_buf *dma_buf,
+                               struct iosys_map *map)
 {
        struct drm_i915_gem_object *obj = dma_buf_to_obj(dma_buf);
        void *vaddr;
@@ -83,12 +84,13 @@ static int i915_gem_dmabuf_vmap(struct dma_buf *dma_buf, 
struct dma_buf_map *map
        if (IS_ERR(vaddr))
                return PTR_ERR(vaddr);
 
-       dma_buf_map_set_vaddr(map, vaddr);
+       iosys_map_set_vaddr(map, vaddr);
 
        return 0;
 }
 
-static void i915_gem_dmabuf_vunmap(struct dma_buf *dma_buf, struct dma_buf_map 
*map)
+static void i915_gem_dmabuf_vunmap(struct dma_buf *dma_buf,
+                                  struct iosys_map *map)
 {
        struct drm_i915_gem_object *obj = dma_buf_to_obj(dma_buf);
 
diff --git a/drivers/gpu/drm/i915/gem/selftests/i915_gem_dmabuf.c 
b/drivers/gpu/drm/i915/gem/selftests/i915_gem_dmabuf.c
index 3cc74b0fed06..b071a58dd6da 100644
--- a/drivers/gpu/drm/i915/gem/selftests/i915_gem_dmabuf.c
+++ b/drivers/gpu/drm/i915/gem/selftests/i915_gem_dmabuf.c
@@ -266,7 +266,7 @@ static int igt_dmabuf_import(void *arg)
        struct drm_i915_gem_object *obj;
        struct dma_buf *dmabuf;
        void *obj_map, *dma_map;
-       struct dma_buf_map map;
+       struct iosys_map map;
        u32 pattern[] = { 0, 0xaa, 0xcc, 0x55, 0xff };
        int err, i;
 
@@ -349,7 +349,7 @@ static int igt_dmabuf_import_ownership(void *arg)
        struct drm_i915_private *i915 = arg;
        struct drm_i915_gem_object *obj;
        struct dma_buf *dmabuf;
-       struct dma_buf_map map;
+       struct iosys_map map;
        void *ptr;
        int err;
 
@@ -400,7 +400,7 @@ static int igt_dmabuf_export_vmap(void *arg)
        struct drm_i915_private *i915 = arg;
        struct drm_i915_gem_object *obj;
        struct dma_buf *dmabuf;
-       struct dma_buf_map map;
+       struct iosys_map map;
        void *ptr;
        int err;
 
diff --git a/drivers/gpu/drm/i915/gem/selftests/mock_dmabuf.c 
b/drivers/gpu/drm/i915/gem/selftests/mock_dmabuf.c
index 2855d11c7a51..b2a5882b8f81 100644
--- a/drivers/gpu/drm/i915/gem/selftests/mock_dmabuf.c
+++ b/drivers/gpu/drm/i915/gem/selftests/mock_dmabuf.c
@@ -61,7 +61,7 @@ static void mock_dmabuf_release(struct dma_buf *dma_buf)
        kfree(mock);
 }
 
-static int mock_dmabuf_vmap(struct dma_buf *dma_buf, struct dma_buf_map *map)
+static int mock_dmabuf_vmap(struct dma_buf *dma_buf, struct iosys_map *map)
 {
        struct mock_dmabuf *mock = to_mock(dma_buf);
        void *vaddr;
@@ -69,12 +69,12 @@ static int mock_dmabuf_vmap(struct dma_buf *dma_buf, struct 
dma_buf_map *map)
        vaddr = vm_map_ram(mock->pages, mock->npages, 0);
        if (!vaddr)
                return -ENOMEM;
-       dma_buf_map_set_vaddr(map, vaddr);
+       iosys_map_set_vaddr(map, vaddr);
 
        return 0;
 }
 
-static void mock_dmabuf_vunmap(struct dma_buf *dma_buf, struct dma_buf_map 
*map)
+static void mock_dmabuf_vunmap(struct dma_buf *dma_buf, struct iosys_map *map)
 {
        struct mock_dmabuf *mock = to_mock(dma_buf);
 
-- 
2.35.0