From: Mark Yao Date: Wed, 8 Oct 2014 09:11:15 +0000 (+0800) Subject: CHROMIUM: drm/rockchip: Add GEM create ioctl support X-Git-Tag: firefly_0821_release~2864 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=ae0099057b8181c6d9e2abbafc2c76b10c1426ac;p=firefly-linux-kernel-4.4.55.git CHROMIUM: drm/rockchip: Add GEM create ioctl support Rockchip Socs have GPU, we need allocate GPU accelerated buffers. So add special ioctls GEM_CREATE/GEM_MAP_OFFSET to support accelerated buffers. Signed-off-by: Mark Yao BUG=chromium:399935 TEST=With rest of patch set, can boot to UI on eDP Change-Id: Ia4b13798aac97d16214da7a75a2479e6e334313e Reviewed-on: https://chromium-review.googlesource.com/222153 Reviewed-by: Daniel Kurtz Tested-by: Daniel Kurtz Commit-Queue: Daniel Kurtz Conflicts: drivers/gpu/drm/rockchip/rockchip_drm_drv.c (cherry picked from cros/chromeos-3.14 commit c29c5a3037e18815937d8af664738e499ada94d1) Signed-off-by: ZhengShunQian --- diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_drv.c b/drivers/gpu/drm/rockchip/rockchip_drm_drv.c index 772bca37cce0..57e19122fd06 100644 --- a/drivers/gpu/drm/rockchip/rockchip_drm_drv.c +++ b/drivers/gpu/drm/rockchip/rockchip_drm_drv.c @@ -25,6 +25,8 @@ #include #include +#include + #include "rockchip_drm_drv.h" #include "rockchip_drm_fb.h" #include "rockchip_drm_fbdev.h" @@ -314,6 +316,14 @@ void rockchip_drm_lastclose(struct drm_device *dev) drm_fb_helper_restore_fbdev_mode_unlocked(&priv->fbdev_helper); } +static const struct drm_ioctl_desc rockchip_ioctls[] = { + DRM_IOCTL_DEF_DRV(ROCKCHIP_GEM_CREATE, rockchip_gem_create_ioctl, + DRM_UNLOCKED | DRM_AUTH), + DRM_IOCTL_DEF_DRV(ROCKCHIP_GEM_MAP_OFFSET, + rockchip_gem_map_offset_ioctl, + DRM_UNLOCKED | DRM_AUTH), +}; + static const struct file_operations rockchip_drm_driver_fops = { .owner = THIS_MODULE, .open = drm_open, @@ -355,6 +365,8 @@ static struct drm_driver rockchip_drm_driver = { .gem_prime_vmap = rockchip_gem_prime_vmap, .gem_prime_vunmap = rockchip_gem_prime_vunmap, .gem_prime_mmap = rockchip_gem_mmap_buf, + .ioctls = rockchip_ioctls, + .num_ioctls = ARRAY_SIZE(rockchip_ioctls), .fops = &rockchip_drm_driver_fops, .name = DRIVER_NAME, .desc = DRIVER_DESC, diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_gem.c b/drivers/gpu/drm/rockchip/rockchip_drm_gem.c index 2a77964f442d..c023d02092d1 100644 --- a/drivers/gpu/drm/rockchip/rockchip_drm_gem.c +++ b/drivers/gpu/drm/rockchip/rockchip_drm_gem.c @@ -16,6 +16,7 @@ #include #include #include +#include #include @@ -243,6 +244,26 @@ int rockchip_gem_dumb_create(struct drm_file *file_priv, return PTR_ERR_OR_ZERO(rk_obj); } +int rockchip_gem_map_offset_ioctl(struct drm_device *drm, void *data, + struct drm_file *file_priv) +{ + struct drm_rockchip_gem_map_off *args = data; + + return rockchip_gem_dumb_map_offset(file_priv, drm, args->handle, + &args->offset); +} + +int rockchip_gem_create_ioctl(struct drm_device *dev, void *data, + struct drm_file *file_priv) +{ + struct drm_rockchip_gem_create *args = data; + struct rockchip_gem_object *rk_obj; + + rk_obj = rockchip_gem_create_with_handle(file_priv, dev, args->size, + &args->handle); + return PTR_ERR_OR_ZERO(rk_obj); +} + /* * Allocate a sg_table for this GEM object. * Note: Both the table's contents, and the sg_table itself must be freed by diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_gem.h b/drivers/gpu/drm/rockchip/rockchip_drm_gem.h index ad22618473a4..3584b944a5a8 100644 --- a/drivers/gpu/drm/rockchip/rockchip_drm_gem.h +++ b/drivers/gpu/drm/rockchip/rockchip_drm_gem.h @@ -52,4 +52,18 @@ int rockchip_gem_dumb_create(struct drm_file *file_priv, int rockchip_gem_dumb_map_offset(struct drm_file *file_priv, struct drm_device *dev, uint32_t handle, uint64_t *offset); +int rockchip_gem_map_offset_ioctl(struct drm_device *drm, void *data, + struct drm_file *file_priv); +/* + * request gem object creation and buffer allocation as the size + * that it is calculated with framebuffer information such as width, + * height and bpp. + */ +int rockchip_gem_create_ioctl(struct drm_device *dev, void *data, + struct drm_file *file_priv); + +/* get buffer offset to map to user space. */ +int rockchip_gem_map_offset_ioctl(struct drm_device *dev, void *data, + struct drm_file *file_priv); + #endif /* _ROCKCHIP_DRM_GEM_H */ diff --git a/include/uapi/drm/rockchip_drm.h b/include/uapi/drm/rockchip_drm.h new file mode 100644 index 000000000000..c521e5a3e0cb --- /dev/null +++ b/include/uapi/drm/rockchip_drm.h @@ -0,0 +1,57 @@ +/* + * + * Copyright (c) Fuzhou Rockchip Electronics Co.Ltd + * Authors: + * Mark Yao + * + * base on exynos_drm.h + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation; either version 2 of the License, or (at your + * option) any later version. + */ + +#ifndef _UAPI_ROCKCHIP_DRM_H +#define _UAPI_ROCKCHIP_DRM_H + +#include + +/** + * User-desired buffer creation information structure. + * + * @size: user-desired memory allocation size. + * @flags: user request for setting memory type or cache attributes. + * @handle: returned a handle to created gem object. + * - this handle will be set by gem module of kernel side. + */ +struct drm_rockchip_gem_create { + uint64_t size; + uint32_t flags; + uint32_t handle; +}; + +/** + * A structure for getting buffer offset. + * + * @handle: a pointer to gem object created. + * @pad: just padding to be 64-bit aligned. + * @offset: relatived offset value of the memory region allocated. + * - this value should be set by user. + */ +struct drm_rockchip_gem_map_off { + uint32_t handle; + uint32_t pad; + uint64_t offset; +}; + +#define DRM_ROCKCHIP_GEM_CREATE 0x00 +#define DRM_ROCKCHIP_GEM_MAP_OFFSET 0x01 + +#define DRM_IOCTL_ROCKCHIP_GEM_CREATE DRM_IOWR(DRM_COMMAND_BASE + \ + DRM_ROCKCHIP_GEM_CREATE, struct drm_rockchip_gem_create) + +#define DRM_IOCTL_ROCKCHIP_GEM_MAP_OFFSET DRM_IOWR(DRM_COMMAND_BASE + \ + DRM_ROCKCHIP_GEM_MAP_OFFSET, struct drm_rockchip_gem_map_off) + +#endif /* _UAPI_ROCKCHIP_DRM_H */