drm/udl: Convert to SHMEM
Subsystems (3)
Thomas Zimmermann
maintainercover drm/udl: Convert to SHMEM
Udl's GEM implementation is mostly SHMEM and we should attempt to replace it with the latter.
Patches #1 and #2 update udl to simplify the conversion. In patch #3 the udl code is being replaced by SHMEM. The GEM object's mmap() and free_object() functions are wrappers around their SHMEM counterparts. For mmap() we fix-up the page-caching flags to distinguish between write-combined and cached access. For free(), we have to unmap the buffer's mapping that has been established by udl's fbdev code.
The patchset has been tested by running the fbdev console, X11 and Weston on a DisplayLink adapter.
Thomas Zimmermann (3):
drm/udl: Remove flags field from struct udl_gem_object drm/udl: Allocate GEM object via struct drm_driver.gem_create_object drm/udl: Switch to SHMEM
drivers/gpu/drm/udl/Kconfig | 1 + drivers/gpu/drm/udl/Makefile | 2 +- drivers/gpu/drm/udl/udl_dmabuf.c | 255 ------------------------------- drivers/gpu/drm/udl/udl_drv.c | 30 +--- drivers/gpu/drm/udl/udl_drv.h | 36 +---- drivers/gpu/drm/udl/udl_fb.c | 65 ++++---- drivers/gpu/drm/udl/udl_gem.c | 245 ++++++----------------------- 7 files changed, 93 insertions(+), 541 deletions(-) delete mode 100644 drivers/gpu/drm/udl/udl_dmabuf.c
--
2.23.0
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Thomas Zimmermann
maintainerPATCH 1/3 drm/udl: Remove flags field from struct udl_gem_object
The flags field in struct udl_gem control mapping parameters: cached access for local buffers, write-combined access for imported buffers.
We can drop the field and distingush both cases by testing whether struct drm_gem_object.import_attach is NULL.
--- drivers/gpu/drm/udl/udl_dmabuf.c | 1 - drivers/gpu/drm/udl/udl_drv.h | 4 ---- drivers/gpu/drm/udl/udl_gem.c | 27 +++++++-------------------- 3 files changed, 7 insertions(+), 25 deletions(-)
drivers/gpu/drm/udl/udl_dmabuf.c +0 -1
@@ -241,7 +241,6 @@ struct drm_gem_object *udl_gem_prime_import(struct drm_device *dev, goto fail_unmap; uobj->base.import_attach = attach; - uobj->flags =UDL_BO_WC ;return &uobj->base;
drivers/gpu/drm/udl/udl_drv.h +0 -4
@@ -29,9 +29,6 @@ struct drm_mode_create_dumb;#define DRIVER_MINOR 0#define DRIVER_PATCHLEVEL 1 -#define UDL_BO_CACHEABLE (1 << 0) -#define UDL_BO_WC (1 << 1) -struct udl_device ;struct urb_node {
@@ -81,7 +78,6 @@ struct udl_gem_object {struct page **pages;void *vmapping;struct sg_table *sg; -unsigned int flags; };#define to_udl_bo (x) container_of(x, struct udl_gem_object, base)
drivers/gpu/drm/udl/udl_gem.c +7 -20
@@ -25,7 +25,6 @@ struct udl_gem_object *udl_gem_alloc_object(struct drm_device *dev,return NULL ; } - obj->flags =UDL_BO_CACHEABLE ;return obj; }
@@ -57,23 +56,6 @@ udl_gem_create(struct drm_file *file,return 0 ; } -static void update_vm_cache_attr (struct udl_gem_object *obj, -struct vm_area_struct *vma) -{ -DRM_DEBUG_KMS ("flags = 0x%x\n" , obj->flags); - -/* non-cacheable as default. */ -if (obj->flags &UDL_BO_CACHEABLE ) { - vma->vm_page_prot =vm_get_page_prot (vma->vm_flags); - }else if (obj->flags &UDL_BO_WC ) { - vma->vm_page_prot = -pgprot_writecombine (vm_get_page_prot (vma->vm_flags)); - }else { - vma->vm_page_prot = -pgprot_noncached (vm_get_page_prot (vma->vm_flags)); - } -} -int udl_dumb_create (struct drm_file *file,struct drm_device *dev,struct drm_mode_create_dumb *args)
@@ -86,16 +68,21 @@ int udl_dumb_create(struct drm_file *file,int udl_drm_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; + obj = vma->vm_private_data; + vma->vm_flags &= ~VM_PFNMAP ; vma->vm_flags |=VM_MIXEDMAP ; -update_vm_cache_attr (to_udl_bo (vma->vm_private_data), vma); + vma->vm_page_prot =vm_get_page_prot (vma->vm_flags); +if (obj->import_attach) + vma->vm_page_prot =pgprot_writecombine (vma->vm_page_prot);return ret; }
@@ -155,7 +142,7 @@ int udl_gem_vmap(struct udl_gem_object *obj)return -ENOMEM ;return 0 ; } - + ret =udl_gem_get_pages (obj);if (ret)return ret;
Signature · 6 lines
2.23.0 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Re: [PATCH 1/3] drm/udl: Remove flags field from struct udl_gem_object
Quoted 5 lines · Thomas Zimmermann
The flags field in struct
udl_gemcontrol mapping parameters: cached access for local buffers, write-combined access for imported buffers.We can drop the field and distingush both cases by testing whether struct drm_gem_object.import_attach is NULL.
Quoted 117 lines
Signed-off-by Thomas Zimmermann <[email protected]>--- drivers/gpu/drm/udl/udl_dmabuf.c | 1 - drivers/gpu/drm/udl/udl_drv.h | 4 ---- drivers/gpu/drm/udl/udl_gem.c | 27 +++++++-------------------- 3 files changed, 7 insertions(+), 25 deletions(-)drivers/gpu/drm/udl/udl_dmabuf.c +0
-1@@ -241,7 +241,6 @@ struct drm_gem_object *udl_gem_prime_import(struct drm_device *dev, goto fail_unmap; uobj->base.import_attach = attach; - uobj->flags =UDL_BO_WC ;return &uobj->base;drivers/gpu/drm/udl/udl_drv.h +0
-4@@ -29,9 +29,6 @@ struct drm_mode_create_dumb;#define DRIVER_MINOR 0#define DRIVER_PATCHLEVEL 1 -#define UDL_BO_CACHEABLE (1 << 0) -#define UDL_BO_WC (1 << 1) -struct udl_device ;struct urb_node {@@ -81,7 +78,6 @@ struct udl_gem_object {struct page **pages;void *vmapping;struct sg_table *sg; -unsigned int flags; };#define to_udl_bo (x) container_of(x, struct udl_gem_object, base)drivers/gpu/drm/udl/udl_gem.c +7
-20@@ -25,7 +25,6 @@ struct udl_gem_object *udl_gem_alloc_object(struct drm_device *dev,return NULL ; } - obj->flags =UDL_BO_CACHEABLE ;return obj; }@@ -57,23 +56,6 @@ udl_gem_create(struct drm_file *file,return 0 ; } -static void update_vm_cache_attr (struct udl_gem_object *obj, -struct vm_area_struct *vma) -{ -DRM_DEBUG_KMS ("flags = 0x%x\n" , obj->flags); - -/* non-cacheable as default. */ -if (obj->flags &UDL_BO_CACHEABLE ) { - vma->vm_page_prot =vm_get_page_prot (vma->vm_flags); - }else if (obj->flags &UDL_BO_WC ) { - vma->vm_page_prot = -pgprot_writecombine (vm_get_page_prot (vma->vm_flags)); - }else { - vma->vm_page_prot = -pgprot_noncached (vm_get_page_prot (vma->vm_flags)); - } -} -int udl_dumb_create (struct drm_file *file,struct drm_device *dev,struct drm_mode_create_dumb *args)@@ -86,16 +68,21 @@ int udl_dumb_create(struct drm_file *file,int udl_drm_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; + obj = vma->vm_private_data; + vma->vm_flags &= ~VM_PFNMAP ; vma->vm_flags |=VM_MIXEDMAP ; -update_vm_cache_attr (to_udl_bo (vma->vm_private_data), vma); + vma->vm_page_prot =vm_get_page_prot (vma->vm_flags); +if (obj->import_attach) + vma->vm_page_prot =pgprot_writecombine (vma->vm_page_prot);return ret; }@@ -155,7 +142,7 @@ int udl_gem_vmap(struct udl_gem_object *obj)return -ENOMEM ;return 0 ; } - + ret =udl_gem_get_pages (obj);if (ret)return ret;Signature · 6 lines
2.23.0 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Thomas Zimmermann
maintainerPATCH 2/3 drm/udl: Allocate GEM object via struct drm_driver.gem_create_object
In reply to Thomas ZimmermannIn preparation of a switch to SHMEM, udl now allocates its GEM objects via struct drm_driver.gem_create_object. No functional changes are made.
For SHMEM GEM objects, udl will require the use of a special mmap function, which we set though the create-object function.
--- drivers/gpu/drm/udl/udl_drv.c | 1 + drivers/gpu/drm/udl/udl_drv.h | 2 ++ drivers/gpu/drm/udl/udl_gem.c | 25 +++++++++++++++++++++---- 3 files changed, 24 insertions(+), 4 deletions(-)
drivers/gpu/drm/udl/udl_drv.c +1 -0
@@ -64,6 +64,7 @@ static struct drm_driver driver = {/* gem hooks */ .gem_free_object_unlocked = udl_gem_free_object, + .gem_create_object = udl_driver_gem_create_object, .gem_vm_ops = &udl_gem_vm_ops, .dumb_create = udl_dumb_create,
drivers/gpu/drm/udl/udl_drv.h +2 -0
@@ -125,6 +125,8 @@ int udl_dumb_create(struct drm_file *file_priv,int udl_gem_mmap (struct drm_file *file_priv,struct drm_device *dev,uint32_t handle,uint64_t *offset); +struct drm_gem_object *udl_driver_gem_create_object (struct drm_device *dev, +size_t size);void udl_gem_free_object (struct drm_gem_object *gem_obj);struct udl_gem_object *udl_gem_alloc_object (struct drm_device *dev,size_t size);
drivers/gpu/drm/udl/udl_gem.c +21 -4
@@ -6,26 +6,43 @@#include <linux/dma-buf.h> #include <linux/vmalloc.h> +#include <drm/drm_drv.h> #include <drm/drm_mode.h> #include <drm/drm_prime.h> #include "udl_drv.h" -struct udl_gem_object *udl_gem_alloc_object (struct drm_device *dev, -size_t size) +/* +* Helpers for struct drm_driver +*/ + +struct drm_gem_object *udl_driver_gem_create_object (struct drm_device *dev, +size_t size) {struct udl_gem_object *obj; obj =kzalloc (sizeof (*obj),GFP_KERNEL ); +if (!obj) +return NULL ; + +return &obj->base; +} + +struct udl_gem_object *udl_gem_alloc_object (struct drm_device *dev, +size_t size) +{ +struct drm_gem_object *obj; + + obj = dev->driver->gem_create_object (dev, size);if (obj ==NULL )return NULL ; -if (drm_gem_object_init (dev, &obj->base, size) !=0 ) { +if (drm_gem_object_init (dev, obj, size) !=0 ) {kfree (obj);return NULL ; } -return obj; +return to_udl_bo (obj); } static int
Signature · 6 lines
2.23.0 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Re: [PATCH 2/3] drm/udl: Allocate GEM object via struct drm_driver.gem_create_object
Quoted 6 lines · Thomas Zimmermann
In preparation of a switch to SHMEM, udl now allocates its GEM objects via struct drm_driver.gem_create_object. No functional changes are made.
For SHMEM GEM objects, udl will require the use of a special mmap function, which we set though the create-object function.
Quoted 92 lines
Signed-off-by Thomas Zimmermann <[email protected]>--- drivers/gpu/drm/udl/udl_drv.c | 1 + drivers/gpu/drm/udl/udl_drv.h | 2 ++ drivers/gpu/drm/udl/udl_gem.c | 25 +++++++++++++++++++++---- 3 files changed, 24 insertions(+), 4 deletions(-)drivers/gpu/drm/udl/udl_drv.c +1
-0@@ -64,6 +64,7 @@ static struct drm_driver driver = {/* gem hooks */ .gem_free_object_unlocked = udl_gem_free_object, + .gem_create_object = udl_driver_gem_create_object, .gem_vm_ops = &udl_gem_vm_ops, .dumb_create = udl_dumb_create,drivers/gpu/drm/udl/udl_drv.h +2
-0@@ -125,6 +125,8 @@ int udl_dumb_create(struct drm_file *file_priv,int udl_gem_mmap (struct drm_file *file_priv,struct drm_device *dev,uint32_t handle,uint64_t *offset); +struct drm_gem_object *udl_driver_gem_create_object (struct drm_device *dev, +size_t size);void udl_gem_free_object (struct drm_gem_object *gem_obj);struct udl_gem_object *udl_gem_alloc_object (struct drm_device *dev,size_t size);drivers/gpu/drm/udl/udl_gem.c +21
-4@@ -6,26 +6,43 @@#include <linux/dma-buf.h> #include <linux/vmalloc.h> +#include <drm/drm_drv.h> #include <drm/drm_mode.h> #include <drm/drm_prime.h> #include "udl_drv.h" -struct udl_gem_object *udl_gem_alloc_object (struct drm_device *dev, -size_t size) +/* +* Helpers for struct drm_driver +*/ + +struct drm_gem_object *udl_driver_gem_create_object (struct drm_device *dev, +size_t size) {struct udl_gem_object *obj; obj =kzalloc (sizeof (*obj),GFP_KERNEL ); +if (!obj) +return NULL ; + +return &obj->base; +} + +struct udl_gem_object *udl_gem_alloc_object (struct drm_device *dev, +size_t size) +{ +struct drm_gem_object *obj; + + obj = dev->driver->gem_create_object (dev, size);if (obj ==NULL )return NULL ; -if (drm_gem_object_init (dev, &obj->base, size) !=0 ) { +if (drm_gem_object_init (dev, obj, size) !=0 ) {kfree (obj);return NULL ; } -return obj; +return to_udl_bo (obj); } static intSignature · 6 lines
2.23.0 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Thomas Zimmermann
maintainerPATCH 3/3 drm/udl: Switch to SHMEM
In reply to Thomas ZimmermannUdl's GEM code and the generic SHMEM are almost identical. Replace the former with SHMEM. The dmabuf support in udl is being removed in favor of the generic GEM PRIME functions.
The main difference is in the caching flags for mmap pages. By default, SHMEM always sets (uncached) write combining. In udl's memory management code, only imported buffers use write combining. Memory pages of locally created buffer objects are mmap'ed with caching enabled. To keep the optimization, udl provides its own mmap function for GEM objects where it fixes up the mapping flags.
--- drivers/gpu/drm/udl/Kconfig | 1 + drivers/gpu/drm/udl/Makefile | 2 +- drivers/gpu/drm/udl/udl_dmabuf.c | 254 ------------------------------- drivers/gpu/drm/udl/udl_drv.c | 29 +--- drivers/gpu/drm/udl/udl_drv.h | 30 +--- drivers/gpu/drm/udl/udl_fb.c | 65 ++++---- drivers/gpu/drm/udl/udl_gem.c | 237 +++++----------------------- 7 files changed, 84 insertions(+), 534 deletions(-) delete mode 100644 drivers/gpu/drm/udl/udl_dmabuf.c
drivers/gpu/drm/udl/Kconfig +1 -0
@@ -5,6 +5,7 @@ config DRM_UDL depends on USB_SUPPORT depends on USB_ARCH_HAS_HCD select USB + select DRM_GEM_SHMEM_HELPER select DRM_KMS_HELPER help This is a KMS driver for the USB displaylink video adapters.
drivers/gpu/drm/udl/Makefile +1 -1
@@ -1,4 +1,4 @@ # SPDX-License-Identifier: GPL-2.0-only -udl-y := udl_drv.o udl_modeset.o udl_connector.o udl_encoder.o udl_main.o udl_fb.o udl_transfer.o udl_gem.o udl_dmabuf.o +udl-y := udl_drv.o udl_modeset.o udl_connector.o udl_encoder.o udl_main.o udl_fb.o udl_transfer.o udl_gem.o obj-$(CONFIG_DRM_UDL) := udl.o
drivers/gpu/drm/udl/udl_dmabuf.c deleted +0 -254
254 lines not on this page · raw message
drivers/gpu/drm/udl/udl_drv.c +3 -26
@@ -8,6 +8,7 @@#include <drm/drm_crtc_helper.h> #include <drm/drm_drv.h> #include <drm/drm_file.h> +#include <drm/drm_gem_shmem_helper.h> #include <drm/drm_ioctl.h> #include <drm/drm_probe_helper.h> #include <drm/drm_print.h>
@@ -32,23 +33,7 @@ static int udl_usb_resume(struct usb_interface *interface)return 0 ; } -static const struct vm_operations_struct udl_gem_vm_ops = { - .fault = udl_gem_fault, - .open = drm_gem_vm_open, - .close = drm_gem_vm_close, -}; - -static const struct file_operations udl_driver_fops = { - .owner =THIS_MODULE , - .open = drm_open, - .mmap = udl_drm_gem_mmap, - .poll = drm_poll, - .read = drm_read, - .unlocked_ioctl = drm_ioctl, - .release = drm_release, - .compat_ioctl = drm_compat_ioctl, - .llseek = noop_llseek, -}; +DEFINE_DRM_GEM_FOPS (udl_driver_fops);static void udl_driver_release (struct drm_device *dev) {
@@ -63,18 +48,10 @@ static struct drm_driver driver = { .release = udl_driver_release,/* gem hooks */ - .gem_free_object_unlocked = udl_gem_free_object, .gem_create_object = udl_driver_gem_create_object, - .gem_vm_ops = &udl_gem_vm_ops, - .dumb_create = udl_dumb_create, - .dumb_map_offset = udl_gem_mmap, .fops = &udl_driver_fops, - - .prime_handle_to_fd = drm_gem_prime_handle_to_fd, - .prime_fd_to_handle = drm_gem_prime_fd_to_handle, - .gem_prime_export = udl_gem_prime_export, - .gem_prime_import = udl_gem_prime_import, +DRM_GEM_SHMEM_DRIVER_OPS , .name = DRIVER_NAME, .desc = DRIVER_DESC,
drivers/gpu/drm/udl/udl_drv.h +1 -29
@@ -73,18 +73,9 @@ struct udl_device {#define to_udl (x) container_of(x, struct udl_device, drm) -struct udl_gem_object { -struct drm_gem_object base; -struct page **pages; -void *vmapping; -struct sg_table *sg; -}; - -#define to_udl_bo (x) container_of(x, struct udl_gem_object, base) -struct udl_framebuffer {struct drm_framebuffer base; -struct udl_gem_object *obj; +struct drm_gem_shmem_object *shmem;bool active_16;/* active on the 16-bit channel */ };
@@ -119,27 +110,8 @@ int udl_render_hline(struct drm_device *dev, int log_bpp, struct urb **urb_ptr, u32 byte_offset, u32 device_byte_offset, u32 byte_width, int *ident_ptr, int *sent_ptr); -int udl_dumb_create (struct drm_file *file_priv, -struct drm_device *dev, -struct drm_mode_create_dumb *args); -int udl_gem_mmap (struct drm_file *file_priv,struct drm_device *dev, -uint32_t handle,uint64_t *offset); -struct drm_gem_object *udl_driver_gem_create_object (struct drm_device *dev,size_t size); -void udl_gem_free_object (struct drm_gem_object *gem_obj); -struct udl_gem_object *udl_gem_alloc_object (struct drm_device *dev, -size_t size); -struct dma_buf *udl_gem_prime_export (struct drm_gem_object *obj,int flags); -struct drm_gem_object *udl_gem_prime_import (struct drm_device *dev, -struct dma_buf *dma_buf); - -int udl_gem_get_pages (struct udl_gem_object *obj); -void udl_gem_put_pages (struct udl_gem_object *obj); -int udl_gem_vmap (struct udl_gem_object *obj); -void udl_gem_vunmap (struct udl_gem_object *obj); -int udl_drm_gem_mmap (struct file *filp,struct vm_area_struct *vma); -vm_fault_t udl_gem_fault (struct vm_fault *vmf);int udl_handle_damage (struct udl_framebuffer *fb,int x,int y,int width,int height);
drivers/gpu/drm/udl/udl_fb.c +36 -29
169 lines not on this page · raw message
drivers/gpu/drm/udl/udl_gem.c +42 -195
271 lines not on this page · raw message
Signature · 6 lines
2.23.0 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
kbuild test robot
build botRe: [PATCH 3/3] drm/udl: Switch to SHMEM
Thank you for the patch! Yet something to improve:
Hi Thomas,
Thank you for the patch! Yet something to improve:
[auto build test ERROR on linus/master]
[cannot apply to v5.4-rc5 next-20191029]
[if your patch is applied to the wrong git tree, please drop us a note to help improve the system. BTW, we also suggest to use '--base' option to specify the base tree in git format-patch, please see https://stackoverflow.com/a/37406982]
url: https://github.com/0day-ci/linux/commits/Thomas-Zimmermann/drm-udl-Convert-to-SHMEM/20191030-065855 base: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git 23fdb198ae81f47a574296dab5167c5e136a02ba config: nds32-allyesconfig (attached as .config) compiler: nds32le-linux-gcc (GCC) 8.1.0
reproduce:
wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross chmod +x ~/bin/make.cross
# save the attached .config to linux build tree
GCC_VERSION=8.1.0 make.cross ARCH=nds32
If you fix the issue, kindly add following tag
All errors (new ones prefixed by >>):
drivers/gpu/drm/udl/udl_gem.c: In function 'udl_gem_object_mmap':
drivers/gpu/drm/udl/udl_gem.c:41:27: error: passing argument 1 of 'drm_gem_shmem_mmap' from incompatible pointer type [-Werror=incompatible-pointer-types]
ret = drm_gem_shmem_mmap(obj, vma);
^~~
In file included from drivers/gpu/drm/udl/udl_gem.c:10:
include/drm/drm_gem_shmem_helper.h:146:37: note: expected 'struct file *' but argument is of type 'struct drm_gem_object *'
int drm_gem_shmem_mmap(struct file *filp, struct vm_area_struct *vma);
~~~~~~~~~~~~~^~~~
drivers/gpu/drm/udl/udl_gem.c: At top level:
drivers/gpu/drm/udl/udl_gem.c:61:3: error: 'const struct drm_gem_object_funcs' has no member named 'mmap'; did you mean 'vmap'?
.mmap = udl_gem_object_mmap,
^~~~
vmap
>> drivers/gpu/drm/udl/udl_gem.c:61:10: error: initialization of 'const struct vm_operations_struct *' from incompatible pointer type 'int (*)(struct drm_gem_object *, struct vm_area_struct *)' [-Werror=incompatible-pointer-types] .mmap = udl_gem_object_mmap,
^~~~~~~~~~~~~~~~~~~
drivers/gpu/drm/udl/udl_gem.c:61:10: note: (near initialization for 'udl_gem_object_funcs.vm_ops')
cc1: some warnings being treated as errors
vim +61 drivers/gpu/drm/udl/udl_gem.c
8
9 #include <drm/drm_drv.h>
> 10 #include <drm/drm_gem_shmem_helper.h>
11 #include <drm/drm_mode.h>
12 #include <drm/drm_prime.h>
13
14 #include "udl_drv.h"
15
16 /*
17 * GEM object funcs
18 */
19
20 static void udl_gem_object_free_object(struct drm_gem_object *obj)
21 {
22 struct drm_gem_shmem_object *shmem = to_drm_gem_shmem_obj(obj);
23
24 /* Fbdev emulation vmaps the buffer. Unmap it here for consistency
25 * with the original udl GEM code.
26 *
27 * TODO: Switch to generic fbdev emulation and release the
28 * GEM object with drm_gem_shmem_free_object().
29 */
30 if (shmem->vaddr)
31 drm_gem_shmem_vunmap(obj, shmem->vaddr);
32
33 drm_gem_shmem_free_object(obj);
34 }
35
36 static int udl_gem_object_mmap(struct drm_gem_object *obj,
37 struct vm_area_struct *vma)
38 {
39 int ret;
40
41 ret = drm_gem_shmem_mmap(obj, vma);
42 if (ret)
43 return ret;
44
45 vma->vm_page_prot = vm_get_page_prot(vma->vm_flags);
46 if (obj->import_attach)
47 vma->vm_page_prot = pgprot_writecombine(vma->vm_page_prot);
48 vma->vm_page_prot = pgprot_decrypted(vma->vm_page_prot);
49
50 return 0;
51 }
52
53 static const struct drm_gem_object_funcs udl_gem_object_funcs = {
54 .free = udl_gem_object_free_object,
55 .print_info = drm_gem_shmem_print_info,
56 .pin = drm_gem_shmem_pin,
57 .unpin = drm_gem_shmem_unpin,
58 .get_sg_table = drm_gem_shmem_get_sg_table,
59 .vmap = drm_gem_shmem_vmap,
60 .vunmap = drm_gem_shmem_vunmap,
> 61 .mmap = udl_gem_object_mmap,
62 };
63 ---
0-DAY kernel test infrastructure Open Source Technology Center
https://lists.01.org/pipermail/kbuild-all Intel Corporation
kbuild test robot
build botRe: [PATCH 3/3] drm/udl: Switch to SHMEM
In reply to Thomas ZimmermannThank you for the patch! Perhaps something to improve:
Hi Thomas,
Thank you for the patch! Perhaps something to improve:
[auto build test WARNING on linus/master]
[also build test WARNING on v5.4-rc5 next-20191030]
[if your patch is applied to the wrong git tree, please drop us a note to help improve the system. BTW, we also suggest to use '--base' option to specify the base tree in git format-patch, please see https://stackoverflow.com/a/37406982]
url: https://github.com/0day-ci/linux/commits/Thomas-Zimmermann/drm-udl-Convert-to-SHMEM/20191030-065855 base: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git 23fdb198ae81f47a574296dab5167c5e136a02ba reproduce: # apt-get install sparse # sparse version: v0.6.1-dirty make ARCH=x86_64 allmodconfig make C=1 CF='-fdiagnostic-prefix -D__CHECK_ENDIAN__'
If you fix the issue, kindly add following tag
sparse warnings: (new ones prefixed by >>)
>> drivers/gpu/drm/udl/udl_fb.c:406:27: sparse: sparse: incorrect type in assignment (different address spaces) @@ expected char [noderef] <asn:2> *screen_base @@ got oderef] <asn:2> *screen_base @@ drivers/gpu/drm/udl/udl_fb.c:406:27: sparse: expected char [noderef] <asn:2> *screen_base >> drivers/gpu/drm/udl/udl_fb.c:406:27: sparse: got void *[assigned] vaddr -- >> drivers/gpu/drm/udl/udl_gem.c:41:34: sparse: sparse: incorrect type in argument 1 (different base types) @@ expected struct file *filp @@ got struct drmstruct file *filp @@ >> drivers/gpu/drm/udl/udl_gem.c:41:34: sparse: expected struct file *filp >> drivers/gpu/drm/udl/udl_gem.c:41:34: sparse: got struct drm_gem_object *obj
drivers/gpu/drm/udl/udl_gem.c:61:10: sparse: sparse: unknown field name in initializer
vim +406 drivers/gpu/drm/udl/udl_fb.c
350
351
352 static int udlfb_create(struct drm_fb_helper *helper,
353 struct drm_fb_helper_surface_size *sizes)
354 {
355 struct udl_fbdev *ufbdev =
356 container_of(helper, struct udl_fbdev, helper);
357 struct drm_device *dev = ufbdev->helper.dev;
358 struct fb_info *info;
359 struct drm_framebuffer *fb;
360 struct drm_mode_fb_cmd2 mode_cmd;
361 struct drm_gem_shmem_object *shmem;
362 void *vaddr;
363 uint32_t size;
364 int ret = 0;
365
366 if (sizes->surface_bpp == 24)
367 sizes->surface_bpp = 32;
368
369 mode_cmd.width = sizes->surface_width;
370 mode_cmd.height = sizes->surface_height;
371 mode_cmd.pitches[0] = mode_cmd.width * ((sizes->surface_bpp + 7) / 8);
372
373 mode_cmd.pixel_format = drm_mode_legacy_fb_format(sizes->surface_bpp,
374 sizes->surface_depth);
375
376 size = mode_cmd.pitches[0] * mode_cmd.height;
377 size = ALIGN(size, PAGE_SIZE);
378
379 shmem = drm_gem_shmem_create(dev, size);
380 if (IS_ERR(shmem)) {
381 ret = PTR_ERR(shmem);
382 goto out;
383 }
384
385 vaddr = drm_gem_shmem_vmap(&shmem->base);
386 if (IS_ERR(vaddr)) {
387 ret = PTR_ERR(vaddr);
388 DRM_ERROR("failed to vmap fb\n");
389 goto out_gfree;
390 }
391
392 info = drm_fb_helper_alloc_fbi(helper);
393 if (IS_ERR(info)) {
394 ret = PTR_ERR(info);
395 goto out_gfree;
396 }
397
398 ret = udl_framebuffer_init(dev, &ufbdev->ufb, &mode_cmd, shmem);
399 if (ret)
400 goto out_gfree;
401
402 fb = &ufbdev->ufb.base;
403
404 ufbdev->helper.fb = fb;
405
> 406 info->screen_base = vaddr;
407 info->fix.smem_len = size;
408 info->fix.smem_start = (unsigned long)vaddr;
409
410 info->fbops = &udlfb_ops;
411 drm_fb_helper_fill_info(info, &ufbdev->helper, sizes);
412
413 DRM_DEBUG_KMS("allocated %dx%d vmal %p\n",
414 fb->width, fb->height,
415 ufbdev->ufb.shmem->vaddr);
416
417 return ret;
418 out_gfree:
419 drm_gem_object_put_unlocked(&ufbdev->ufb.shmem->base);
420 out:
421 return ret;
422 }
423
---
0-DAY kernel test infrastructure Open Source Technology Center
https://lists.01.org/pipermail/kbuild-all Intel Corporation
Re: [PATCH 3/3] drm/udl: Switch to SHMEM
In reply to Thomas ZimmermannQuoted 10 lines · Thomas Zimmermann
Udl's GEM code and the generic SHMEM are almost identical. Replace the former with SHMEM. The dmabuf support in udl is being removed in favor of the generic GEM PRIME functions.
The main difference is in the caching flags for mmap pages. By default, SHMEM always sets (uncached) write combining. In udl's memory management code, only imported buffers use write combining. Memory pages of locally created buffer objects are mmap'ed with caching enabled. To keep the optimization, udl provides its own mmap function for GEM objects where it fixes up the mapping flags.
Hmm, couldn't spot anything wrong, but it's rather hard to see the actual changes here ...
Any chance that having a separate "remove all dead code obsoleted by shmem helpers" patch helps?
cheers,
Gerd
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Thomas Zimmermann
maintainerRe: [PATCH 3/3] drm/udl: Switch to SHMEM
Hi
Am 05.11.19 um 12:05 schrieb Gerd Hoffmann:
Quoted 12 lines · Thomas Zimmermann
Quoted 10 lines
Udl's GEM code and the generic SHMEM are almost identical. Replace the former with SHMEM. The dmabuf support in udl is being removed in favor of the generic GEM PRIME functions.
The main difference is in the caching flags for mmap pages. By default, SHMEM always sets (uncached) write combining. In udl's memory management code, only imported buffers use write combining. Memory pages of locally created buffer objects are mmap'ed with caching enabled. To keep the optimization, udl provides its own mmap function for GEM objects where it fixes up the mapping flags.
Quoted 5 lines
Hmm, couldn't spot anything wrong, but it's rather hard to see the actual changes here ...
Any chance that having a separate "remove all dead code obsoleted by shmem helpers" patch helps?
Let me see what I can do.
Best regards
Thomas
Quoted 4 lines
cheers,
Gerd
Signature · 6 lines
Thomas Zimmermann Graphics Driver Developer SUSE Software Solutions Germany GmbH Maxfeldstr. 5, 90409 Nürnberg, Germany (HRB 36809, AG Nürnberg) Geschäftsführer: Felix Imendörffer
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Thomas Zimmermann
maintainer(cc: Gerd)
Am 28.10.19 um 09:45 schrieb Thomas Zimmermann:
Quoted 31 lines
Udl's GEM implementation is mostly SHMEM and we should attempt to replace it with the latter.
Patches #1 and #2 update udl to simplify the conversion. In patch #3 the udl code is being replaced by SHMEM. The GEM object's
mmap()andfree_object()functions are wrappers around their SHMEM counterparts. Formmap()we fix-up the page-caching flags to distinguish between write-combined and cached access. Forfree(), we have to unmap the buffer's mapping that has been established by udl's fbdev code.The patchset has been tested by running the fbdev console, X11 and Weston on a DisplayLink adapter.
Thomas Zimmermann (3):
drm/udl: Remove flags field from structudl_gem_objectdrm/udl: Allocate GEM object via struct drm_driver.gem_create_object drm/udl: Switch to SHMEMdrivers/gpu/drm/udl/Kconfig | 1 + drivers/gpu/drm/udl/Makefile | 2 +- drivers/gpu/drm/udl/udl_dmabuf.c | 255 ------------------------------- drivers/gpu/drm/udl/udl_drv.c | 30 +--- drivers/gpu/drm/udl/udl_drv.h | 36 +---- drivers/gpu/drm/udl/udl_fb.c | 65 ++++---- drivers/gpu/drm/udl/udl_gem.c | 245 ++++++----------------------- 7 files changed, 93 insertions(+), 541 deletions(-) delete mode 100644 drivers/gpu/drm/udl/udl_dmabuf.c--
2.23.0
Signature · 6 lines
Thomas Zimmermann Graphics Driver Developer SUSE Software Solutions Germany GmbH Maxfeldstr. 5, 90409 Nürnberg, Germany (HRB 36809, AG Nürnberg) Geschäftsführer: Felix Imendörffer
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel