diff options
author | Lucas Stach <l.stach@pengutronix.de> | 2017-09-20 06:24:11 -0400 |
---|---|---|
committer | Lucas Stach <l.stach@pengutronix.de> | 2017-10-10 05:46:57 -0400 |
commit | 13cde9f4c62accdb35f769501ae951ecd75cccc9 (patch) | |
tree | c3027fc601002f6edcc2f8675a22a59d74dd3d16 | |
parent | 7f9d398c16040f32ba7bc6521a89c06c9cb09442 (diff) |
drm/etnaviv: remove unused function etnaviv_gem_new
We only ever do GEM object creation by handle, as there is no kernel
internal use of GEM objects.
Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
-rw-r--r-- | drivers/gpu/drm/etnaviv/etnaviv_drv.h | 4 | ||||
-rw-r--r-- | drivers/gpu/drm/etnaviv/etnaviv_gem.c | 19 |
2 files changed, 0 insertions, 23 deletions
diff --git a/drivers/gpu/drm/etnaviv/etnaviv_drv.h b/drivers/gpu/drm/etnaviv/etnaviv_drv.h index 203613ae24dc..d249acb6da08 100644 --- a/drivers/gpu/drm/etnaviv/etnaviv_drv.h +++ b/drivers/gpu/drm/etnaviv/etnaviv_drv.h | |||
@@ -91,10 +91,6 @@ int etnaviv_gem_cpu_fini(struct drm_gem_object *obj); | |||
91 | void etnaviv_gem_free_object(struct drm_gem_object *obj); | 91 | void etnaviv_gem_free_object(struct drm_gem_object *obj); |
92 | int etnaviv_gem_new_handle(struct drm_device *dev, struct drm_file *file, | 92 | int etnaviv_gem_new_handle(struct drm_device *dev, struct drm_file *file, |
93 | u32 size, u32 flags, u32 *handle); | 93 | u32 size, u32 flags, u32 *handle); |
94 | struct drm_gem_object *etnaviv_gem_new_locked(struct drm_device *dev, | ||
95 | u32 size, u32 flags); | ||
96 | struct drm_gem_object *etnaviv_gem_new(struct drm_device *dev, | ||
97 | u32 size, u32 flags); | ||
98 | int etnaviv_gem_new_userptr(struct drm_device *dev, struct drm_file *file, | 94 | int etnaviv_gem_new_userptr(struct drm_device *dev, struct drm_file *file, |
99 | uintptr_t ptr, u32 size, u32 flags, u32 *handle); | 95 | uintptr_t ptr, u32 size, u32 flags, u32 *handle); |
100 | u16 etnaviv_buffer_init(struct etnaviv_gpu *gpu); | 96 | u16 etnaviv_buffer_init(struct etnaviv_gpu *gpu); |
diff --git a/drivers/gpu/drm/etnaviv/etnaviv_gem.c b/drivers/gpu/drm/etnaviv/etnaviv_gem.c index 5a634594a6ce..d0f2196ad989 100644 --- a/drivers/gpu/drm/etnaviv/etnaviv_gem.c +++ b/drivers/gpu/drm/etnaviv/etnaviv_gem.c | |||
@@ -701,25 +701,6 @@ int etnaviv_gem_new_handle(struct drm_device *dev, struct drm_file *file, | |||
701 | return ret; | 701 | return ret; |
702 | } | 702 | } |
703 | 703 | ||
704 | struct drm_gem_object *etnaviv_gem_new(struct drm_device *dev, | ||
705 | u32 size, u32 flags) | ||
706 | { | ||
707 | struct drm_gem_object *obj; | ||
708 | int ret; | ||
709 | |||
710 | obj = __etnaviv_gem_new(dev, size, flags); | ||
711 | if (IS_ERR(obj)) | ||
712 | return obj; | ||
713 | |||
714 | ret = etnaviv_gem_obj_add(dev, obj); | ||
715 | if (ret < 0) { | ||
716 | drm_gem_object_put_unlocked(obj); | ||
717 | return ERR_PTR(ret); | ||
718 | } | ||
719 | |||
720 | return obj; | ||
721 | } | ||
722 | |||
723 | int etnaviv_gem_new_private(struct drm_device *dev, size_t size, u32 flags, | 704 | int etnaviv_gem_new_private(struct drm_device *dev, size_t size, u32 flags, |
724 | struct reservation_object *robj, const struct etnaviv_gem_ops *ops, | 705 | struct reservation_object *robj, const struct etnaviv_gem_ops *ops, |
725 | struct etnaviv_gem_object **res) | 706 | struct etnaviv_gem_object **res) |