Commit 3c9edd9c authored by Thomas Zimmermann's avatar Thomas Zimmermann
Browse files

drm/msm: Introduce GEM object funcs 



GEM object functions deprecate several similar callback interfaces in
struct drm_driver. This patch replaces the per-driver callbacks with
per-instance callbacks in msm. 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 avatarChristian König <christian.koenig@amd.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200923102159.24084-10-tzimmermann@suse.de
parent 84274de6

drivers/gpu/drm/msm/msm_drv.c

+0 −13
Original line number Diff line number Diff line
@@ -978,12 +978,6 @@ static const struct drm_ioctl_desc msm_ioctls[] = { 
	DRM_IOCTL_DEF_DRV(MSM_SUBMITQUEUE_QUERY, msm_ioctl_submitqueue_query, DRM_RENDER_ALLOW),

};



static const struct vm_operations_struct vm_ops = {

	.fault = msm_gem_fault,

	.open = drm_gem_vm_open,

	.close = drm_gem_vm_close,

};



static const struct file_operations fops = {

	.owner              = THIS_MODULE,

	.open               = drm_open,
@@ -1009,18 +1003,11 @@ static struct drm_driver msm_driver = { 
	.irq_preinstall     = msm_irq_preinstall,

	.irq_postinstall    = msm_irq_postinstall,

	.irq_uninstall      = msm_irq_uninstall,

	.gem_free_object_unlocked = msm_gem_free_object,

	.gem_vm_ops         = &vm_ops,

	.dumb_create        = msm_gem_dumb_create,

	.dumb_map_offset    = msm_gem_dumb_map_offset,

	.prime_handle_to_fd = drm_gem_prime_handle_to_fd,

	.prime_fd_to_handle = drm_gem_prime_fd_to_handle,

	.gem_prime_pin      = msm_gem_prime_pin,

	.gem_prime_unpin    = msm_gem_prime_unpin,

	.gem_prime_get_sg_table = msm_gem_prime_get_sg_table,

	.gem_prime_import_sg_table = msm_gem_prime_import_sg_table,

	.gem_prime_vmap     = msm_gem_prime_vmap,

	.gem_prime_vunmap   = msm_gem_prime_vunmap,

	.gem_prime_mmap     = msm_gem_prime_mmap,

#ifdef CONFIG_DEBUG_FS

	.debugfs_init       = msm_debugfs_init,

drivers/gpu/drm/msm/msm_drv.h

+0 −1
Original line number Diff line number Diff line
@@ -269,7 +269,6 @@ void msm_gem_shrinker_cleanup(struct drm_device *dev); 
int msm_gem_mmap_obj(struct drm_gem_object *obj,

			struct vm_area_struct *vma);

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

vm_fault_t msm_gem_fault(struct vm_fault *vmf);

uint64_t msm_gem_mmap_offset(struct drm_gem_object *obj);

int msm_gem_get_iova(struct drm_gem_object *obj,

		struct msm_gem_address_space *aspace, uint64_t *iova);

drivers/gpu/drm/msm/msm_gem.c

+18 −1
Original line number Diff line number Diff line
@@ -247,7 +247,7 @@ int msm_gem_mmap(struct file *filp, struct vm_area_struct *vma) 
	return msm_gem_mmap_obj(vma->vm_private_data, vma);

}



vm_fault_t msm_gem_fault(struct vm_fault *vmf)

static vm_fault_t msm_gem_fault(struct vm_fault *vmf)

{

	struct vm_area_struct *vma = vmf->vma;

	struct drm_gem_object *obj = vma->vm_private_data;
@@ -994,6 +994,22 @@ int msm_gem_new_handle(struct drm_device *dev, struct drm_file *file, 
	return ret;

}



static const struct vm_operations_struct vm_ops = {

	.fault = msm_gem_fault,

	.open = drm_gem_vm_open,

	.close = drm_gem_vm_close,

};



static const struct drm_gem_object_funcs msm_gem_object_funcs = {

	.free = msm_gem_free_object,

	.pin = msm_gem_prime_pin,

	.unpin = msm_gem_prime_unpin,

	.get_sg_table = msm_gem_prime_get_sg_table,

	.vmap = msm_gem_prime_vmap,

	.vunmap = msm_gem_prime_vunmap,

	.vm_ops = &vm_ops,

};



static int msm_gem_new_impl(struct drm_device *dev,

		uint32_t size, uint32_t flags,

		struct drm_gem_object **obj)
@@ -1024,6 +1040,7 @@ static int msm_gem_new_impl(struct drm_device *dev, 
	INIT_LIST_HEAD(&msm_obj->vmas);



	*obj = &msm_obj->base;

	(*obj)->funcs = &msm_gem_object_funcs;



	return 0;

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE