[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: [PATCH 1/3] drm/exynox: Implement mmap as GEM object function



On Mon, Nov 08, 2021 at 11:28:44AM +0100, Thomas Zimmermann wrote:
> Moving 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().
> 
> Signed-off-by: Thomas Zimmermann <tzimmermann@xxxxxxx>

s/exynox/exynos in the subject.

Patch lgtm, but would still be good if exynos maintainers would
ack/review/test it. But if you don't get anything within 2 weeks here's
my:

Acked-by: Daniel Vetter <daniel.vetter@xxxxxxxx>

> ---
>  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(-)
> 
> diff --git a/drivers/gpu/drm/exynos/exynos_drm_drv.c 
> b/drivers/gpu/drm/exynos/exynos_drm_drv.c
> index d8f1cf4d6b69..9743b6b17447 100644
> --- a/drivers/gpu/drm/exynos/exynos_drm_drv.c
> +++ b/drivers/gpu/drm/exynos/exynos_drm_drv.c
> @@ -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,
> diff --git a/drivers/gpu/drm/exynos/exynos_drm_fbdev.c 
> b/drivers/gpu/drm/exynos/exynos_drm_fbdev.c
> index 5147f5929be7..02c97b9ca926 100644
> --- a/drivers/gpu/drm/exynos/exynos_drm_fbdev.c
> +++ b/drivers/gpu/drm/exynos/exynos_drm_fbdev.c
> @@ -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 = {
> diff --git a/drivers/gpu/drm/exynos/exynos_drm_gem.c 
> b/drivers/gpu/drm/exynos/exynos_drm_gem.c
> index 4396224227d1..c4b63902ee7a 100644
> --- a/drivers/gpu/drm/exynos/exynos_drm_gem.c
> +++ b/drivers/gpu/drm/exynos/exynos_drm_gem.c
> @@ -17,6 +17,8 @@
>  #include "exynos_drm_drv.h"
>  #include "exynos_drm_gem.h"
>  
> +static int exynos_drm_gem_mmap(struct drm_gem_object *obj, struct 
> vm_area_struct *vma);
> +
>  static int exynos_drm_alloc_buf(struct exynos_drm_gem *exynos_gem, bool 
> kvmap)
>  {
>       struct drm_device *dev = exynos_gem->base.dev;
> @@ -135,6 +137,7 @@ static const struct vm_operations_struct 
> exynos_drm_gem_vm_ops = {
>  static const struct drm_gem_object_funcs exynos_drm_gem_object_funcs = {
>       .free = exynos_drm_gem_free_object,
>       .get_sg_table = exynos_drm_gem_prime_get_sg_table,
> +     .mmap = exynos_drm_gem_mmap,
>       .vm_ops = &exynos_drm_gem_vm_ops,
>  };
>  
> @@ -354,12 +357,16 @@ int exynos_drm_gem_dumb_create(struct drm_file 
> *file_priv,
>       return 0;
>  }
>  
> -static int exynos_drm_gem_mmap_obj(struct drm_gem_object *obj,
> -                                struct vm_area_struct *vma)
> +static int exynos_drm_gem_mmap(struct drm_gem_object *obj, struct 
> vm_area_struct *vma)
>  {
>       struct exynos_drm_gem *exynos_gem = to_exynos_gem(obj);
>       int ret;
>  
> +     if (obj->import_attach)
> +             return dma_buf_mmap(obj->dma_buf, vma, 0);
> +
> +     vma->vm_flags |= VM_IO | VM_DONTEXPAND | VM_DONTDUMP;
> +
>       DRM_DEV_DEBUG_KMS(to_dma_dev(obj->dev), "flags = 0x%x\n",
>                         exynos_gem->flags);
>  
> @@ -385,26 +392,6 @@ static int exynos_drm_gem_mmap_obj(struct drm_gem_object 
> *obj,
>       return ret;
>  }
>  
> -int exynos_drm_gem_mmap(struct file *filp, struct vm_area_struct *vma)
> -{
> -     struct drm_gem_object *obj;
> -     int ret;
> -
> -     /* set vm_area_struct. */
> -     ret = drm_gem_mmap(filp, vma);
> -     if (ret < 0) {
> -             DRM_ERROR("failed to mmap.\n");
> -             return ret;
> -     }
> -
> -     obj = vma->vm_private_data;
> -
> -     if (obj->import_attach)
> -             return dma_buf_mmap(obj->dma_buf, vma, 0);
> -
> -     return exynos_drm_gem_mmap_obj(obj, vma);
> -}
> -
>  /* low-level interface prime helpers */
>  struct drm_gem_object *exynos_drm_gem_prime_import(struct drm_device *dev,
>                                           struct dma_buf *dma_buf)
> @@ -466,15 +453,3 @@ exynos_drm_gem_prime_import_sg_table(struct drm_device 
> *dev,
>       exynos_gem->sgt = sgt;
>       return &exynos_gem->base;
>  }
> -
> -int exynos_drm_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 exynos_drm_gem_mmap_obj(obj, vma);
> -}
> diff --git a/drivers/gpu/drm/exynos/exynos_drm_gem.h 
> b/drivers/gpu/drm/exynos/exynos_drm_gem.h
> index a23272fb96fb..79d7e1a87419 100644
> --- a/drivers/gpu/drm/exynos/exynos_drm_gem.h
> +++ b/drivers/gpu/drm/exynos/exynos_drm_gem.h
> @@ -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
> -- 
> 2.33.1
> 

-- 
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch



 


Rackspace

Lists.xenproject.org is hosted with RackSpace, monitoring our
servers 24x7x365 and backed by RackSpace's Fanatical Support®.