On Mi, 2020-09-23 at 12:21 +0200, Thomas Zimmermann wrote: > 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: Thomas Zimmermann <tzimmerm...@suse.de> > Reviewed-by: Daniel Vetter <daniel.vet...@ffwll.ch>
Acked-by: Lucas Stach <l.st...@pengutronix.de> > --- > drivers/gpu/drm/etnaviv/etnaviv_drv.c | 13 ------------- > drivers/gpu/drm/etnaviv/etnaviv_drv.h | 1 - > drivers/gpu/drm/etnaviv/etnaviv_gem.c | 19 ++++++++++++++++++- > 3 files changed, 18 insertions(+), 15 deletions(-) > > diff --git a/drivers/gpu/drm/etnaviv/etnaviv_drv.c > b/drivers/gpu/drm/etnaviv/etnaviv_drv.c > index a9a3afaef9a1..aa270b79e585 100644 > --- a/drivers/gpu/drm/etnaviv/etnaviv_drv.c > +++ b/drivers/gpu/drm/etnaviv/etnaviv_drv.c > @@ -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, > diff --git a/drivers/gpu/drm/etnaviv/etnaviv_drv.h > b/drivers/gpu/drm/etnaviv/etnaviv_drv.h > index 4d8dc9236e5f..914f0867ff71 100644 > --- a/drivers/gpu/drm/etnaviv/etnaviv_drv.h > +++ b/drivers/gpu/drm/etnaviv/etnaviv_drv.h > @@ -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); > diff --git a/drivers/gpu/drm/etnaviv/etnaviv_gem.c > b/drivers/gpu/drm/etnaviv/etnaviv_gem.c > index d1533bdc1335..67d9a2b9ea6a 100644 > --- a/drivers/gpu/drm/etnaviv/etnaviv_gem.c > +++ b/drivers/gpu/drm/etnaviv/etnaviv_gem.c > @@ -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; > @@ -559,6 +559,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) > { > @@ -593,6 +609,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; > }