Commit f8b53070 authored by Thomas Zimmermann's avatar Thomas Zimmermann Committed by Heiko Stuebner
Browse files

drm/rockchip: 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 rockchip functions are being removed. The file_operations
structure fops is now being created by the helper macro
DEFINE_DRM_GEM_FOPS().

Signed-off-by: default avatarThomas Zimmermann <tzimmermann@suse.de>
[On rk3288 (pinky), rk3399 (gru-kevin, puma) and rk3328 (rock64)]
Tested-by: default avatarHeiko Stuebner <heiko@sntech.de>
[On RK3188/RK3066 (without iommu)]
Tested-by: default avatarAlex Bee <knaerzche@gmail.com>
Signed-off-by: default avatarHeiko Stuebner <heiko@sntech.de>
Link: https://patchwork.freedesktop.org/patch/msgid/20210624095502.8945-1-tzimmermann@suse.de
parent a3c09a02

drivers/gpu/drm/rockchip/rockchip_drm_drv.c

+2 −11
Original line number Diff line number Diff line
@@ -199,16 +199,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,
@@ -217,7 +208,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
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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,

};

drivers/gpu/drm/rockchip/rockchip_drm_gem.h

+0 −7
Original line number Diff line number Diff line
@@ -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);