drm/vma: provide drm_vma_node_unmap() helper

Instead of unmapping the nodes in TTM and GEM users manually, we provide
a generic wrapper which does the correct thing for all vma-nodes.

v2: remove bdev->dev_mapping test in ttm_bo_unmap_virtual_unlocked() as
ttm_mem_io_free_vm() does nothing in that case (io_reserved_vm is 0).
v4: Fix docbook comments
v5: use drm_vma_node_size()

Cc: Dave Airlie <airlied@redhat.com>
Cc: Maarten Lankhorst <maarten.lankhorst@canonical.com>
Cc: Thomas Hellstrom <thellstrom@vmware.com>
Signed-off-by: David Herrmann <dh.herrmann@gmail.com>
Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: Dave Airlie <airlied@gmail.com>

2 files changed, 2 insertions, 15 deletions

diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
index 53f81b3b3424..8673a000a373 100644
--- a/drivers/gpu/drm/i915/i915_gem.c
+++ b/drivers/gpu/drm/i915/i915_gem.c
@@ -1427,11 +1427,7 @@ i915_gem_release_mmap(struct drm_i915_gem_object *obj)
         if (!obj->fault_mappable)
                 return;
 
-        if (obj->base.dev->dev_mapping)
-                unmap_mapping_range(obj->base.dev->dev_mapping,
-                                    (loff_t)drm_vma_node_offset_addr(&obj->base.vma_node),
-                                    obj->base.size, 1);
-
+        drm_vma_node_unmap(&obj->base.vma_node, obj->base.dev->dev_mapping);
         obj->fault_mappable = false;
 }
 
diff --git a/drivers/gpu/drm/ttm/ttm_bo.c b/drivers/gpu/drm/ttm/ttm_bo.c
index 3dc08b612292..050edfaf5b88 100644
--- a/drivers/gpu/drm/ttm/ttm_bo.c
+++ b/drivers/gpu/drm/ttm/ttm_bo.c
@@ -1488,17 +1488,8 @@ bool ttm_mem_reg_is_pci(struct ttm_bo_device *bdev, struct ttm_mem_reg *mem)
 void ttm_bo_unmap_virtual_locked(struct ttm_buffer_object *bo)
 {
         struct ttm_bo_device *bdev = bo->bdev;
-        loff_t offset, holelen;
 
-        if (!bdev->dev_mapping)
-                return;
-
-        if (drm_vma_node_has_offset(&bo->vma_node)) {
-                offset = (loff_t) drm_vma_node_offset_addr(&bo->vma_node);
-                holelen = ((loff_t) bo->mem.num_pages) << PAGE_SHIFT;
-
-                unmap_mapping_range(bdev->dev_mapping, offset, holelen, 1);
-        }
+        drm_vma_node_unmap(&bo->vma_node, bdev->dev_mapping);
         ttm_mem_io_free_vm(bo);
 }