drm: Add library for shmem backed GEM objects
PATCH 1/2 drm: Add library for shmem backed GEM objects
From: Noralf Trønnes <[email protected]>
This adds a library for shmem backed GEM objects.
v6:
- Fix uninitialized variable issue in an error path (anholt).
- Add a drm_gem_shmem_vm_open() to the fops to get proper refcounting of the pages (anholt).
v5:
- Drop drm_gem_shmem_prime_mmap() (Daniel Vetter)
- drm_gem_shmem_mmap(): Subtract drm_vma_node_start() to get the real vma->vm_pgoff
- drm_gem_shmem_fault(): Use vmf->pgoff now that vma->vm_pgoff is correct
v4:
- Drop cache modes (Thomas Hellstrom)
- Add a GEM attached vtable
v3:
- Grammar (Sam Ravnborg)
- s/drm_gem_shmem_put_pages_unlocked/drm_gem_shmem_put_pages_locked/ (Sam Ravnborg)
- Add debug output in error path (Sam Ravnborg)
--- Documentation/gpu/drm-kms-helpers.rst | 12 + drivers/gpu/drm/Kconfig | 6 + drivers/gpu/drm/Makefile | 1 + drivers/gpu/drm/drm_gem_shmem_helper.c | 563 +++++++++++++++++++++++++ include/drm/drm_gem_shmem_helper.h | 153 +++++++ 5 files changed, 735 insertions(+) create mode 100644 drivers/gpu/drm/drm_gem_shmem_helper.c create mode 100644 include/drm/drm_gem_shmem_helper.h
Documentation/gpu/drm-kms-helpers.rst +12 -0
@@ -335,3 +335,15 @@ Legacy CRTC/Modeset Helper Functions Reference .. kernel-doc:: drivers/gpu/drm/drm_crtc_helper.c :export: + +SHMEM GEM Helper Reference +========================== + +.. kernel-doc:: drivers/gpu/drm/drm_gem_shmem_helper.c + :doc: overview + +.. kernel-doc:: include/drm/drm_gem_shmem_helper.h + :internal: + +.. kernel-doc:: drivers/gpu/drm/drm_gem_shmem_helper.c + :export:
drivers/gpu/drm/Kconfig +6 -0
@@ -177,6 +177,12 @@ config DRM_KMS_CMA_HELPER help Choose this if you need the KMS CMA helper functions +config DRM_GEM_SHMEM_HELPER + bool + depends on DRM + help + Choose this if you need the GEM shmem helper functions + config DRM_VM bool depends on DRM && MMU
drivers/gpu/drm/Makefile +1 -0
@@ -25,6 +25,7 @@ drm-$(CONFIG_DRM_LIB_RANDOM) += lib/drm_random.o drm-$(CONFIG_DRM_VM) += drm_vm.o drm-$(CONFIG_COMPAT) += drm_ioc32.o drm-$(CONFIG_DRM_GEM_CMA_HELPER) += drm_gem_cma_helper.o +drm-$(CONFIG_DRM_GEM_SHMEM_HELPER) += drm_gem_shmem_helper.o drm-$(CONFIG_PCI) += ati_pcigart.o drm-$(CONFIG_DRM_PANEL) += drm_panel.o drm-$(CONFIG_OF) += drm_of.o
drivers/gpu/drm/drm_gem_shmem_helper.c new file +563 -0
563 lines not on this page · raw message
include/drm/drm_gem_shmem_helper.h new file +153 -0
153 lines not on this page · raw message
Signature · 1 line
2.20.0.rc1
PATCH 2/2 drm/vkms: Add PRIME support by converting to Noralf's shmem helpers.
This cuts out a tremendous amount of boilerplate. I've used the PRIME support now to test V3D rendering on a STB development board with no KMS driver.
v2: Use the DEFINE_DRM_GEM_SHMEM_FOPS for proper mmap setup.
--- drivers/gpu/drm/Kconfig | 1 + drivers/gpu/drm/vkms/vkms_crc.c | 28 ++-- drivers/gpu/drm/vkms/vkms_drv.c | 28 +--- drivers/gpu/drm/vkms/vkms_drv.h | 22 ---- drivers/gpu/drm/vkms/vkms_gem.c | 212 ++---------------------------- drivers/gpu/drm/vkms/vkms_plane.c | 17 ++- 6 files changed, 43 insertions(+), 265 deletions(-)
drivers/gpu/drm/Kconfig +1 -0
@@ -253,6 +253,7 @@ config DRM_VKMS tristate "Virtual KMS (EXPERIMENTAL)" depends on DRM select DRM_KMS_HELPER + select DRM_GEM_SHMEM_HELPER default n help Virtual Kernel Mode-Setting (VKMS) is used for testing or for
drivers/gpu/drm/vkms/vkms_crc.c +13 -15
@@ -4,6 +4,7 @@#include <drm/drm_atomic.h> #include <drm/drm_atomic_helper.h> #include <drm/drm_gem_framebuffer_helper.h> +#include <drm/drm_gem_shmem_helper.h> /** * compute_crc - Compute CRC value on output frame
@@ -91,21 +92,19 @@ static void compose_cursor(struct vkms_crc_data *cursor_crc, struct vkms_crc_data *primary_crc, void *vaddr_out) { struct drm_gem_object *cursor_obj; -struct vkms_gem_object *cursor_vkms_obj; +void *vaddr; cursor_obj =drm_gem_fb_get_obj (&cursor_crc->fb,0 ); - cursor_vkms_obj =drm_gem_to_vkms_gem (cursor_obj); + vaddr =drm_gem_shmem_vmap (cursor_obj); -mutex_lock (&cursor_vkms_obj->pages_lock); -if (!cursor_vkms_obj->vaddr) { +if (IS_ERR (vaddr)) {DRM_WARN ("cursor plane vaddr is NULL" ); - goto out; +return ; } -blend (vaddr_out, cursor_vkms_obj->vaddr, primary_crc, cursor_crc); +blend (vaddr_out, vaddr, primary_crc, cursor_crc); -out: -mutex_unlock (&cursor_vkms_obj->pages_lock); +drm_gem_shmem_vunmap (cursor_obj, vaddr); } static uint32_t _vkms_get_crc(struct vkms_crc_data *primary_crc,
@@ -113,8 +112,8 @@ static uint32_t _vkms_get_crc(struct vkms_crc_data *primary_crc, {struct drm_framebuffer *fb = &primary_crc->fb;struct drm_gem_object *gem_obj =drm_gem_fb_get_obj (fb,0 ); -struct vkms_gem_object *vkms_obj =drm_gem_to_vkms_gem (gem_obj); -void *vaddr_out =kzalloc (vkms_obj->gem.size,GFP_KERNEL ); +void *vaddr; +void *vaddr_out =kzalloc (gem_obj->size,GFP_KERNEL );u32 crc =0 ;if (!vaddr_out) {
@@ -122,21 +121,20 @@ static uint32_t _vkms_get_crc(struct vkms_crc_data *primary_crc,return 0 ; } -mutex_lock (&vkms_obj->pages_lock); -if (WARN_ON (!vkms_obj->vaddr)) { -mutex_unlock (&vkms_obj->pages_lock); + vaddr =drm_gem_shmem_vmap (gem_obj); +if (WARN_ON (IS_ERR (vaddr))) {kfree (vaddr_out);return crc; } -memcpy (vaddr_out, vkms_obj->vaddr, vkms_obj->gem.size); -mutex_unlock (&vkms_obj->pages_lock); +memcpy (vaddr_out, vaddr, gem_obj->size);if (cursor_crc)compose_cursor (cursor_crc, primary_crc, vaddr_out); crc =compute_crc (vaddr_out, primary_crc); +drm_gem_shmem_vunmap (gem_obj, vaddr);kfree (vaddr_out);return crc;
drivers/gpu/drm/vkms/vkms_drv.c +7 -21
@@ -19,6 +19,7 @@#include <drm/drm_crtc_helper.h> #include <drm/drm_atomic_helper.h> #include <drm/drm_gem_framebuffer_helper.h> +#include <drm/drm_gem_shmem_helper.h> #include <drm/drm_fb_helper.h> #include "vkms_drv.h"
@@ -34,23 +35,7 @@ bool enable_cursor;module_param_named (enable_cursor, enable_cursor, bool,0444 );MODULE_PARM_DESC (enable_cursor,"Enable/Disable cursor support" ); -static const struct file_operations vkms_driver_fops = { - .owner =THIS_MODULE , - .open = drm_open, - .mmap = drm_gem_mmap, - .unlocked_ioctl = drm_ioctl, - .compat_ioctl = drm_compat_ioctl, - .poll = drm_poll, - .read = drm_read, - .llseek = no_llseek, - .release = drm_release, -}; - -static const struct vm_operations_struct vkms_gem_vm_ops = { - .fault = vkms_gem_fault, - .open = drm_gem_vm_open, - .close = drm_gem_vm_close, -}; +DEFINE_DRM_GEM_SHMEM_FOPS (vkms_driver_fops);static void vkms_release (struct drm_device *dev) {
@@ -64,12 +49,13 @@ static void vkms_release(struct drm_device *dev) }static struct drm_driver vkms_driver = { - .driver_features =DRIVER_MODESET |DRIVER_ATOMIC |DRIVER_GEM , + .driver_features = (DRIVER_MODESET | +DRIVER_ATOMIC | +DRIVER_GEM | +DRIVER_PRIME ), .release = vkms_release, .fops = &vkms_driver_fops, - .dumb_create = vkms_dumb_create, - .gem_vm_ops = &vkms_gem_vm_ops, - .gem_free_object_unlocked = vkms_gem_free_object, +DRM_GEM_SHMEM_DRIVER_OPS , .get_vblank_timestamp = vkms_get_vblank_timestamp, .name =DRIVER_NAME ,
drivers/gpu/drm/vkms/vkms_drv.h +0 -22
@@ -80,23 +80,12 @@ struct vkms_device {struct vkms_output output; }; -struct vkms_gem_object { -struct drm_gem_object gem; -struct mutex pages_lock;/* Page lock used in page fault handler */ -struct page **pages; -unsigned int vmap_count; -void *vaddr; -}; -#define drm_crtc_to_vkms_output (target) \ container_of(target, struct vkms_output, crtc)#define drm_device_to_vkms_device (target) \ container_of(target, struct vkms_device, drm) -#define drm_gem_to_vkms_gem (target)\ - container_of(target, struct vkms_gem_object, gem) -#define to_vkms_crtc_state (target)\ container_of(target, struct vkms_crtc_state, base)
@@ -122,17 +111,6 @@ struct drm_gem_object *vkms_gem_create(struct drm_device *dev,u32 *handle, u64 size); -vm_fault_t vkms_gem_fault (struct vm_fault *vmf); - -int vkms_dumb_create (struct drm_file *file,struct drm_device *dev, -struct drm_mode_create_dumb *args); - -void vkms_gem_free_object (struct drm_gem_object *obj); - -int vkms_gem_vmap (struct drm_gem_object *obj); - -void vkms_gem_vunmap (struct drm_gem_object *obj); -/* CRC Support */ int vkms_set_crc_source (struct drm_crtc *crtc,const char *src_name); int vkms_verify_crc_source(struct drm_crtc *crtc, const char *source_name,
drivers/gpu/drm/vkms/vkms_gem.c +12 -200
234 lines not on this page · raw message
drivers/gpu/drm/vkms/vkms_plane.c +10 -7
@@ -11,6 +11,7 @@#include <drm/drm_atomic.h> #include <drm/drm_atomic_helper.h> #include <drm/drm_gem_framebuffer_helper.h> +#include <drm/drm_gem_shmem_helper.h> static struct drm_plane_state *vkms_plane_duplicate_state (struct drm_plane *plane)
@@ -138,17 +139,17 @@ static int vkms_prepare_fb(struct drm_plane *plane, struct drm_plane_state *state) {struct drm_gem_object *gem_obj; -struct vkms_gem_object *vkms_obj; -int ret; +void *map;if (!state->fb)return 0 ; gem_obj =drm_gem_fb_get_obj (state->fb,0 ); - vkms_obj =drm_gem_to_vkms_gem (gem_obj); - ret =vkms_gem_vmap (gem_obj); -if (ret) -DRM_ERROR ("vmap failed: %d\n" , ret); + map =drm_gem_shmem_vmap (gem_obj); +if (IS_ERR (map)) { +DRM_ERROR ("vmap failed: %ld\n" ,PTR_ERR (map)); +return PTR_ERR (map); + }return drm_gem_fb_prepare_fb (plane, state); }
@@ -157,12 +158,14 @@ static void vkms_cleanup_fb(struct drm_plane *plane, struct drm_plane_state *old_state) {struct drm_gem_object *gem_obj; +struct drm_gem_shmem_object *shmem_obj;if (!old_state->fb)return ; gem_obj =drm_gem_fb_get_obj (old_state->fb,0 ); -vkms_gem_vunmap (gem_obj); + shmem_obj =to_drm_gem_shmem_obj (gem_obj); +drm_gem_shmem_vunmap (gem_obj, shmem_obj->vaddr); }static const struct drm_plane_helper_funcs vkms_primary_helper_funcs = {
Signature · 1 line
2.20.0.rc1