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

drm/etnaviv: 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 etnaviv. The only exception is gem_prime_mmap,
which is non-trivial to convert.

Signed-off-by: default avatarThomas Zimmermann <tzimmermann@suse.de>
Reviewed-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Acked-by: default avatarLucas Stach <l.stach@pengutronix.de>
Acked-by: default avatarChristian König <christian.koenig@amd.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200923102159.24084-4-tzimmermann@suse.de
parent ad01dd03

drivers/gpu/drm/etnaviv/etnaviv_drv.c

+0 −13
Original line number Diff line number Diff line
@@ -468,12 +468,6 @@ static const struct drm_ioctl_desc etnaviv_ioctls[] = { 
	ETNA_IOCTL(PM_QUERY_SIG, pm_query_sig, DRM_RENDER_ALLOW),

};



static const struct vm_operations_struct vm_ops = {

	.fault = etnaviv_gem_fault,

	.open = drm_gem_vm_open,

	.close = drm_gem_vm_close,

};



static const struct file_operations fops = {

	.owner              = THIS_MODULE,

	.open               = drm_open,
@@ -490,16 +484,9 @@ static struct drm_driver etnaviv_drm_driver = { 
	.driver_features    = DRIVER_GEM | DRIVER_RENDER,

	.open               = etnaviv_open,

	.postclose           = etnaviv_postclose,

	.gem_free_object_unlocked = etnaviv_gem_free_object,

	.gem_vm_ops         = &vm_ops,

	.prime_handle_to_fd = drm_gem_prime_handle_to_fd,

	.prime_fd_to_handle = drm_gem_prime_fd_to_handle,

	.gem_prime_pin      = etnaviv_gem_prime_pin,

	.gem_prime_unpin    = etnaviv_gem_prime_unpin,

	.gem_prime_get_sg_table = etnaviv_gem_prime_get_sg_table,

	.gem_prime_import_sg_table = etnaviv_gem_prime_import_sg_table,

	.gem_prime_vmap     = etnaviv_gem_prime_vmap,

	.gem_prime_vunmap   = etnaviv_gem_prime_vunmap,

	.gem_prime_mmap     = etnaviv_gem_prime_mmap,

#ifdef CONFIG_DEBUG_FS

	.debugfs_init       = etnaviv_debugfs_init,

drivers/gpu/drm/etnaviv/etnaviv_drv.h

+0 −1
Original line number Diff line number Diff line
@@ -49,7 +49,6 @@ int etnaviv_ioctl_gem_submit(struct drm_device *dev, void *data, 
		struct drm_file *file);



int etnaviv_gem_mmap(struct file *filp, struct vm_area_struct *vma);

vm_fault_t etnaviv_gem_fault(struct vm_fault *vmf);

int etnaviv_gem_mmap_offset(struct drm_gem_object *obj, u64 *offset);

struct sg_table *etnaviv_gem_prime_get_sg_table(struct drm_gem_object *obj);

void *etnaviv_gem_prime_vmap(struct drm_gem_object *obj);

drivers/gpu/drm/etnaviv/etnaviv_gem.c

+18 −1
Original line number Diff line number Diff line
@@ -171,7 +171,7 @@ int etnaviv_gem_mmap(struct file *filp, struct vm_area_struct *vma) 
	return obj->ops->mmap(obj, vma);

}



vm_fault_t etnaviv_gem_fault(struct vm_fault *vmf)

static vm_fault_t etnaviv_gem_fault(struct vm_fault *vmf)

{

	struct vm_area_struct *vma = vmf->vma;

	struct drm_gem_object *obj = vma->vm_private_data;
@@ -561,6 +561,22 @@ void etnaviv_gem_obj_add(struct drm_device *dev, struct drm_gem_object *obj) 
	mutex_unlock(&priv->gem_lock);

}



static const struct vm_operations_struct vm_ops = {

	.fault = etnaviv_gem_fault,

	.open = drm_gem_vm_open,

	.close = drm_gem_vm_close,

};



static const struct drm_gem_object_funcs etnaviv_gem_object_funcs = {

	.free = etnaviv_gem_free_object,

	.pin = etnaviv_gem_prime_pin,

	.unpin = etnaviv_gem_prime_unpin,

	.get_sg_table = etnaviv_gem_prime_get_sg_table,

	.vmap = etnaviv_gem_prime_vmap,

	.vunmap = etnaviv_gem_prime_vunmap,

	.vm_ops = &vm_ops,

};



static int etnaviv_gem_new_impl(struct drm_device *dev, u32 size, u32 flags,

	const struct etnaviv_gem_ops *ops, struct drm_gem_object **obj)

{
@@ -595,6 +611,7 @@ static int etnaviv_gem_new_impl(struct drm_device *dev, u32 size, u32 flags, 
	INIT_LIST_HEAD(&etnaviv_obj->vram_list);



	*obj = &etnaviv_obj->base;

	(*obj)->funcs = &etnaviv_gem_object_funcs;



	return 0;

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE