drm: add mmap() to drm_gem_object_funcs
Subsystems (5)
cover drm: add mmap() to drm_gem_object_funcs
Add a new callback where drivers can handle mmap setup without having to override gem_driver->fops->mmap.
Switch shmem helper over as demo.
cheers,
Gerd
Gerd Hoffmann (3):
drm: add mmap() to drm_gem_object_funcs
drm: switch shmem helper to drm_gem_object_funcs->mmap
drm: drop DEFINE_DRM_GEM_SHMEM_FOPS
include/drm/drm_gem.h | 9 ++++++++ include/drm/drm_gem_shmem_helper.h | 28 +------------------------ drivers/gpu/drm/cirrus/cirrus.c | 2 +- drivers/gpu/drm/drm_gem.c | 4 ++++ drivers/gpu/drm/drm_gem_shmem_helper.c | 18 +++++++--------- drivers/gpu/drm/panfrost/panfrost_drv.c | 2 +- drivers/gpu/drm/panfrost/panfrost_gem.c | 1 + drivers/gpu/drm/v3d/v3d_bo.c | 1 + drivers/gpu/drm/v3d/v3d_drv.c | 2 +- 9 files changed, 26 insertions(+), 41 deletions(-)
Signature · 6 lines
2.18.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH 1/3 drm: add mmap() to drm_gem_object_funcs
drm_gem_object_funcs->vm_ops alone can't handle everything mmap() needs. Add a new callback for it.
--- include/drm/drm_gem.h | 9 +++++++++ drivers/gpu/drm/drm_gem.c | 4 ++++ 2 files changed, 13 insertions(+)
include/drm/drm_gem.h +9 -0
@@ -144,6 +144,15 @@ struct drm_gem_object_funcs {*/ void (*vunmap)(struct drm_gem_object *obj,void *vaddr); +/** +* @mmap: +* +* Called by drm_gem_mmap() for additional checks/setup. +* +* This callback is optional. +*/ +int (*mmap)(struct drm_gem_object *obj,struct vm_area_struct *vma); +/** * @vm_ops: *
drivers/gpu/drm/drm_gem.c +4 -0
@@ -1192,6 +1192,10 @@ int drm_gem_mmap(struct file *filp, struct vm_area_struct *vma) ret =drm_gem_mmap_obj (obj,drm_vma_node_size (node) <<PAGE_SHIFT , vma); +if (ret ==0 ) +if (obj->funcs->mmap) + ret = obj->funcs->mmap (obj, vma); +drm_gem_object_put_unlocked (obj);return ret;
Signature · 1 line
2.18.1
PATCH 2/3 drm: switch shmem helper to drm_gem_object_funcs->mmap
In reply to Gerd HoffmannSwitch gem shmem helper from gem_driver->fops->mmap to drm_gem_object_funcs->mmap.
--- include/drm/drm_gem_shmem_helper.h | 4 ++-- drivers/gpu/drm/drm_gem_shmem_helper.c | 18 +++++++----------- drivers/gpu/drm/panfrost/panfrost_gem.c | 1 + drivers/gpu/drm/v3d/v3d_bo.c | 1 + 4 files changed, 11 insertions(+), 13 deletions(-)
include/drm/drm_gem_shmem_helper.h +2 -2
@@ -108,7 +108,7 @@ struct drm_gem_shmem_object { .poll = drm_poll,\ .read = drm_read,\ .llseek = noop_llseek,\ - .mmap = drm_gem_shmem_mmap, \ + .mmap = drm_gem_mmap, \ }struct drm_gem_shmem_object *drm_gem_shmem_create (struct drm_device *dev,size_t size);
@@ -128,7 +128,7 @@ drm_gem_shmem_create_with_handle(struct drm_file *file_priv,int drm_gem_shmem_dumb_create (struct drm_file *file,struct drm_device *dev,struct drm_mode_create_dumb *args); -int drm_gem_shmem_mmap (struct file *filp,struct vm_area_struct *vma); +int drm_gem_shmem_mmap (struct drm_gem_object *obj,struct vm_area_struct *vma);extern const struct vm_operations_struct drm_gem_shmem_vm_ops;
drivers/gpu/drm/drm_gem_shmem_helper.c +7 -11
@@ -31,6 +31,7 @@ static const struct drm_gem_object_funcs drm_gem_shmem_funcs = { .get_sg_table = drm_gem_shmem_get_sg_table, .vmap = drm_gem_shmem_vmap, .vunmap = drm_gem_shmem_vunmap, + .mmap = drm_gem_shmem_mmap, .vm_ops = &drm_gem_shmem_vm_ops, };
@@ -446,30 +447,25 @@ EXPORT_SYMBOL_GPL(drm_gem_shmem_vm_ops);/** * drm_gem_shmem_mmap - Memory-map a shmem GEM object -* @filp: File object +* @obj: gem object * @vma: VMA for the area to be mapped * * This function implements an augmented version of the GEM DRM file mmap * operation for shmem objects. Drivers which employ the shmem helpers should -* use this function as their &file_operations.mmap handler in the DRM device file's -* file_operations structure. +* use this function as their &drm_gem_object_funcs.mmap handler. * -* Instead of directly referencing this function, drivers should use the -* DEFINE_DRM_GEM_SHMEM_FOPS() macro. +* Instead of directly referencing this function, drivers can use +* drm_gem_shmem_funcs. * * Returns: * 0 on success or a negative error code on failure. */ -int drm_gem_shmem_mmap (struct file *filp,struct vm_area_struct *vma) +int drm_gem_shmem_mmap (struct drm_gem_object *obj,struct vm_area_struct *vma) {struct drm_gem_shmem_object *shmem;int ret; - ret =drm_gem_mmap (filp, vma); -if (ret) -return ret; - - shmem =to_drm_gem_shmem_obj (vma->vm_private_data); + shmem =to_drm_gem_shmem_obj (obj); ret =drm_gem_shmem_get_pages (shmem);if (ret) {
drivers/gpu/drm/panfrost/panfrost_gem.c +1 -0
@@ -36,6 +36,7 @@ static const struct drm_gem_object_funcs panfrost_gem_funcs = { .get_sg_table = drm_gem_shmem_get_sg_table, .vmap = drm_gem_shmem_vmap, .vunmap = drm_gem_shmem_vunmap, + .mmap = drm_gem_shmem_mmap, .vm_ops = &drm_gem_shmem_vm_ops, };
drivers/gpu/drm/v3d/v3d_bo.c +1 -0
@@ -58,6 +58,7 @@ static const struct drm_gem_object_funcs v3d_gem_funcs = { .get_sg_table = drm_gem_shmem_get_sg_table, .vmap = drm_gem_shmem_vmap, .vunmap = drm_gem_shmem_vunmap, + .mmap = drm_gem_shmem_mmap, .vm_ops = &drm_gem_shmem_vm_ops, };
Signature · 1 line
2.18.1
PATCH 3/3 drm: drop DEFINE_DRM_GEM_SHMEM_FOPS
In reply to Gerd HoffmannDEFINE_DRM_GEM_SHMEM_FOPS is identical to DEFINE_DRM_GEM_FOPS now, drop it.
--- include/drm/drm_gem_shmem_helper.h | 26 ------------------------- drivers/gpu/drm/cirrus/cirrus.c | 2 +- drivers/gpu/drm/panfrost/panfrost_drv.c | 2 +- drivers/gpu/drm/v3d/v3d_drv.c | 2 +- 4 files changed, 3 insertions(+), 29 deletions(-)
include/drm/drm_gem_shmem_helper.h +0 -26
@@ -85,32 +85,6 @@ struct drm_gem_shmem_object {#define to_drm_gem_shmem_obj (obj) \ container_of(obj, struct drm_gem_shmem_object, base) -/** -* DEFINE_DRM_GEM_SHMEM_FOPS() - Macro to generate file operations for shmem drivers -* @name: name for the generated structure -* -* This macro autogenerates a suitable &struct file_operations for shmem based -* drivers, which can be assigned to &drm_driver.fops. Note that this structure -* cannot be shared between drivers, because it contains a reference to the -* current module using THIS_MODULE. -* -* Note that the declaration is already marked as static - if you need a -* non-static version of this you're probably doing it wrong and will break the -* THIS_MODULE reference by accident. -*/ -#define DEFINE_DRM_GEM_SHMEM_FOPS (name) \ - static const struct file_operations name = {\ - .owner = THIS_MODULE,\ - .open = drm_open,\ - .release = drm_release,\ - .unlocked_ioctl = drm_ioctl,\ - .compat_ioctl = drm_compat_ioctl,\ - .poll = drm_poll,\ - .read = drm_read,\ - .llseek = noop_llseek,\ - .mmap = drm_gem_mmap, \ - } -struct drm_gem_shmem_object *drm_gem_shmem_create (struct drm_device *dev,size_t size);void drm_gem_shmem_free_object (struct drm_gem_object *obj);
drivers/gpu/drm/cirrus/cirrus.c +1 -1
@@ -510,7 +510,7 @@ static void cirrus_mode_config_init(struct cirrus_device *cirrus)/* ------------------------------------------------------------------ */ -DEFINE_DRM_GEM_SHMEM_FOPS (cirrus_fops); +DEFINE_DRM_GEM_FOPS (cirrus_fops);static struct drm_driver cirrus_driver = { .driver_features =DRIVER_MODESET |DRIVER_GEM |DRIVER_ATOMIC |DRIVER_PRIME ,
drivers/gpu/drm/panfrost/panfrost_drv.c +1 -1
@@ -339,7 +339,7 @@ static const struct drm_ioctl_desc panfrost_drm_driver_ioctls[] = { PANFROST_IOCTL(GET_BO_OFFSET, get_bo_offset, DRM_RENDER_ALLOW), }; -DEFINE_DRM_GEM_SHMEM_FOPS (panfrost_drm_driver_fops); +DEFINE_DRM_GEM_FOPS (panfrost_drm_driver_fops);static struct drm_driver panfrost_drm_driver = { .driver_features = DRIVER_RENDER | DRIVER_GEM | DRIVER_PRIME |
drivers/gpu/drm/v3d/v3d_drv.c +1 -1
@@ -166,7 +166,7 @@ v3d_postclose(struct drm_device *dev, struct drm_file *file)kfree (v3d_priv); } -DEFINE_DRM_GEM_SHMEM_FOPS (v3d_drm_fops); +DEFINE_DRM_GEM_FOPS (v3d_drm_fops);/* DRM_AUTH is required on SUBMIT_CL for now, while we don't have GMP * protection between clients. Note that render nodes would be be
Signature · 1 line
2.18.1
PATCH 3/3 drm: drop DEFINE_DRM_GEM_SHMEM_FOPS
In reply to Gerd HoffmannDEFINE_DRM_GEM_SHMEM_FOPS is identical to DEFINE_DRM_GEM_FOPS now, drop it.
--- include/drm/drm_gem_shmem_helper.h | 26 ------------------------- drivers/gpu/drm/cirrus/cirrus.c | 2 +- drivers/gpu/drm/panfrost/panfrost_drv.c | 2 +- drivers/gpu/drm/v3d/v3d_drv.c | 2 +- 4 files changed, 3 insertions(+), 29 deletions(-)
include/drm/drm_gem_shmem_helper.h +0 -26
@@ -85,32 +85,6 @@ struct drm_gem_shmem_object {#define to_drm_gem_shmem_obj (obj) \ container_of(obj, struct drm_gem_shmem_object, base) -/** -* DEFINE_DRM_GEM_SHMEM_FOPS() - Macro to generate file operations for shmem drivers -* @name: name for the generated structure -* -* This macro autogenerates a suitable &struct file_operations for shmem based -* drivers, which can be assigned to &drm_driver.fops. Note that this structure -* cannot be shared between drivers, because it contains a reference to the -* current module using THIS_MODULE. -* -* Note that the declaration is already marked as static - if you need a -* non-static version of this you're probably doing it wrong and will break the -* THIS_MODULE reference by accident. -*/ -#define DEFINE_DRM_GEM_SHMEM_FOPS (name) \ - static const struct file_operations name = {\ - .owner = THIS_MODULE,\ - .open = drm_open,\ - .release = drm_release,\ - .unlocked_ioctl = drm_ioctl,\ - .compat_ioctl = drm_compat_ioctl,\ - .poll = drm_poll,\ - .read = drm_read,\ - .llseek = noop_llseek,\ - .mmap = drm_gem_mmap, \ - } -struct drm_gem_shmem_object *drm_gem_shmem_create (struct drm_device *dev,size_t size);void drm_gem_shmem_free_object (struct drm_gem_object *obj);
drivers/gpu/drm/cirrus/cirrus.c +1 -1
@@ -510,7 +510,7 @@ static void cirrus_mode_config_init(struct cirrus_device *cirrus)/* ------------------------------------------------------------------ */ -DEFINE_DRM_GEM_SHMEM_FOPS (cirrus_fops); +DEFINE_DRM_GEM_FOPS (cirrus_fops);static struct drm_driver cirrus_driver = { .driver_features =DRIVER_MODESET |DRIVER_GEM |DRIVER_ATOMIC |DRIVER_PRIME ,
drivers/gpu/drm/panfrost/panfrost_drv.c +1 -1
@@ -339,7 +339,7 @@ static const struct drm_ioctl_desc panfrost_drm_driver_ioctls[] = { PANFROST_IOCTL(GET_BO_OFFSET, get_bo_offset, DRM_RENDER_ALLOW), }; -DEFINE_DRM_GEM_SHMEM_FOPS (panfrost_drm_driver_fops); +DEFINE_DRM_GEM_FOPS (panfrost_drm_driver_fops);static struct drm_driver panfrost_drm_driver = { .driver_features = DRIVER_RENDER | DRIVER_GEM | DRIVER_PRIME |
drivers/gpu/drm/v3d/v3d_drv.c +1 -1
@@ -166,7 +166,7 @@ v3d_postclose(struct drm_device *dev, struct drm_file *file)kfree (v3d_priv); } -DEFINE_DRM_GEM_SHMEM_FOPS (v3d_drm_fops); +DEFINE_DRM_GEM_FOPS (v3d_drm_fops);/* DRM_AUTH is required on SUBMIT_CL for now, while we don't have GMP * protection between clients. Note that render nodes would be be
Signature · 1 line
2.18.1