drm: dumb scanout create/mmap for intel/radeon
Subsystems (4)
Dave Airlie
maintainerRFC PATCH 1/1 drm: dumb scanout create/mmap for intel/radeon
From: Dave Airlie <[email protected]>
This is just an idea that might or might not be a good idea, it basically adds two ioctls to create a dumb and map a dumb buffer suitable for scanout. The handle can be passed to the KMS ioctls to create a framebuffer.
It looks to me like it would be useful in the following cases:
a) in development drivers - we can always provide a shadowfb fallback.
b) libkms users - we can clean up libkms a lot and avoid linking to libdrm_*.
c) plymouth via libkms is a lot easier.
Userspace bits would be just calls + mmaps. We could probably mark these handles somehow as not being suitable for acceleartion so as top stop people who are dumber than dumb.
--- drivers/gpu/drm/drm_crtc.c | 23 +++++++++ drivers/gpu/drm/drm_drv.c | 4 +- drivers/gpu/drm/i915/i915_drv.c | 2 + drivers/gpu/drm/i915/i915_drv.h | 5 ++ drivers/gpu/drm/i915/i915_gem.c | 86 +++++++++++++++++++++------------- drivers/gpu/drm/radeon/radeon_drv.c | 8 +++ drivers/gpu/drm/radeon/radeon_gem.c | 48 ++++++++++++++++-- drivers/gpu/drm/radeon/radeon_mode.h | 2 + include/drm/drm.h | 3 + include/drm/drmP.h | 8 +++ include/drm/drm_crtc.h | 6 ++ include/drm/drm_mode.h | 20 ++++++++ 12 files changed, 176 insertions(+), 39 deletions(-)
drivers/gpu/drm/drm_crtc.c +23 -0
@@ -2653,3 +2653,26 @@ out:mutex_unlock (&dev->mode_config.mutex);return ret; } + +int drm_mode_create_dumb_ioctl (struct drm_device *dev, +void *data,struct drm_file *file_priv) +{ +struct drm_mode_create_dumb *args = data; + +if (!dev->driver->dumb_create) +return -ENOSYS ; + +return dev->driver->dumb_create (file_priv, dev, args->size, &args->handle); +} + +int drm_mode_mmap_dumb_ioctl (struct drm_device *dev, +void *data,struct drm_file *file_priv) +{ +struct drm_mode_map_dumb *args = data; + +/* call driver ioctl to get mmap offset */ +if (!dev->driver->dumb_map_offset) +return -ENOSYS ; + +return dev->driver->dumb_map_offset (file_priv, dev, args->handle, &args->offset); +}
drivers/gpu/drm/drm_drv.c +3 -1
@@ -146,7 +146,9 @@ static struct drm_ioctl_desc drm_ioctls[] = {DRM_IOCTL_DEF (DRM_IOCTL_MODE_ADDFB , drm_mode_addfb,DRM_MASTER |DRM_CONTROL_ALLOW |DRM_UNLOCKED ),DRM_IOCTL_DEF (DRM_IOCTL_MODE_RMFB , drm_mode_rmfb,DRM_MASTER |DRM_CONTROL_ALLOW |DRM_UNLOCKED ),DRM_IOCTL_DEF (DRM_IOCTL_MODE_PAGE_FLIP , drm_mode_page_flip_ioctl,DRM_MASTER |DRM_CONTROL_ALLOW |DRM_UNLOCKED ), - DRM_IOCTL_DEF(DRM_IOCTL_MODE_DIRTYFB, drm_mode_dirtyfb_ioctl, DRM_MASTER|DRM_CONTROL_ALLOW|DRM_UNLOCKED) +DRM_IOCTL_DEF (DRM_IOCTL_MODE_DIRTYFB , drm_mode_dirtyfb_ioctl,DRM_MASTER |DRM_CONTROL_ALLOW |DRM_UNLOCKED ), +DRM_IOCTL_DEF (DRM_IOCTL_MODE_CREATE_DUMB , drm_mode_create_dumb_ioctl,DRM_MASTER |DRM_CONTROL_ALLOW |DRM_UNLOCKED ), + DRM_IOCTL_DEF(DRM_IOCTL_MODE_MAP_DUMB, drm_mode_mmap_dumb_ioctl, DRM_MASTER|DRM_CONTROL_ALLOW|DRM_UNLOCKED) };#define DRM_CORE_IOCTL_COUNT ARRAY_SIZE( drm_ioctls )
drivers/gpu/drm/i915/i915_drv.c +2 -0
@@ -526,6 +526,8 @@ static struct drm_driver driver = { .gem_init_object = i915_gem_init_object, .gem_free_object = i915_gem_free_object, .gem_vm_ops = &i915_gem_vm_ops, + .dumb_create = i915_gem_dumb_create, + .dumb_map_offset = i915_gem_mmap_gtt, .ioctls = i915_ioctls, .fops = { .owner = THIS_MODULE,
drivers/gpu/drm/i915/i915_drv.h +5 -0
@@ -930,6 +930,11 @@ void i915_gem_object_flush_write_domain(struct drm_gem_object *obj);void i915_gem_shrinker_init (void );void i915_gem_shrinker_exit (void ); +int i915_gem_dumb_create (struct drm_file *file_priv, +struct drm_device *dev,uint64_t size, +uint32_t *handle_p); +int i915_gem_mmap_gtt (struct drm_file *file_priv,struct drm_device *dev, +uint32_t handle,uint64_t *offset);/* i915_gem_tiling.c */ void i915_gem_detect_bit_6_swizzle (struct drm_device *dev);
drivers/gpu/drm/i915/i915_gem.c +54 -32
145 lines not on this page · raw message
drivers/gpu/drm/radeon/radeon_drv.c +8 -0
@@ -71,6 +71,12 @@ void radeon_gem_object_free(struct drm_gem_object *obj);extern struct drm_ioctl_desc radeon_ioctls_kms[];extern int radeon_max_kms_ioctl;int radeon_mmap (struct file *filp,struct vm_area_struct *vma); +int radeon_mode_dumb_mmap (struct drm_file *filp, +struct drm_device *dev, +uint32_t handle,uint64_t *offset_p); +int radeon_mode_dumb_create (struct drm_file *file_priv, +struct drm_device *dev,uint64_t size,uint32_t *handle_p); +#if defined(CONFIG_DEBUG_FS )int radeon_debugfs_init (struct drm_minor *minor);void radeon_debugfs_cleanup (struct drm_minor *minor);
@@ -286,6 +292,8 @@ static struct drm_driver kms_driver = { .gem_init_object = radeon_gem_object_init, .gem_free_object = radeon_gem_object_free, .dma_ioctl = radeon_dma_ioctl_kms, + .dumb_create = radeon_mode_dumb_create, + .dumb_map_offset = radeon_mode_dumb_mmap, .fops = { .owner = THIS_MODULE, .open = drm_open,
drivers/gpu/drm/radeon/radeon_gem.c +42 -6
68 lines not on this page · raw message
drivers/gpu/drm/radeon/radeon_mode.h +2 -0
@@ -575,4 +575,6 @@ void radeon_legacy_tv_adjust_pll2(struct drm_encoder *encoder,void radeon_legacy_tv_mode_set (struct drm_encoder *encoder,struct drm_display_mode *mode,struct drm_display_mode *adjusted_mode); + +#endif
include/drm/drm.h +3 -0
@@ -699,6 +699,9 @@ struct drm_gem_open {#define DRM_IOCTL_MODE_PAGE_FLIP DRM_IOWR(0xB0, struct drm_mode_crtc_page_flip)#define DRM_IOCTL_MODE_DIRTYFB DRM_IOWR(0xB1, struct drm_mode_fb_dirty_cmd) +#define DRM_IOCTL_MODE_CREATE_DUMB DRM_IOWR(0xB0, struct drm_mode_create_dumb) +#define DRM_IOCTL_MODE_MAP_DUMB DRM_IOWR(0xB1, struct drm_mode_map_dumb) +/** * Device specific ioctls should only be in their respective headers * The device specific ioctl range is from 0x40 to 0x99.
include/drm/drmP.h +8 -0
@@ -806,6 +806,14 @@ struct drm_driver {/* vga arb irq handler */ void (*vgaarb_irq)(struct drm_device *dev,bool state); +/* dumb alloc support */ +int (*dumb_create)(struct drm_file *file_priv, +struct drm_device *dev,uint64_t size, +uint32_t *handle); +int (*dumb_map_offset)(struct drm_file *file_priv, +struct drm_device *dev,uint32_t handle, +uint64_t *offset); +/* Driver private ops for this object */ struct vm_operations_struct *gem_vm_ops;
include/drm/drm_crtc.h +6 -0
@@ -803,4 +803,10 @@ extern int drm_add_modes_noedid(struct drm_connector *connector, int hdisplay, int vdisplay);extern bool drm_edid_is_valid (struct edid *edid); + +extern int drm_mode_create_dumb_ioctl (struct drm_device *dev, +void *data,struct drm_file *file_priv); +extern int drm_mode_mmap_dumb_ioctl (struct drm_device *dev, +void *data,struct drm_file *file_priv); +#endif /* __DRM_CRTC_H__ */
include/drm/drm_mode.h +20 -0
@@ -343,4 +343,24 @@ struct drm_mode_crtc_page_flip { __u64 user_data; }; +/* create a dumb scanout buffer */ +struct drm_mode_create_dumb { +uint64_t size; +uint32_t handle; +uint32_t flags; +}; + +/* set up for mmap of a dumb scanout buffer */ +struct drm_mode_map_dumb { +/** Handle for the object being mapped. */ +__u32 handle; +__u32 pad; +/** +* Fake offset to use for subsequent mmap call +* +* This is a fixed-size type for 32/64 compatibility. +*/ +__u64 offset; +}; +#endif
Signature · 10 lines
1.6.5.2 ------------------------------------------------------------------------------ Download Intel® Parallel Studio Eval Try the new software tools for yourself. Speed compiling, find bugs proactively, and fine-tune applications for parallel performance. See why Intel Parallel Studio got high marks during beta. http://p.sf.net/sfu/intel-sw-dev --