aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/host1x/drm/gem.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/gpu/host1x/drm/gem.c')
-rw-r--r--drivers/gpu/host1x/drm/gem.c16
1 files changed, 2 insertions, 14 deletions
diff --git a/drivers/gpu/host1x/drm/gem.c b/drivers/gpu/host1x/drm/gem.c
index c5e9a9b494c2..59623de4ee15 100644
--- 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)
106 dma_free_writecombine(drm->dev, bo->gem.size, bo->vaddr, bo->paddr); 106 dma_free_writecombine(drm->dev, bo->gem.size, bo->vaddr, bo->paddr);
107} 107}
108 108
109unsigned int tegra_bo_get_mmap_offset(struct tegra_bo *bo)
110{
111 return (unsigned int)bo->gem.map_list.hash.key << PAGE_SHIFT;
112}
113
114struct tegra_bo *tegra_bo_create(struct drm_device *drm, unsigned int size) 109struct tegra_bo *tegra_bo_create(struct drm_device *drm, unsigned int size)
115{ 110{
116 struct tegra_bo *bo; 111 struct tegra_bo *bo;
@@ -182,8 +177,7 @@ void tegra_bo_free_object(struct drm_gem_object *gem)
182{ 177{
183 struct tegra_bo *bo = to_tegra_bo(gem); 178 struct tegra_bo *bo = to_tegra_bo(gem);
184 179
185 if (gem->map_list.map) 180 drm_gem_free_mmap_offset(gem);
186 drm_gem_free_mmap_offset(gem);
187 181
188 drm_gem_object_release(gem); 182 drm_gem_object_release(gem);
189 tegra_bo_destroy(gem->dev, bo); 183 tegra_bo_destroy(gem->dev, bo);
@@ -228,7 +222,7 @@ int tegra_bo_dumb_map_offset(struct drm_file *file, struct drm_device *drm,
228 222
229 bo = to_tegra_bo(gem); 223 bo = to_tegra_bo(gem);
230 224
231 *offset = tegra_bo_get_mmap_offset(bo); 225 *offset = drm_vma_node_offset_addr(&bo->gem.vma_node);
232 226
233 drm_gem_object_unreference(gem); 227 drm_gem_object_unreference(gem);
234 228
@@ -262,9 +256,3 @@ int tegra_drm_mmap(struct file *file, struct vm_area_struct *vma)
262 256
263 return ret; 257 return ret;
264} 258}
265
266int tegra_bo_dumb_destroy(struct drm_file *file, struct drm_device *drm,
267 unsigned int handle)
268{
269 return drm_gem_handle_delete(file, handle);
270}