Re: drm/rockchip: Implement mmap as GEM object function

Alex Bee <knaerzche@xxxxxxxxx> · Tue, 19 Oct 2021 16:02:04 +0200

Am 24.06.21 um 11:55 schrieb Thomas Zimmermann:
Moving 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().

Also

    Tested-by: Alex Bee <knaerzche@xxxxxxxxx>

on RK3188/RK3066, i.e. on SoCs w/o IOMMU for vop.

Could someone pick this up for review/merging?

Thanks,

Alex.

Signed-off-by: Thomas Zimmermann <tzimmermann@xxxxxxx>
Tested-by: Heiko Stuebner <heiko@xxxxxxxxx>
---
  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(-)

diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_drv.c b/drivers/gpu/drm/rockchip/rockchip_drm_drv.c
index b730b8d5d949..2e3ab573a817 100644
--- a/drivers/gpu/drm/rockchip/rockchip_drm_drv.c
+++ b/drivers/gpu/drm/rockchip/rockchip_drm_drv.c
@@ -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,
diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_fbdev.c b/drivers/gpu/drm/rockchip/rockchip_drm_fbdev.c
index 2fdc455c4ad7..d8418dd39d0e 100644
--- a/drivers/gpu/drm/rockchip/rockchip_drm_fbdev.c
+++ b/drivers/gpu/drm/rockchip/rockchip_drm_fbdev.c
@@ -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 = {
diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_gem.c b/drivers/gpu/drm/rockchip/rockchip_drm_gem.c
index 7971f57436dd..63eb73b624aa 100644
--- a/drivers/gpu/drm/rockchip/rockchip_drm_gem.c
+++ b/drivers/gpu/drm/rockchip/rockchip_drm_gem.c
@@ -240,12 +240,22 @@ static int rockchip_drm_gem_object_mmap(struct drm_gem_object *obj,
  	int ret;
  	struct rockchip_gem_object *rk_obj = to_rockchip_obj(obj);
  
+	/*
+	 * Set vm_pgoff (used as a fake buffer offset by DRM) to 0 and map the
+	 * whole buffer from the start.
+	 */
+	vma->vm_pgoff = 0;
+
  	/*
  	 * We allocated a struct page table for rk_obj, so clear
  	 * VM_PFNMAP flag that was set by drm_gem_mmap_obj()/drm_gem_mmap().
  	 */
+	vma->vm_flags |= VM_IO | VM_DONTEXPAND | VM_DONTDUMP;
  	vma->vm_flags &= ~VM_PFNMAP;
  
+	vma->vm_page_prot = pgprot_writecombine(vm_get_page_prot(vma->vm_flags));
+	vma->vm_page_prot = pgprot_decrypted(vma->vm_page_prot);
+
  	if (rk_obj->pages)
  		ret = rockchip_drm_gem_object_mmap_iommu(obj, vma);
  	else
@@ -257,39 +267,6 @@ static int rockchip_drm_gem_object_mmap(struct drm_gem_object *obj,
  	return ret;
  }
  
-int rockchip_gem_mmap_buf(struct drm_gem_object *obj,
-			  struct vm_area_struct *vma)
-{
-	int ret;
-
-	ret = drm_gem_mmap_obj(obj, obj->size, vma);
-	if (ret)
-		return ret;
-
-	return rockchip_drm_gem_object_mmap(obj, vma);
-}
-
-/* drm driver mmap file operations */
-int rockchip_gem_mmap(struct file *filp, struct vm_area_struct *vma)
-{
-	struct drm_gem_object *obj;
-	int ret;
-
-	ret = drm_gem_mmap(filp, vma);
-	if (ret)
-		return ret;
-
-	/*
-	 * Set vm_pgoff (used as a fake buffer offset by DRM) to 0 and map the
-	 * whole buffer from the start.
-	 */
-	vma->vm_pgoff = 0;
-
-	obj = vma->vm_private_data;
-
-	return rockchip_drm_gem_object_mmap(obj, vma);
-}
-
  static void rockchip_gem_release_object(struct rockchip_gem_object *rk_obj)
  {
  	drm_gem_object_release(&rk_obj->base);
@@ -301,6 +278,7 @@ static const struct drm_gem_object_funcs rockchip_gem_object_funcs = {
  	.get_sg_table = rockchip_gem_prime_get_sg_table,
  	.vmap = rockchip_gem_prime_vmap,
  	.vunmap	= rockchip_gem_prime_vunmap,
+	.mmap = rockchip_drm_gem_object_mmap,
  	.vm_ops = &drm_gem_cma_vm_ops,
  };
  
diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_gem.h b/drivers/gpu/drm/rockchip/rockchip_drm_gem.h
index 5a70a56cd406..47c1861eece0 100644
--- a/drivers/gpu/drm/rockchip/rockchip_drm_gem.h
+++ b/drivers/gpu/drm/rockchip/rockchip_drm_gem.h
@@ -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);






