On Thu, Aug 17, 2017 at 06:21:31PM +0200, Noralf Trønnes wrote:
> This driver can use the drm_driver.dumb_destroy and
> drm_driver.dumb_map_offset defaults, so no need to set them.
>
> Cc: Russell King <li...@armlinux.org.uk>
> Signed-off-by: Noralf Trønnes <nor...@tronnes.org>
Assuming patch 1 gets enough acks and lands:
Reviewed-by: Daniel Vetter <daniel.vet...@ffwll.ch>
> ---
> drivers/gpu/drm/armada/armada_drv.c | 2 --
> drivers/gpu/drm/armada/armada_gem.c | 36 ------------------------------------
> drivers/gpu/drm/armada/armada_gem.h | 4 ----
> 3 files changed, 42 deletions(-)
>
> diff --git a/drivers/gpu/drm/armada/armada_drv.c
> b/drivers/gpu/drm/armada/armada_drv.c
> index 0b3227c..2fbd9d3 100644
> --- a/drivers/gpu/drm/armada/armada_drv.c
> +++ b/drivers/gpu/drm/armada/armada_drv.c
> @@ -70,8 +70,6 @@ static struct drm_driver armada_drm_driver = {
> .gem_prime_export = armada_gem_prime_export,
> .gem_prime_import = armada_gem_prime_import,
> .dumb_create = armada_gem_dumb_create,
> - .dumb_map_offset = armada_gem_dumb_map_offset,
> - .dumb_destroy = armada_gem_dumb_destroy,
> .gem_vm_ops = &armada_gem_vm_ops,
> .major = 1,
> .minor = 0,
> diff --git a/drivers/gpu/drm/armada/armada_gem.c
> b/drivers/gpu/drm/armada/armada_gem.c
> index a76ca21..7983538 100644
> --- a/drivers/gpu/drm/armada/armada_gem.c
> +++ b/drivers/gpu/drm/armada/armada_gem.c
> @@ -270,42 +270,6 @@ int armada_gem_dumb_create(struct drm_file *file, struct
> drm_device *dev,
> return ret;
> }
>
> -int armada_gem_dumb_map_offset(struct drm_file *file, struct drm_device *dev,
> - uint32_t handle, uint64_t *offset)
> -{
> - struct armada_gem_object *obj;
> - int ret = 0;
> -
> - obj = armada_gem_object_lookup(file, handle);
> - if (!obj) {
> - DRM_ERROR("failed to lookup gem object\n");
> - return -EINVAL;
> - }
> -
> - /* Don't allow imported objects to be mapped */
> - if (obj->obj.import_attach) {
> - ret = -EINVAL;
> - goto err_unref;
> - }
> -
> - ret = drm_gem_create_mmap_offset(&obj->obj);
> - if (ret == 0) {
> - *offset = drm_vma_node_offset_addr(&obj->obj.vma_node);
> - DRM_DEBUG_DRIVER("handle %#x offset %llx\n", handle, *offset);
> - }
> -
> - err_unref:
> - drm_gem_object_unreference_unlocked(&obj->obj);
> -
> - return ret;
> -}
> -
> -int armada_gem_dumb_destroy(struct drm_file *file, struct drm_device *dev,
> - uint32_t handle)
> -{
> - return drm_gem_handle_delete(file, handle);
> -}
> -
> /* Private driver gem ioctls */
> int armada_gem_create_ioctl(struct drm_device *dev, void *data,
> struct drm_file *file)
> diff --git a/drivers/gpu/drm/armada/armada_gem.h
> b/drivers/gpu/drm/armada/armada_gem.h
> index 6e524e0..1ac9079 100644
> --- a/drivers/gpu/drm/armada/armada_gem.h
> +++ b/drivers/gpu/drm/armada/armada_gem.h
> @@ -35,10 +35,6 @@ struct armada_gem_object
> *armada_gem_alloc_private_object(struct drm_device *,
> size_t);
> int armada_gem_dumb_create(struct drm_file *, struct drm_device *,
> struct drm_mode_create_dumb *);
> -int armada_gem_dumb_map_offset(struct drm_file *, struct drm_device *,
> - uint32_t, uint64_t *);
> -int armada_gem_dumb_destroy(struct drm_file *, struct drm_device *,
> - uint32_t);
> struct dma_buf *armada_gem_prime_export(struct drm_device *dev,
> struct drm_gem_object *obj, int flags);
> struct drm_gem_object *armada_gem_prime_import(struct drm_device *,
> --
> 2.7.4
>
--
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
