Commit c5ca5e02 authored by Thomas Zimmermann's avatar Thomas Zimmermann
Browse files

drm/omapdrm: Introduce GEM object functions 



GEM object functions deprecate several similar callback interfaces in
struct drm_driver. This patch replaces the per-driver callbacks with
per-instance callbacks in omapdrm.

v2:
	* make omap_gem_free_object() static (Tomi)

Signed-off-by: default avatarThomas Zimmermann <tzimmermann@suse.de>
Reviewed-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: default avatarTomi Valkeinen <tomi.valkeinen@ti.com>
Acked-by: default avatarChristian König <christian.koenig@amd.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200923102159.24084-12-tzimmermann@suse.de
parent ed853f6c

drivers/gpu/drm/omapdrm/omap_drv.c

+0 −9
Original line number Diff line number Diff line
@@ -521,12 +521,6 @@ static int dev_open(struct drm_device *dev, struct drm_file *file) 
	return 0;

}



static const struct vm_operations_struct omap_gem_vm_ops = {

	.fault = omap_gem_fault,

	.open = drm_gem_vm_open,

	.close = drm_gem_vm_close,

};



static const struct file_operations omapdriver_fops = {

	.owner = THIS_MODULE,

	.open = drm_open,
@@ -549,10 +543,7 @@ static struct drm_driver omap_drm_driver = { 
#endif

	.prime_handle_to_fd = drm_gem_prime_handle_to_fd,

	.prime_fd_to_handle = drm_gem_prime_fd_to_handle,

	.gem_prime_export = omap_gem_prime_export,

	.gem_prime_import = omap_gem_prime_import,

	.gem_free_object_unlocked = omap_gem_free_object,

	.gem_vm_ops = &omap_gem_vm_ops,

	.dumb_create = omap_gem_dumb_create,

	.dumb_map_offset = omap_gem_dumb_map_offset,

	.ioctls = ioctls,

drivers/gpu/drm/omapdrm/omap_gem.c

+16 −2
Original line number Diff line number Diff line
@@ -487,7 +487,7 @@ static vm_fault_t omap_gem_fault_2d(struct drm_gem_object *obj, 
 * vma->vm_private_data points to the GEM object that is backing this

 * mapping.

 */

vm_fault_t omap_gem_fault(struct vm_fault *vmf)

static vm_fault_t omap_gem_fault(struct vm_fault *vmf)

{

	struct vm_area_struct *vma = vmf->vma;

	struct drm_gem_object *obj = vma->vm_private_data;
@@ -1089,7 +1089,7 @@ void omap_gem_describe_objects(struct list_head *list, struct seq_file *m) 
 * Constructor & Destructor

 */



void omap_gem_free_object(struct drm_gem_object *obj)

static void omap_gem_free_object(struct drm_gem_object *obj)

{

	struct drm_device *dev = obj->dev;

	struct omap_drm_private *priv = dev->dev_private;
@@ -1169,6 +1169,18 @@ static bool omap_gem_validate_flags(struct drm_device *dev, u32 flags) 
	return true;

}



static const struct vm_operations_struct omap_gem_vm_ops = {

	.fault = omap_gem_fault,

	.open = drm_gem_vm_open,

	.close = drm_gem_vm_close,

};



static const struct drm_gem_object_funcs omap_gem_object_funcs = {

	.free = omap_gem_free_object,

	.export = omap_gem_prime_export,

	.vm_ops = &omap_gem_vm_ops,

};



/* GEM buffer object constructor */

struct drm_gem_object *omap_gem_new(struct drm_device *dev,

		union omap_gem_size gsize, u32 flags)
@@ -1236,6 +1248,8 @@ struct drm_gem_object *omap_gem_new(struct drm_device *dev, 
		size = PAGE_ALIGN(gsize.bytes);

	}



	obj->funcs = &omap_gem_object_funcs;



	/* Initialize the GEM object. */

	if (!(flags & OMAP_BO_MEM_SHMEM)) {

		drm_gem_private_object_init(dev, obj, size);

drivers/gpu/drm/omapdrm/omap_gem.h

+0 −2
Original line number Diff line number Diff line
@@ -48,7 +48,6 @@ struct drm_gem_object *omap_gem_new_dmabuf(struct drm_device *dev, size_t size, 
		struct sg_table *sgt);

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

		union omap_gem_size gsize, u32 flags, u32 *handle);

void omap_gem_free_object(struct drm_gem_object *obj);

void *omap_gem_vaddr(struct drm_gem_object *obj);



/* Dumb Buffers Interface */
@@ -69,7 +68,6 @@ struct dma_buf *omap_gem_prime_export(struct drm_gem_object *obj, int flags); 
struct drm_gem_object *omap_gem_prime_import(struct drm_device *dev,

		struct dma_buf *buffer);



vm_fault_t omap_gem_fault(struct vm_fault *vmf);

int omap_gem_roll(struct drm_gem_object *obj, u32 roll);

void omap_gem_cpu_sync_page(struct drm_gem_object *obj, int pgoff);

void omap_gem_dma_sync_buffer(struct drm_gem_object *obj,

CRA Git | Maintained and supported by SUSTech CRA and CCSE