drm/host1x: stop casting VMA offsets to 32bit

VMA offsets are 64bit so do not cast them to "unsigned int". Also remove
the (now useless) offset-retrieval helper. The VMA manager provides simple
enough helpers.

Cc: Thierry Reding <[email protected]>
Cc: "Terje Bergström" <[email protected]>
Cc: Arto Merilainen <[email protected]>
Signed-off-by: David Herrmann <[email protected]>
Signed-off-by: Dave Airlie <[email protected]>

diff --git a/drivers/gpu/host1x/drm/drm.c b/drivers/gpu/host1x/drm/drm.c
index 15684bf073fba3f6e6b31483665efb6bdea8de3b..8c61ceeaa12dda8b33cb5d9c52d987e46adb4573 100644 (file)
--- a/drivers/gpu/host1x/drm/drm.c
+++ b/drivers/gpu/host1x/drm/drm.c
@@ -356,7 +356,7 @@ static int tegra_gem_mmap(struct drm_device *drm, void *data,
 
        bo = to_tegra_bo(gem);
 
-       args->offset = tegra_bo_get_mmap_offset(bo);
+       args->offset = drm_vma_node_offset_addr(&bo->gem.vma_node);
 
        drm_gem_object_unreference(gem);
 

diff --git a/drivers/gpu/host1x/drm/gem.c b/drivers/gpu/host1x/drm/gem.c
index 3c35622c9f15025f297c2d1aaacdd4e440483411..59623de4ee15f3bf9a186d80481f358397fbf99e 100644 (file)
--- a/drivers/gpu/host1x/drm/gem.c
+++ b/drivers/gpu/host1x/drm/gem.c
@@ -106,11 +106,6 @@ static void tegra_bo_destroy(struct drm_device *drm, struct tegra_bo *bo)
        dma_free_writecombine(drm->dev, bo->gem.size, bo->vaddr, bo->paddr);
 }
 
-unsigned int tegra_bo_get_mmap_offset(struct tegra_bo *bo)
-{
-       return (unsigned int)drm_vma_node_offset_addr(&bo->gem.vma_node);
-}
-
 struct tegra_bo *tegra_bo_create(struct drm_device *drm, unsigned int size)
 {
        struct tegra_bo *bo;
@@ -227,7 +222,7 @@ int tegra_bo_dumb_map_offset(struct drm_file *file, struct drm_device *drm,
 
        bo = to_tegra_bo(gem);
 
-       *offset = tegra_bo_get_mmap_offset(bo);
+       *offset = drm_vma_node_offset_addr(&bo->gem.vma_node);
 
        drm_gem_object_unreference(gem);
 

diff --git a/drivers/gpu/host1x/drm/gem.h b/drivers/gpu/host1x/drm/gem.h
index 2e93b0379da807d6c4f366251a601a39f3f86ac3..492533a2dacb1bba249cde2ff08b63e1c855c291 100644 (file)
--- a/drivers/gpu/host1x/drm/gem.h
+++ b/drivers/gpu/host1x/drm/gem.h
@@ -44,7 +44,6 @@ struct tegra_bo *tegra_bo_create_with_handle(struct drm_file *file,
                                            unsigned int size,
                                            unsigned int *handle);
 void tegra_bo_free_object(struct drm_gem_object *gem);
-unsigned int tegra_bo_get_mmap_offset(struct tegra_bo *bo);
 int tegra_bo_dumb_create(struct drm_file *file, struct drm_device *drm,
                         struct drm_mode_create_dumb *args);
 int tegra_bo_dumb_map_offset(struct drm_file *file, struct drm_device *drm,