[PATCH 6/9] drm/ttm: avoid accessing iosys_map internals.

[Dave Airlie]

From: Dave Airlie <airl...@redhat.com>

This uses the new accessors to use iosys_map.

Signed-off-by: Dave Airlie <airl...@redhat.com>
---
 drivers/gpu/drm/ttm/ttm_bo_util.c  | 12 ++++++------
 drivers/gpu/drm/ttm/ttm_resource.c |  8 ++++----
 drivers/gpu/drm/ttm/ttm_tt.c       |  2 +-
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/drivers/gpu/drm/ttm/ttm_bo_util.c 
b/drivers/gpu/drm/ttm/ttm_bo_util.c
index 15cab9bda17f..ba7075fa9876 100644
--- a/drivers/gpu/drm/ttm/ttm_bo_util.c
+++ b/drivers/gpu/drm/ttm/ttm_bo_util.c
@@ -99,10 +99,10 @@ void ttm_move_memcpy(bool clear,
        if (clear) {
                for (i = 0; i < num_pages; ++i) {
                        dst_ops->map_local(dst_iter, &dst_map, i);
-                       if (dst_map.is_iomem)
-                               memset_io(dst_map.vaddr_iomem, 0, PAGE_SIZE);
+                       if (iosys_map_is_iomem(&dst_map))
+                               memset_io(iosys_map_ioptr(&dst_map), 0, 
PAGE_SIZE);
                        else
-                               memset(dst_map.vaddr, 0, PAGE_SIZE);
+                               memset(iosys_map_ptr(&dst_map), 0, PAGE_SIZE);
                        if (dst_ops->unmap_local)
                                dst_ops->unmap_local(dst_iter, &dst_map);
                }
@@ -544,10 +544,10 @@ void ttm_bo_vunmap(struct ttm_buffer_object *bo, struct 
iosys_map *map)
        if (iosys_map_is_null(map))
                return;
 
-       if (!map->is_iomem)
-               vunmap(map->vaddr);
+       if (!iosys_map_is_iomem(map))
+               vunmap(iosys_map_ptr(map));
        else if (!mem->bus.addr)
-               iounmap(map->vaddr_iomem);
+               iounmap(iosys_map_ioptr(map));
        iosys_map_clear(map);
 
        ttm_mem_io_free(bo->bdev, bo->resource);
diff --git a/drivers/gpu/drm/ttm/ttm_resource.c 
b/drivers/gpu/drm/ttm/ttm_resource.c
index 769b0ca9be47..0e7b4c6c16f8 100644
--- a/drivers/gpu/drm/ttm/ttm_resource.c
+++ b/drivers/gpu/drm/ttm/ttm_resource.c
@@ -742,7 +742,7 @@ static void ttm_kmap_iter_iomap_map_local(struct 
ttm_kmap_iter *iter,
 static void ttm_kmap_iter_iomap_unmap_local(struct ttm_kmap_iter *iter,
                                            struct iosys_map *map)
 {
-       io_mapping_unmap_local(map->vaddr_iomem);
+       io_mapping_unmap_local(iosys_map_ioptr(map));
 }
 
 static const struct ttm_kmap_iter_ops ttm_kmap_iter_io_ops = {
@@ -886,10 +886,10 @@ ttm_kmap_iter_linear_io_fini(struct 
ttm_kmap_iter_linear_io *iter_io,
                             struct ttm_resource *mem)
 {
        if (iter_io->needs_unmap && iosys_map_is_set(&iter_io->dmap)) {
-               if (iter_io->dmap.is_iomem)
-                       iounmap(iter_io->dmap.vaddr_iomem);
+               if (iosys_map_is_iomem(&iter_io->dmap))
+                       iounmap(iosys_map_ioptr(&iter_io->dmap));
                else
-                       memunmap(iter_io->dmap.vaddr);
+                       memunmap(iosys_map_ptr(&iter_io->dmap));
        }
 
        ttm_mem_io_free(bdev, mem);
diff --git a/drivers/gpu/drm/ttm/ttm_tt.c b/drivers/gpu/drm/ttm/ttm_tt.c
index df0aa6c4b8b8..ff9856e41b43 100644
--- a/drivers/gpu/drm/ttm/ttm_tt.c
+++ b/drivers/gpu/drm/ttm/ttm_tt.c
@@ -495,7 +495,7 @@ static void ttm_kmap_iter_tt_map_local(struct ttm_kmap_iter 
*iter,
 static void ttm_kmap_iter_tt_unmap_local(struct ttm_kmap_iter *iter,
                                         struct iosys_map *map)
 {
-       kunmap_local(map->vaddr);
+       kunmap_local(iosys_map_ptr(map));
 }
 
 static const struct ttm_kmap_iter_ops ttm_kmap_iter_tt_ops = {
-- 
2.49.0