Skip to contentSkip to conversation

drm/host1x: stop casting VMA offsets to 32bit

PATCH New David Herrmann 1 participant 1 message Aug 13, 2013

Subsystems (3)
DRM drivers Tegra architecture support DRM drivers for NVIDIA Tegra
lore
Share & tools
lore

David Herrmann

author
#0 lore raw

PATCH 1/1 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]>
---
 drivers/gpu/host1x/drm/drm.c | 2 +-
 drivers/gpu/host1x/drm/gem.c | 7 +------
 drivers/gpu/host1x/drm/gem.h | 1 -
 3 files changed, 2 insertions(+), 8 deletions(-)
drivers/gpu/host1x/drm/drm.c +1 -1
index 1371a2b..397ed3f 100644
@@ -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);
drivers/gpu/host1x/drm/gem.c +1 -6
index 3c35622..59623de 100644
@@ -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);
drivers/gpu/host1x/drm/gem.h +0 -1
index 2e93b03..492533a 100644
@@ -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,
Signature · 1 line
1.8.3.4