Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit aacc0b7d authored by Noralf Trønnes's avatar Noralf Trønnes
Browse files

drm/gma500: 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: Patrik Jakobsson <patrik.r.jakobsson@gmail.com>
Signed-off-by: default avatarNoralf Trønnes <noralf@tronnes.org>
Reviewed-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Link: https://patchwork.freedesktop.org/patch/msgid/1502034068-51384-6-git-send-email-noralf@tronnes.org
parent 3c856a72

drivers/gpu/drm/gma500/gem.c

+0 −30
Original line number Diff line number Diff line
@@ -47,36 +47,6 @@ int psb_gem_get_aperture(struct drm_device *dev, void *data, 
	return -EINVAL;

}



/**

 *	psb_gem_dumb_map_gtt	-	buffer mapping for dumb interface

 *	@file: our drm client file

 *	@dev: drm device

 *	@handle: GEM handle to the object (from dumb_create)

 *

 *	Do the necessary setup to allow the mapping of the frame buffer

 *	into user memory. We don't have to do much here at the moment.

 */

int psb_gem_dumb_map_gtt(struct drm_file *file, struct drm_device *dev,

			 uint32_t handle, uint64_t *offset)

{

	int ret = 0;

	struct drm_gem_object *obj;



	/* GEM does all our handle to object mapping */

	obj = drm_gem_object_lookup(file, handle);

	if (obj == NULL)

		return -ENOENT;



	/* Make it mmapable */

	ret = drm_gem_create_mmap_offset(obj);

	if (ret)

		goto out;

	*offset = drm_vma_node_offset_addr(&obj->vma_node);

out:

	drm_gem_object_unreference_unlocked(obj);

	return ret;

}



/**

 *	psb_gem_create		-	create a mappable object

 *	@file: the DRM file of the client

drivers/gpu/drm/gma500/psb_drv.c

+0 −2
Original line number Diff line number Diff line
@@ -494,8 +494,6 @@ static struct drm_driver driver = { 
	.gem_vm_ops = &psb_gem_vm_ops,



	.dumb_create = psb_gem_dumb_create,

	.dumb_map_offset = psb_gem_dumb_map_gtt,

	.dumb_destroy = drm_gem_dumb_destroy,

	.ioctls = psb_ioctls,

	.fops = &psb_gem_fops,

	.name = DRIVER_NAME,

drivers/gpu/drm/gma500/psb_drv.h

+0 −2
Original line number Diff line number Diff line
@@ -750,8 +750,6 @@ extern int psb_gem_get_aperture(struct drm_device *dev, void *data, 
			struct drm_file *file);

extern int psb_gem_dumb_create(struct drm_file *file, struct drm_device *dev,

			struct drm_mode_create_dumb *args);

extern int psb_gem_dumb_map_gtt(struct drm_file *file, struct drm_device *dev,

			uint32_t handle, uint64_t *offset);

extern int psb_gem_fault(struct vm_fault *vmf);



/* psb_device.c */