| Message ID | 20200122190855.20385-1-ezequiel@collabora.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | drm/rockchip: Add GEM create ioctl support | expand |
Hi Ezquiel, Am Mittwoch, 22. Januar 2020, 20:08:55 CET schrieb Ezequiel Garcia: > From: Mark Yao <mark.yao@rock-chips.com> > > Add driver-specific GEM create/offset ioctls, to allow users > to create objects of arbitrary size. > > These are required to allocate buffers to be shared with > video decoder block, with hardware-specific needs such as > macroblock alignment and extra room for motion vectors. Previously the use of this ioctl was to allow a custom xserver to allocate memory to hand over to a binary mali blob for rendering. The counter argument was that these dumb buffer should not be rendered into at all. Nowadays we have prime for buffer sharing between display ip and 3d-renderer, and somehow this seems to work also with binary blobs via libgbm or so. Not sure how this behaves with X11 though but at least up to wayland that seems to work, so in current display pipelines there doesn't seem to be a need for such an ioctl anymore. So I guess my question to understand this is, shouldn't there be something similar done when sharing buffers with a video decoder? Instead of userspace requesting a buffer and then handing it to the hardware video decoder? Thanks Heiko > Signed-off-by: Mark Yao <mark.yao@rock-chips.com> > Signed-off-by: Douglas Anderson <dianders@chromium.org> > Signed-off-by: Ezequiel Garcia <ezequiel@collabora.com> > --- > drivers/gpu/drm/rockchip/rockchip_drm_drv.c | 11 ++++ > drivers/gpu/drm/rockchip/rockchip_drm_gem.c | 21 +++++++ > drivers/gpu/drm/rockchip/rockchip_drm_gem.h | 13 +++++ > include/uapi/drm/rockchip_drm.h | 61 +++++++++++++++++++++ > 4 files changed, 106 insertions(+) > create mode 100644 include/uapi/drm/rockchip_drm.h > > diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_drv.c b/drivers/gpu/drm/rockchip/rockchip_drm_drv.c > index ca12a35483f9..bd35a0b1aa5a 100644 > --- a/drivers/gpu/drm/rockchip/rockchip_drm_drv.c > +++ b/drivers/gpu/drm/rockchip/rockchip_drm_drv.c > @@ -22,6 +22,7 @@ > #include <drm/drm_of.h> > #include <drm/drm_probe_helper.h> > #include <drm/drm_vblank.h> > +#include <drm/rockchip_drm.h> > > #include "rockchip_drm_drv.h" > #include "rockchip_drm_fb.h" > @@ -206,6 +207,14 @@ static void rockchip_drm_unbind(struct device *dev) > drm_dev_put(drm_dev); > } > > +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, > @@ -230,6 +239,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 0d1884684dcb..315fa67d5668 100644 > --- a/drivers/gpu/drm/rockchip/rockchip_drm_gem.c > +++ b/drivers/gpu/drm/rockchip/rockchip_drm_gem.c > @@ -12,6 +12,7 @@ > #include <drm/drm_gem.h> > #include <drm/drm_prime.h> > #include <drm/drm_vma_manager.h> > +#include <drm/rockchip_drm.h> > > #include "rockchip_drm_drv.h" > #include "rockchip_drm_gem.h" > @@ -428,6 +429,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 drm_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 7ffc541bea07..87fe58b05bf6 100644 > --- a/drivers/gpu/drm/rockchip/rockchip_drm_gem.h > +++ b/drivers/gpu/drm/rockchip/rockchip_drm_gem.h > @@ -50,4 +50,17 @@ void rockchip_gem_free_object(struct drm_gem_object *obj); > int rockchip_gem_dumb_create(struct drm_file *file_priv, > struct drm_device *dev, > struct drm_mode_create_dumb *args); > + > +/* > + * 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..3185f72f36b9 > --- /dev/null > +++ b/include/uapi/drm/rockchip_drm.h > @@ -0,0 +1,61 @@ > +/* SPDX-License-Identifier: GPL-2.0 */ > + > +/* > + * Copyright (c) Fuzhou Rockchip Electronics Co.Ltd > + * Authors: > + * Mark Yao <yzq@rock-chips.com> > + * > + * base on exynos_drm.h > + */ > + > +#ifndef _ROCKCHIP_DRM_H > +#define _ROCKCHIP_DRM_H > + > +#include <drm/drm.h> > + > +#if defined(__cplusplus) > +extern "C" { > +#endif > + > +/** > + * 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) > + > +#if defined(__cplusplus) > +} > +#endif > + > +#endif /* _ROCKCHIP_DRM_H */ >
diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_drv.c b/drivers/gpu/drm/rockchip/rockchip_drm_drv.c index ca12a35483f9..bd35a0b1aa5a 100644 --- a/drivers/gpu/drm/rockchip/rockchip_drm_drv.c +++ b/drivers/gpu/drm/rockchip/rockchip_drm_drv.c @@ -22,6 +22,7 @@ #include <drm/drm_of.h> #include <drm/drm_probe_helper.h> #include <drm/drm_vblank.h> +#include <drm/rockchip_drm.h> #include "rockchip_drm_drv.h" #include "rockchip_drm_fb.h" @@ -206,6 +207,14 @@ static void rockchip_drm_unbind(struct device *dev) drm_dev_put(drm_dev); } +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, @@ -230,6 +239,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 0d1884684dcb..315fa67d5668 100644 --- a/drivers/gpu/drm/rockchip/rockchip_drm_gem.c +++ b/drivers/gpu/drm/rockchip/rockchip_drm_gem.c @@ -12,6 +12,7 @@ #include <drm/drm_gem.h> #include <drm/drm_prime.h> #include <drm/drm_vma_manager.h> +#include <drm/rockchip_drm.h> #include "rockchip_drm_drv.h" #include "rockchip_drm_gem.h" @@ -428,6 +429,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 drm_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 7ffc541bea07..87fe58b05bf6 100644 --- a/drivers/gpu/drm/rockchip/rockchip_drm_gem.h +++ b/drivers/gpu/drm/rockchip/rockchip_drm_gem.h @@ -50,4 +50,17 @@ void rockchip_gem_free_object(struct drm_gem_object *obj); int rockchip_gem_dumb_create(struct drm_file *file_priv, struct drm_device *dev, struct drm_mode_create_dumb *args); + +/* + * 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..3185f72f36b9 --- /dev/null +++ b/include/uapi/drm/rockchip_drm.h @@ -0,0 +1,61 @@ +/* SPDX-License-Identifier: GPL-2.0 */ + +/* + * Copyright (c) Fuzhou Rockchip Electronics Co.Ltd + * Authors: + * Mark Yao <yzq@rock-chips.com> + * + * base on exynos_drm.h + */ + +#ifndef _ROCKCHIP_DRM_H +#define _ROCKCHIP_DRM_H + +#include <drm/drm.h> + +#if defined(__cplusplus) +extern "C" { +#endif + +/** + * 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) + +#if defined(__cplusplus) +} +#endif + +#endif /* _ROCKCHIP_DRM_H */