drm: Implement gem_prime_mmap with drm_gem_prime_mmap()
Subsystems (16)
Thomas Zimmermann
maintainercover drm: Implement gem_prime_mmap with drm_gem_prime_mmap()
Replace all remaining implementations of struct drm_driver.gem_prime_mmap with use drm_gem_prime_mmap(). For each affected driver, put the mmap code into struct drm_gem_object_funcs.mmap. With the latter change in place, create struct file_operations via DEFINE_DRM_GEM_FOPS().
As next steps, remaining drivers can be converted to use drm_gem_prime_mmap() and drm_gem_mmap() (e.g., Tegra). The default mmap code in drm_gem_prime_mmap() can be pushed into affected drivers or a helper function. The gem_prime_mmap hook can probably be removed at some point.
Testing is welcome. I don't have all the necessary hardware.
Thomas Zimmermann (9):
drm/etnaviv: Implement mmap as GEM object function drm/exynox: Implement mmap as GEM object function drm/mediatek: Implement mmap as GEM object function drm/msm: Implement mmap as GEM object function drm/qxl: Remove empty qxl_gem_prime_mmap() drm/vgem: Implement mmap as GEM object function drm/xen: Implement mmap as GEM object function drm/rockchip: Implement mmap as GEM object function
drm: Update documentation and TODO of gem_prime_mmap hook
Documentation/gpu/todo.rst | 11 -- drivers/gpu/drm/etnaviv/etnaviv_drv.c | 14 +-- drivers/gpu/drm/etnaviv/etnaviv_drv.h | 3 - drivers/gpu/drm/etnaviv/etnaviv_gem.c | 18 +-- drivers/gpu/drm/etnaviv/etnaviv_gem_prime.c | 13 --- drivers/gpu/drm/exynos/exynos_drm_drv.c | 13 +-- drivers/gpu/drm/exynos/exynos_drm_fbdev.c | 20 +--- drivers/gpu/drm/exynos/exynos_drm_gem.c | 43 ++----- drivers/gpu/drm/exynos/exynos_drm_gem.h | 5 - drivers/gpu/drm/mediatek/mtk_drm_drv.c | 13 +-- drivers/gpu/drm/mediatek/mtk_drm_gem.c | 44 ++----- drivers/gpu/drm/mediatek/mtk_drm_gem.h | 3 - drivers/gpu/drm/msm/msm_drv.c | 14 +-- drivers/gpu/drm/msm/msm_drv.h | 1 - drivers/gpu/drm/msm/msm_fbdev.c | 10 +- drivers/gpu/drm/msm/msm_gem.c | 67 +++++------ drivers/gpu/drm/msm/msm_gem.h | 3 - drivers/gpu/drm/msm/msm_gem_prime.c | 11 -- drivers/gpu/drm/qxl/qxl_drv.c | 1 - drivers/gpu/drm/qxl/qxl_drv.h | 2 - drivers/gpu/drm/qxl/qxl_prime.c | 6 - drivers/gpu/drm/rockchip/rockchip_drm_drv.c | 13 +-- drivers/gpu/drm/rockchip/rockchip_drm_fbdev.c | 3 +- drivers/gpu/drm/rockchip/rockchip_drm_gem.c | 44 ++----- drivers/gpu/drm/rockchip/rockchip_drm_gem.h | 7 -- drivers/gpu/drm/vgem/vgem_drv.c | 46 +------- drivers/gpu/drm/xen/xen_drm_front.c | 16 +-- drivers/gpu/drm/xen/xen_drm_front_gem.c | 108 +++++++----------- drivers/gpu/drm/xen/xen_drm_front_gem.h | 7 -- include/drm/drm_drv.h | 11 +- 30 files changed, 136 insertions(+), 434 deletions(-)
base-commit: 70e4d80795934312a3853a4f4f49445ce6db1271
prerequisite-patch-id: c2b2f08f0eccc9f5df0c0da49fa1d36267deb11d
prerequisite-patch-id: c67e5d886a47b7d0266d81100837557fda34cb24 --
2.31.1
Thomas Zimmermann
maintainerPATCH 1/9 drm/etnaviv: Implement mmap as GEM object function
Moving the driver-specific mmap code into a GEM object function allows for using DRM helpers for various mmap callbacks.
The respective etnaviv functions are being removed. The file_operations structure fops is now being created by the helper macro DEFINE_DRM_GEM_FOPS().
--- drivers/gpu/drm/etnaviv/etnaviv_drv.c | 14 ++------------ drivers/gpu/drm/etnaviv/etnaviv_drv.h | 3 --- drivers/gpu/drm/etnaviv/etnaviv_gem.c | 18 +++++------------- drivers/gpu/drm/etnaviv/etnaviv_gem_prime.c | 13 ------------- 4 files changed, 7 insertions(+), 41 deletions(-)
drivers/gpu/drm/etnaviv/etnaviv_drv.c +2 -12
@@ -468,17 +468,7 @@ static const struct drm_ioctl_desc etnaviv_ioctls[] = {ETNA_IOCTL (PM_QUERY_SIG , pm_query_sig,DRM_RENDER_ALLOW ), }; -static const struct file_operations fops = { - .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 = no_llseek, - .mmap = etnaviv_gem_mmap, -}; +DEFINE_DRM_GEM_FOPS (fops);static const struct drm_driver etnaviv_drm_driver = { .driver_features = DRIVER_GEM | DRIVER_RENDER,
@@ -487,7 +477,7 @@ static const struct drm_driver etnaviv_drm_driver = { .prime_handle_to_fd = drm_gem_prime_handle_to_fd, .prime_fd_to_handle = drm_gem_prime_fd_to_handle, .gem_prime_import_sg_table = etnaviv_gem_prime_import_sg_table, - .gem_prime_mmap = etnaviv_gem_prime_mmap, + .gem_prime_mmap = drm_gem_prime_mmap,#ifdef CONFIG_DEBUG_FS .debugfs_init = etnaviv_debugfs_init,#endif
drivers/gpu/drm/etnaviv/etnaviv_drv.h +0 -3
@@ -47,12 +47,9 @@ struct etnaviv_drm_private {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);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);int etnaviv_gem_prime_vmap (struct drm_gem_object *obj,struct dma_buf_map *map); -int etnaviv_gem_prime_mmap (struct drm_gem_object *obj, -struct vm_area_struct *vma);struct drm_gem_object *etnaviv_gem_prime_import_sg_table (struct drm_device *dev,struct dma_buf_attachment *attach,struct sg_table *sg);int etnaviv_gem_prime_pin (struct drm_gem_object *obj);
drivers/gpu/drm/etnaviv/etnaviv_gem.c +5 -13
@@ -130,8 +130,7 @@ static int etnaviv_gem_mmap_obj(struct etnaviv_gem_object *etnaviv_obj, {pgprot_t vm_page_prot; - vma->vm_flags &= ~VM_PFNMAP ; - vma->vm_flags |=VM_MIXEDMAP ; + vma->vm_flags |=VM_IO |VM_MIXEDMAP |VM_DONTEXPAND |VM_DONTDUMP ; vm_page_prot =vm_get_page_prot (vma->vm_flags);
@@ -154,19 +153,11 @@ static int etnaviv_gem_mmap_obj(struct etnaviv_gem_object *etnaviv_obj,return 0 ; } -int etnaviv_gem_mmap (struct file *filp,struct vm_area_struct *vma) +static int etnaviv_gem_mmap (struct drm_gem_object *obj,struct vm_area_struct *vma) { -struct etnaviv_gem_object *obj; -int ret; - - ret =drm_gem_mmap (filp, vma); -if (ret) { -DBG ("mmap failed: %d" , ret); -return ret; - } +struct etnaviv_gem_object *etnaviv_obj =to_etnaviv_bo (obj); - obj =to_etnaviv_bo (vma->vm_private_data); -return obj->ops->mmap (obj, vma); +return etnaviv_obj->ops->mmap (etnaviv_obj, vma); }static vm_fault_t etnaviv_gem_fault (struct vm_fault *vmf)
@@ -567,6 +558,7 @@ static const struct drm_gem_object_funcs etnaviv_gem_object_funcs = { .unpin = etnaviv_gem_prime_unpin, .get_sg_table = etnaviv_gem_prime_get_sg_table, .vmap = etnaviv_gem_prime_vmap, + .mmap = etnaviv_gem_mmap, .vm_ops = &vm_ops, };
drivers/gpu/drm/etnaviv/etnaviv_gem_prime.c +0 -13
@@ -34,19 +34,6 @@ int etnaviv_gem_prime_vmap(struct drm_gem_object *obj, struct dma_buf_map *map)return 0 ; } -int etnaviv_gem_prime_mmap (struct drm_gem_object *obj, -struct vm_area_struct *vma) -{ -struct etnaviv_gem_object *etnaviv_obj =to_etnaviv_bo (obj); -int ret; - - ret =drm_gem_mmap_obj (obj, obj->size, vma); -if (ret <0 ) -return ret; - -return etnaviv_obj->ops->mmap (etnaviv_obj, vma); -} -int etnaviv_gem_prime_pin (struct drm_gem_object *obj) {if (!obj->import_attach) {
Signature · 1 line
2.31.1
Thomas Zimmermann
maintainerPATCH 2/9 drm/exynox: Implement mmap as GEM object function
In reply to Thomas ZimmermannMoving the driver-specific mmap code into a GEM object function allows for using DRM helpers for various mmap callbacks.
The respective exynos functions are being removed. The file_operations structure exynos_drm_driver_fops is now being created by the helper macro DEFINE_DRM_GEM_FOPS().
--- drivers/gpu/drm/exynos/exynos_drm_drv.c | 13 ++----- drivers/gpu/drm/exynos/exynos_drm_fbdev.c | 20 ++--------- drivers/gpu/drm/exynos/exynos_drm_gem.c | 43 +++++------------------ drivers/gpu/drm/exynos/exynos_drm_gem.h | 5 --- 4 files changed, 13 insertions(+), 68 deletions(-)
drivers/gpu/drm/exynos/exynos_drm_drv.c +2 -11
@@ -102,16 +102,7 @@ static const struct drm_ioctl_desc exynos_ioctls[] = { DRM_RENDER_ALLOW), }; -static const struct file_operations exynos_drm_driver_fops = { - .owner =THIS_MODULE , - .open = drm_open, - .mmap = exynos_drm_gem_mmap, - .poll = drm_poll, - .read = drm_read, - .unlocked_ioctl = drm_ioctl, - .compat_ioctl = drm_compat_ioctl, - .release = drm_release, -}; +DEFINE_DRM_GEM_FOPS (exynos_drm_driver_fops);static const struct drm_driver exynos_drm_driver = { .driver_features =DRIVER_MODESET |DRIVER_GEM
@@ -124,7 +115,7 @@ static const struct drm_driver exynos_drm_driver = { .prime_fd_to_handle = drm_gem_prime_fd_to_handle, .gem_prime_import = exynos_drm_gem_prime_import, .gem_prime_import_sg_table = exynos_drm_gem_prime_import_sg_table, - .gem_prime_mmap = exynos_drm_gem_prime_mmap, + .gem_prime_mmap = drm_gem_prime_mmap, .ioctls = exynos_ioctls, .num_ioctls = ARRAY_SIZE(exynos_ioctls), .fops = &exynos_drm_driver_fops,
drivers/gpu/drm/exynos/exynos_drm_fbdev.c +2 -18
@@ -15,6 +15,7 @@#include <drm/drm_crtc.h> #include <drm/drm_fb_helper.h> #include <drm/drm_fourcc.h> +#include <drm/drm_prime.h> #include <drm/drm_probe_helper.h> #include <drm/exynos_drm.h>
@@ -39,25 +40,8 @@ static int exynos_drm_fb_mmap(struct fb_info *info,struct drm_fb_helper *helper = info->par;struct exynos_drm_fbdev *exynos_fbd =to_exynos_fbdev (helper);struct exynos_drm_gem *exynos_gem = exynos_fbd->exynos_gem; -unsigned long vm_size; -int ret; - - vma->vm_flags |=VM_IO |VM_DONTEXPAND |VM_DONTDUMP ; - - vm_size = vma->vm_end - vma->vm_start; - -if (vm_size > exynos_gem->size) -return -EINVAL ; - ret =dma_mmap_attrs (to_dma_dev (helper->dev), vma, exynos_gem->cookie, - exynos_gem->dma_addr, exynos_gem->size, - exynos_gem->dma_attrs); -if (ret <0 ) { -DRM_DEV_ERROR (to_dma_dev (helper->dev),"failed to mmap.\n" ); -return ret; - } - -return 0 ; +return drm_gem_prime_mmap (&exynos_gem->base, vma); }static const struct fb_ops exynos_drm_fb_ops = {
drivers/gpu/drm/exynos/exynos_drm_gem.c +9 -34
74 lines not on this page · raw message
drivers/gpu/drm/exynos/exynos_drm_gem.h +0 -5
@@ -96,9 +96,6 @@ int exynos_drm_gem_dumb_create(struct drm_file *file_priv,struct drm_device *dev, struct drm_mode_create_dumb *args); -/* set vm_flags and we can change the vm attribute to other one at here. */ -int exynos_drm_gem_mmap (struct file *filp,struct vm_area_struct *vma); -/* low-level interface prime helpers */ struct drm_gem_object *exynos_drm_gem_prime_import (struct drm_device *dev,struct dma_buf *dma_buf);
@@ -107,7 +104,5 @@ struct drm_gem_object * exynos_drm_gem_prime_import_sg_table(struct drm_device *dev, struct dma_buf_attachment *attach, struct sg_table *sgt); -int exynos_drm_gem_prime_mmap (struct drm_gem_object *obj, -struct vm_area_struct *vma);#endif
Signature · 6 lines
2.31.1 _______________________________________________ Virtualization mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/virtualization
Thomas Zimmermann
maintainerPATCH 3/9 drm/mediatek: Implement mmap as GEM object function
In reply to Thomas ZimmermannMoving the driver-specific mmap code into a GEM object function allows for using DRM helpers for various mmap callbacks.
The respective mediatek functions are being removed. The file_operations structure fops is now being created by the helper macro DEFINE_DRM_GEM_FOPS().
--- drivers/gpu/drm/mediatek/mtk_drm_drv.c | 13 ++------ drivers/gpu/drm/mediatek/mtk_drm_gem.c | 44 +++++++------------------- drivers/gpu/drm/mediatek/mtk_drm_gem.h | 3 -- 3 files changed, 14 insertions(+), 46 deletions(-)
drivers/gpu/drm/mediatek/mtk_drm_drv.c +2 -11
@@ -300,16 +300,7 @@ static void mtk_drm_kms_deinit(struct drm_device *drm)component_unbind_all (drm->dev, drm); } -static const struct file_operations mtk_drm_fops = { - .owner =THIS_MODULE , - .open = drm_open, - .release = drm_release, - .unlocked_ioctl = drm_ioctl, - .mmap = mtk_drm_gem_mmap, - .poll = drm_poll, - .read = drm_read, - .compat_ioctl = drm_compat_ioctl, -}; +DEFINE_DRM_GEM_FOPS (mtk_drm_fops);/* * We need to override this because the device used to import the memory is
@@ -332,7 +323,7 @@ static const struct drm_driver mtk_drm_driver = { .prime_fd_to_handle = drm_gem_prime_fd_to_handle, .gem_prime_import = mtk_drm_gem_prime_import, .gem_prime_import_sg_table = mtk_gem_prime_import_sg_table, - .gem_prime_mmap = mtk_drm_gem_mmap_buf, + .gem_prime_mmap = drm_gem_prime_mmap, .fops = &mtk_drm_fops, .name = DRIVER_NAME,
drivers/gpu/drm/mediatek/mtk_drm_gem.c +12 -32
71 lines not on this page · raw message
drivers/gpu/drm/mediatek/mtk_drm_gem.h +0 -3
@@ -39,9 +39,6 @@ struct mtk_drm_gem_obj *mtk_drm_gem_create(struct drm_device *dev, size_t size, bool alloc_kmap);int mtk_drm_gem_dumb_create (struct drm_file *file_priv,struct drm_device *dev,struct drm_mode_create_dumb *args); -int mtk_drm_gem_mmap (struct file *filp,struct vm_area_struct *vma); -int mtk_drm_gem_mmap_buf (struct drm_gem_object *obj, -struct vm_area_struct *vma);struct sg_table *mtk_gem_prime_get_sg_table (struct drm_gem_object *obj);struct drm_gem_object *mtk_gem_prime_import_sg_table (struct drm_device *dev,struct dma_buf_attachment *attach,struct sg_table *sg);
Signature · 6 lines
2.31.1 _______________________________________________ Virtualization mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/virtualization
Thomas Zimmermann
maintainerPATCH 4/9 drm/msm: Implement mmap as GEM object function
In reply to Thomas ZimmermannMoving the driver-specific mmap code into a GEM object function allows for using DRM helpers for various mmap callbacks.
The respective msm functions are being removed. The file_operations structure fops is now being created by the helper macro DEFINE_DRM_GEM_FOPS().
--- drivers/gpu/drm/msm/msm_drv.c | 14 +----- drivers/gpu/drm/msm/msm_drv.h | 1 - drivers/gpu/drm/msm/msm_fbdev.c | 10 +---- drivers/gpu/drm/msm/msm_gem.c | 67 ++++++++++++----------------- drivers/gpu/drm/msm/msm_gem.h | 3 -- drivers/gpu/drm/msm/msm_gem_prime.c | 11 ----- 6 files changed, 31 insertions(+), 75 deletions(-)
drivers/gpu/drm/msm/msm_drv.c +2 -12
@@ -985,17 +985,7 @@ 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 file_operations fops = { - .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 = no_llseek, - .mmap = msm_gem_mmap, -}; +DEFINE_DRM_GEM_FOPS (fops);static const struct drm_driver msm_driver = { .driver_features = DRIVER_GEM |
@@ -1015,7 +1005,7 @@ static const struct drm_driver msm_driver = { .prime_handle_to_fd = drm_gem_prime_handle_to_fd, .prime_fd_to_handle = drm_gem_prime_fd_to_handle, .gem_prime_import_sg_table = msm_gem_prime_import_sg_table, - .gem_prime_mmap = msm_gem_prime_mmap, + .gem_prime_mmap = drm_gem_prime_mmap,#ifdef CONFIG_DEBUG_FS .debugfs_init = msm_debugfs_init,#endif
drivers/gpu/drm/msm/msm_drv.h +0 -1
@@ -300,7 +300,6 @@ void msm_gem_shrinker_cleanup(struct drm_device *dev);struct sg_table *msm_gem_prime_get_sg_table (struct drm_gem_object *obj);int msm_gem_prime_vmap (struct drm_gem_object *obj,struct dma_buf_map *map);void msm_gem_prime_vunmap (struct drm_gem_object *obj,struct dma_buf_map *map); -int msm_gem_prime_mmap (struct drm_gem_object *obj,struct vm_area_struct *vma);struct drm_gem_object *msm_gem_prime_import_sg_table (struct drm_device *dev,struct dma_buf_attachment *attach,struct sg_table *sg);int msm_gem_prime_pin (struct drm_gem_object *obj);
drivers/gpu/drm/msm/msm_fbdev.c +2 -8
@@ -8,6 +8,7 @@#include <drm/drm_crtc.h> #include <drm/drm_fb_helper.h> #include <drm/drm_fourcc.h> +#include <drm/drm_prime.h> #include "msm_drv.h" #include "msm_gem.h"
@@ -48,15 +49,8 @@ static int msm_fbdev_mmap(struct fb_info *info, struct vm_area_struct *vma)struct drm_fb_helper *helper = (struct drm_fb_helper *)info->par;struct msm_fbdev *fbdev =to_msm_fbdev (helper);struct drm_gem_object *bo =msm_framebuffer_bo (fbdev->fb,0 ); -int ret =0 ; - ret =drm_gem_mmap_obj (bo, bo->size, vma); -if (ret) { -pr_err ("%s:drm_gem_mmap_obj fail\n" , __func__); -return ret; - } - -return msm_gem_mmap_obj (bo, vma); +return drm_gem_prime_mmap (bo, vma); } static int msm_fbdev_create(struct drm_fb_helper *helper,
drivers/gpu/drm/msm/msm_gem.c +27 -40
85 lines not on this page · raw message
drivers/gpu/drm/msm/msm_gem.h +0 -3
@@ -112,9 +112,6 @@ struct msm_gem_object { };#define to_msm_bo (x) container_of(x, struct msm_gem_object, base) -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);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_prime.c +0 -11
@@ -39,17 +39,6 @@ void msm_gem_prime_vunmap(struct drm_gem_object *obj, struct dma_buf_map *map)msm_gem_put_vaddr (obj); } -int msm_gem_prime_mmap (struct drm_gem_object *obj,struct vm_area_struct *vma) -{ -int ret; - - ret =drm_gem_mmap_obj (obj, obj->size, vma); -if (ret <0 ) -return ret; - -return msm_gem_mmap_obj (vma->vm_private_data, vma); -} -struct drm_gem_object *msm_gem_prime_import_sg_table (struct drm_device *dev,struct dma_buf_attachment *attach,struct sg_table *sg) {
Signature · 6 lines
2.31.1 _______________________________________________ Virtualization mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/virtualization
Thomas Zimmermann
maintainerPATCH 5/9 drm/qxl: Remove empty qxl_gem_prime_mmap()
In reply to Thomas ZimmermannThe function qxl_gem_prime_mmap() returns an error. The two callers of gem_prime_mmap are drm_fbdev_fb_mmap() and drm_gem_dmabuf_mmap(), which both already handle NULL-callbacks with an error code. So clear gem_prime_mmap in qxl and remove qxl_gem_prime_mmap().
--- drivers/gpu/drm/qxl/qxl_drv.c | 1 - drivers/gpu/drm/qxl/qxl_drv.h | 2 -- drivers/gpu/drm/qxl/qxl_prime.c | 6 ------ 3 files changed, 9 deletions(-)
drivers/gpu/drm/qxl/qxl_drv.c +0 -1
@@ -281,7 +281,6 @@ static struct drm_driver qxl_driver = { .prime_handle_to_fd = drm_gem_prime_handle_to_fd, .prime_fd_to_handle = drm_gem_prime_fd_to_handle, .gem_prime_import_sg_table = qxl_gem_prime_import_sg_table, - .gem_prime_mmap = qxl_gem_prime_mmap, .fops = &qxl_fops, .ioctls = qxl_ioctls, .irq_handler = qxl_irq_handler,
drivers/gpu/drm/qxl/qxl_drv.h +0 -2
@@ -434,8 +434,6 @@ struct drm_gem_object *qxl_gem_prime_import_sg_table(int qxl_gem_prime_vmap (struct drm_gem_object *obj,struct dma_buf_map *map);void qxl_gem_prime_vunmap (struct drm_gem_object *obj,struct dma_buf_map *map); -int qxl_gem_prime_mmap (struct drm_gem_object *obj, -struct vm_area_struct *vma);/* qxl_irq.c */ int qxl_irq_init (struct qxl_device *qdev);
drivers/gpu/drm/qxl/qxl_prime.c +0 -6
@@ -73,9 +73,3 @@ void qxl_gem_prime_vunmap(struct drm_gem_object *obj,qxl_bo_vunmap (bo); } - -int qxl_gem_prime_mmap (struct drm_gem_object *obj, -struct vm_area_struct *area) -{ -return -ENOSYS ; -}
Signature · 6 lines
2.31.1 _______________________________________________ Virtualization mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/virtualization
Thomas Zimmermann
maintainerPATCH 6/9 drm/vgem: Implement mmap as GEM object function
In reply to Thomas ZimmermannMoving the driver-specific mmap code into a GEM object function allows for using DRM helpers for various mmap callbacks.
The respective vgem functions are being removed. The file_operations structure vgem_driver_fops is now being created by the helper macro DEFINE_DRM_GEM_FOPS().
--- drivers/gpu/drm/vgem/vgem_drv.c | 46 ++++----------------------------- 1 file changed, 5 insertions(+), 41 deletions(-)
drivers/gpu/drm/vgem/vgem_drv.c +5 -41
@@ -239,32 +239,7 @@ static struct drm_ioctl_desc vgem_ioctls[] = {DRM_IOCTL_DEF_DRV (VGEM_FENCE_SIGNAL , vgem_fence_signal_ioctl,DRM_RENDER_ALLOW ), }; -static int vgem_mmap (struct file *filp,struct vm_area_struct *vma) -{ -unsigned long flags = vma->vm_flags; -int ret; - - ret =drm_gem_mmap (filp, vma); -if (ret) -return ret; - -/* Keep the WC mmaping set by drm_gem_mmap() but our pages -* are ordinary and not special. -*/ - vma->vm_flags = flags |VM_DONTEXPAND |VM_DONTDUMP ; -return 0 ; -} - -static const struct file_operations vgem_driver_fops = { - .owner =THIS_MODULE , - .open = drm_open, - .mmap = vgem_mmap, - .poll = drm_poll, - .read = drm_read, - .unlocked_ioctl = drm_ioctl, - .compat_ioctl = drm_compat_ioctl, - .release = drm_release, -}; +DEFINE_DRM_GEM_FOPS (vgem_driver_fops);static struct page **vgem_pin_pages (struct drm_vgem_gem_object *bo) {
@@ -387,24 +362,12 @@ static void vgem_prime_vunmap(struct drm_gem_object *obj, struct dma_buf_map *mavgem_unpin_pages (bo); } -static int vgem_prime_mmap (struct drm_gem_object *obj, -struct vm_area_struct *vma) +static int vgem_prime_mmap (struct drm_gem_object *obj,struct vm_area_struct *vma) { -int ret; - -if (obj->size < vma->vm_end - vma->vm_start) -return -EINVAL ; - -if (!obj->filp) -return -ENODEV ; - - ret =call_mmap (obj->filp, vma); -if (ret) -return ret; -vma_set_file (vma, obj->filp); vma->vm_flags |=VM_DONTEXPAND |VM_DONTDUMP ; vma->vm_page_prot =pgprot_writecombine (vm_get_page_prot (vma->vm_flags)); + vma->vm_page_prot =pgprot_decrypted (vma->vm_page_prot);return 0 ; }
@@ -416,6 +379,7 @@ static const struct drm_gem_object_funcs vgem_gem_object_funcs = { .get_sg_table = vgem_prime_get_sg_table, .vmap = vgem_prime_vmap, .vunmap = vgem_prime_vunmap, + .mmap = vgem_prime_mmap, .vm_ops = &vgem_gem_vm_ops, };
@@ -433,7 +397,7 @@ static const struct drm_driver vgem_driver = { .prime_fd_to_handle = drm_gem_prime_fd_to_handle, .gem_prime_import = vgem_prime_import, .gem_prime_import_sg_table = vgem_prime_import_sg_table, - .gem_prime_mmap = vgem_prime_mmap, + .gem_prime_mmap = drm_gem_prime_mmap, .name = DRIVER_NAME, .desc = DRIVER_DESC,
Signature · 6 lines
2.31.1 _______________________________________________ Virtualization mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/virtualization
Thomas Zimmermann
maintainerPATCH 7/9 drm/xen: Implement mmap as GEM object function
In reply to Thomas ZimmermannMoving the driver-specific mmap code into a GEM object function allows for using DRM helpers for various mmap callbacks.
The respective xen functions are being removed. The file_operations structure fops is now being created by the helper macro DEFINE_DRM_GEM_FOPS().
--- drivers/gpu/drm/xen/xen_drm_front.c | 16 +--- drivers/gpu/drm/xen/xen_drm_front_gem.c | 108 +++++++++--------------- drivers/gpu/drm/xen/xen_drm_front_gem.h | 7 -- 3 files changed, 44 insertions(+), 87 deletions(-)
drivers/gpu/drm/xen/xen_drm_front.c +2 -14
@@ -469,19 +469,7 @@ static void xen_drm_drv_release(struct drm_device *dev)kfree (drm_info); } -static const struct file_operations xen_drm_dev_fops = { - .owner =THIS_MODULE , - .open = drm_open, - .release = drm_release, - .unlocked_ioctl = drm_ioctl, -#ifdef CONFIG_COMPAT - .compat_ioctl = drm_compat_ioctl, -#endif - .poll = drm_poll, - .read = drm_read, - .llseek = no_llseek, - .mmap = xen_drm_front_gem_mmap, -}; +DEFINE_DRM_GEM_FOPS (xen_drm_dev_fops);static const struct drm_driver xen_drm_driver = { .driver_features =DRIVER_GEM |DRIVER_MODESET |DRIVER_ATOMIC ,
@@ -489,7 +477,7 @@ static const struct drm_driver xen_drm_driver = { .prime_handle_to_fd = drm_gem_prime_handle_to_fd, .prime_fd_to_handle = drm_gem_prime_fd_to_handle, .gem_prime_import_sg_table = xen_drm_front_gem_import_sg_table, - .gem_prime_mmap = xen_drm_front_gem_prime_mmap, + .gem_prime_mmap = drm_gem_prime_mmap, .dumb_create = xen_drm_drv_dumb_create, .fops = &xen_drm_dev_fops, .name = "xendrm-du",
drivers/gpu/drm/xen/xen_drm_front_gem.c +42 -66
129 lines not on this page · raw message
drivers/gpu/drm/xen/xen_drm_front_gem.h +0 -7
@@ -15,9 +15,7 @@ struct dma_buf_attachment;struct dma_buf_map ;struct drm_device ;struct drm_gem_object ; -struct file ;struct sg_table ; -struct vm_area_struct ;struct drm_gem_object *xen_drm_front_gem_create (struct drm_device *dev,size_t size);
@@ -33,15 +31,10 @@ struct page **xen_drm_front_gem_get_pages(struct drm_gem_object *obj);void xen_drm_front_gem_free_object_unlocked (struct drm_gem_object *gem_obj); -int xen_drm_front_gem_mmap (struct file *filp,struct vm_area_struct *vma); -int xen_drm_front_gem_prime_vmap (struct drm_gem_object *gem_obj,struct dma_buf_map *map);void xen_drm_front_gem_prime_vunmap (struct drm_gem_object *gem_obj,struct dma_buf_map *map); -int xen_drm_front_gem_prime_mmap (struct drm_gem_object *gem_obj, -struct vm_area_struct *vma); -#endif /* __XEN_DRM_FRONT_GEM_H */
Signature · 6 lines
2.31.1 _______________________________________________ Virtualization mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/virtualization
Thomas Zimmermann
maintainerPATCH 8/9 drm/rockchip: Implement mmap as GEM object function
In reply to Thomas ZimmermannMoving the driver-specific mmap code into a GEM object function allows for using DRM helpers for various mmap callbacks.
The respective rockchip functions are being removed. The file_operations structure fops is now being created by the helper macro DEFINE_DRM_GEM_FOPS().
--- drivers/gpu/drm/rockchip/rockchip_drm_drv.c | 13 +----- drivers/gpu/drm/rockchip/rockchip_drm_fbdev.c | 3 +- drivers/gpu/drm/rockchip/rockchip_drm_gem.c | 44 +++++-------------- drivers/gpu/drm/rockchip/rockchip_drm_gem.h | 7 --- 4 files changed, 15 insertions(+), 52 deletions(-)
drivers/gpu/drm/rockchip/rockchip_drm_drv.c +2 -11
@@ -208,16 +208,7 @@ static void rockchip_drm_unbind(struct device *dev)drm_dev_put (drm_dev); } -static const struct file_operations rockchip_drm_driver_fops = { - .owner =THIS_MODULE , - .open = drm_open, - .mmap = rockchip_gem_mmap, - .poll = drm_poll, - .read = drm_read, - .unlocked_ioctl = drm_ioctl, - .compat_ioctl = drm_compat_ioctl, - .release = drm_release, -}; +DEFINE_DRM_GEM_FOPS (rockchip_drm_driver_fops);static const struct drm_driver rockchip_drm_driver = { .driver_features =DRIVER_MODESET |DRIVER_GEM |DRIVER_ATOMIC ,
@@ -226,7 +217,7 @@ static const struct drm_driver rockchip_drm_driver = { .prime_handle_to_fd = drm_gem_prime_handle_to_fd, .prime_fd_to_handle = drm_gem_prime_fd_to_handle, .gem_prime_import_sg_table = rockchip_gem_prime_import_sg_table, - .gem_prime_mmap = rockchip_gem_mmap_buf, + .gem_prime_mmap = drm_gem_prime_mmap, .fops = &rockchip_drm_driver_fops, .name = DRIVER_NAME, .desc = DRIVER_DESC,
drivers/gpu/drm/rockchip/rockchip_drm_fbdev.c +2 -1
@@ -7,6 +7,7 @@#include <drm/drm.h> #include <drm/drm_fb_helper.h> #include <drm/drm_fourcc.h> +#include <drm/drm_prime.h> #include <drm/drm_probe_helper.h> #include "rockchip_drm_drv.h"
@@ -24,7 +25,7 @@ static int rockchip_fbdev_mmap(struct fb_info *info,struct drm_fb_helper *helper = info->par;struct rockchip_drm_private *private =to_drm_private (helper); -return rockchip_gem_mmap_buf (private->fbdev_bo, vma); +return drm_gem_prime_mmap (private->fbdev_bo, vma); }static const struct fb_ops rockchip_drm_fbdev_ops = {
drivers/gpu/drm/rockchip/rockchip_drm_gem.c +11 -33
68 lines not on this page · raw message
drivers/gpu/drm/rockchip/rockchip_drm_gem.h +0 -7
@@ -34,13 +34,6 @@ rockchip_gem_prime_import_sg_table(struct drm_device *dev,int rockchip_gem_prime_vmap (struct drm_gem_object *obj,struct dma_buf_map *map);void rockchip_gem_prime_vunmap (struct drm_gem_object *obj,struct dma_buf_map *map); -/* drm driver mmap file operations */ -int rockchip_gem_mmap (struct file *filp,struct vm_area_struct *vma); - -/* mmap a gem object to userspace. */ -int rockchip_gem_mmap_buf (struct drm_gem_object *obj, -struct vm_area_struct *vma); -struct rockchip_gem_object *rockchip_gem_create_object (struct drm_device *drm,unsigned int size,bool alloc_kmap);
Signature · 6 lines
2.31.1 _______________________________________________ Virtualization mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/virtualization
Thomas Zimmermann
maintainerPATCH 9/9 drm: Update documentation and TODO of gem_prime_mmap hook
In reply to Thomas ZimmermannThe hook gem_prime_mmap in struct drm_driver is deprecated. Document the new requirements.
--- Documentation/gpu/todo.rst | 11 ----------- include/drm/drm_drv.h | 11 +++++++---- 2 files changed, 7 insertions(+), 15 deletions(-)
Documentation/gpu/todo.rst +0 -11
@@ -268,17 +268,6 @@ Contact: Daniel Vetter Level: Intermediate -Clean up mmap forwarding ------------------------- - -A lot of drivers forward gem mmap calls to dma-buf mmap for imported buffers. -And also a lot of them forward dma-buf mmap to the gem mmap implementations. -There's drm_gem_prime_mmap() for this now, but still needs to be rolled out. - -Contact: Daniel Vetter - -Level: Intermediate - Generic fbdev defio support ---------------------------
include/drm/drm_drv.h +7 -4
@@ -385,11 +385,14 @@ struct drm_driver {* mmap hook for GEM drivers, used to implement dma-buf mmap in the * PRIME helpers. * -* FIXME: There's way too much duplication going on here, and also moved -* to &drm_gem_object_funcs. +* This hook only exists for historical reasons. Drivers must use +* drm_gem_prime_mmap() to implement it. +* +* FIXME: Convert all drivers to implement mmap in struct +* &drm_gem_object_funcs and inline drm_gem_prime_mmap() into +* its callers. This hook should be removed afterwards. */ -int (*gem_prime_mmap)(struct drm_gem_object *obj, -struct vm_area_struct *vma); +int (*gem_prime_mmap)(struct drm_gem_object *obj,struct vm_area_struct *vma);/** * @dumb_create:
Signature · 6 lines
2.31.1 _______________________________________________ Virtualization mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/virtualization