aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNoralf Trønnes <noralf@tronnes.org>2017-08-06 11:40:55 -0400
committerNoralf Trønnes <noralf@tronnes.org>2017-08-16 14:13:48 -0400
commitbcf877181eb5439074bf6312e42087d988413adb (patch)
treed74f2c376388ba3a3c2dac072987109d49e18f16
parentaacc0b7d7647f11ab3791ef8b373262abbadb39f (diff)
drm/tegra: Use .dumb_map_offset and .dumb_destroy defaults
This driver can use the drm_driver.dumb_destroy and drm_driver.dumb_map_offset defaults, so no need to set them. Cc: Thierry Reding <thierry.reding@gmail.com> Signed-off-by: Noralf Trønnes <noralf@tronnes.org> Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch> Link: https://patchwork.freedesktop.org/patch/msgid/1502034068-51384-7-git-send-email-noralf@tronnes.org
-rw-r--r--drivers/gpu/drm/tegra/drm.c2
-rw-r--r--drivers/gpu/drm/tegra/gem.c21
-rw-r--r--drivers/gpu/drm/tegra/gem.h2
3 files changed, 0 insertions, 25 deletions
diff --git a/drivers/gpu/drm/tegra/drm.c b/drivers/gpu/drm/tegra/drm.c
index 3ba659a5940d..224ce1dbb1cb 100644
--- a/drivers/gpu/drm/tegra/drm.c
+++ b/drivers/gpu/drm/tegra/drm.c
@@ -1077,8 +1077,6 @@ static struct drm_driver tegra_drm_driver = {
1077 .gem_prime_import = tegra_gem_prime_import, 1077 .gem_prime_import = tegra_gem_prime_import,
1078 1078
1079 .dumb_create = tegra_bo_dumb_create, 1079 .dumb_create = tegra_bo_dumb_create,
1080 .dumb_map_offset = tegra_bo_dumb_map_offset,
1081 .dumb_destroy = drm_gem_dumb_destroy,
1082 1080
1083 .ioctls = tegra_drm_ioctls, 1081 .ioctls = tegra_drm_ioctls,
1084 .num_ioctls = ARRAY_SIZE(tegra_drm_ioctls), 1082 .num_ioctls = ARRAY_SIZE(tegra_drm_ioctls),
diff --git a/drivers/gpu/drm/tegra/gem.c b/drivers/gpu/drm/tegra/gem.c
index 7a39a355678a..c6079affe642 100644
--- a/drivers/gpu/drm/tegra/gem.c
+++ b/drivers/gpu/drm/tegra/gem.c
@@ -423,27 +423,6 @@ int tegra_bo_dumb_create(struct drm_file *file, struct drm_device *drm,
423 return 0; 423 return 0;
424} 424}
425 425
426int tegra_bo_dumb_map_offset(struct drm_file *file, struct drm_device *drm,
427 u32 handle, u64 *offset)
428{
429 struct drm_gem_object *gem;
430 struct tegra_bo *bo;
431
432 gem = drm_gem_object_lookup(file, handle);
433 if (!gem) {
434 dev_err(drm->dev, "failed to lookup GEM object\n");
435 return -EINVAL;
436 }
437
438 bo = to_tegra_bo(gem);
439
440 *offset = drm_vma_node_offset_addr(&bo->gem.vma_node);
441
442 drm_gem_object_unreference_unlocked(gem);
443
444 return 0;
445}
446
447static int tegra_bo_fault(struct vm_fault *vmf) 426static int tegra_bo_fault(struct vm_fault *vmf)
448{ 427{
449 struct vm_area_struct *vma = vmf->vma; 428 struct vm_area_struct *vma = vmf->vma;
diff --git a/drivers/gpu/drm/tegra/gem.h b/drivers/gpu/drm/tegra/gem.h
index 8b32a6fd586d..8eb9fd24ef0e 100644
--- a/drivers/gpu/drm/tegra/gem.h
+++ b/drivers/gpu/drm/tegra/gem.h
@@ -67,8 +67,6 @@ struct tegra_bo *tegra_bo_create_with_handle(struct drm_file *file,
67void tegra_bo_free_object(struct drm_gem_object *gem); 67void tegra_bo_free_object(struct drm_gem_object *gem);
68int tegra_bo_dumb_create(struct drm_file *file, struct drm_device *drm, 68int tegra_bo_dumb_create(struct drm_file *file, struct drm_device *drm,
69 struct drm_mode_create_dumb *args); 69 struct drm_mode_create_dumb *args);
70int tegra_bo_dumb_map_offset(struct drm_file *file, struct drm_device *drm,
71 u32 handle, u64 *offset);
72 70
73int tegra_drm_mmap(struct file *file, struct vm_area_struct *vma); 71int tegra_drm_mmap(struct file *file, struct vm_area_struct *vma);
74 72