Skip to contentSkip to conversation

drm/udl: Map pages with SHMEM helpers

PATCH Superseded Thomas Zimmermann 3 participants 5 messages May 19, 2020 – May 21, 2020

Subsystems (3)

v2 of 3 Superseded Latest is v3 →

lore
Share & tools
lore

Thomas Zimmermann

author maintainer
#0 lore raw

v2 cover drm/udl: Map pages with SHMEM helpers

(was: Default to cachable mappings for GEM SHMEM)

Udl implments cached mappings. Convert it to SHMEM's default helpers.

v2:
* keep writecombine mappings as the default
* add SHMEM helper for creating BOs with cached mappings
* update udl on the new helper

Thomas Zimmermann (2):
drm/shmem-helper: Add .gem_create_object helper that sets map_cached
flag
drm/udl: Use GEM vmap/mmap function from SHMEM helpers

 drivers/gpu/drm/drm_gem_shmem_helper.c |  27 +++++++
 drivers/gpu/drm/udl/Makefile           |   2 +-
 drivers/gpu/drm/udl/udl_drv.c          |   4 +-
 drivers/gpu/drm/udl/udl_drv.h          |   3 -
 drivers/gpu/drm/udl/udl_gem.c          | 106 -------------------------
 include/drm/drm_gem_shmem_helper.h     |   4 +
 6 files changed, 34 insertions(+), 112 deletions(-)
 delete mode 100644 drivers/gpu/drm/udl/udl_gem.c

--
2.26.2

_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel

author maintainer
#1 lore raw

PATCH v2 1/2 drm/shmem-helper: Add .gem_create_object helper that sets map_cached flag

The helper drm_gem_shmem_create_object_cached() allocates an GEM SHMEM object and sets the map_cached flag. Useful for drivers that want cached mappings.

---
 drivers/gpu/drm/drm_gem_shmem_helper.c | 27 ++++++++++++++++++++++++++
 include/drm/drm_gem_shmem_helper.h     |  4 ++++
 2 files changed, 31 insertions(+)
drivers/gpu/drm/drm_gem_shmem_helper.c +27 -0
index df31e5782eed1..ab28b7ff864cb 100644
@@ -433,6 +433,33 @@ bool drm_gem_shmem_purge(struct drm_gem_object *obj)
 }
 EXPORT_SYMBOL(drm_gem_shmem_purge);
 
+/**
+ * drm_gem_shmem_create_object_cached - Create a shmem buffer object with
+ *                                      cached mappings
+ * @dev: DRM device
+ * @size: Size of the object to allocate
+ *
+ * By default, shmem buffer objects use writecombine mappings. This
+ * function implements struct drm_driver.gem_create_object for shmem
+ * buffer objects with cached mappings.
+ *
+ * Returns:
+ * A struct drm_gem_shmem_object * on success or NULL negative on failure.
+ */
+struct drm_gem_object *
+drm_gem_shmem_create_object_cached(struct drm_device *dev, size_t size)
+{
+       struct drm_gem_shmem_object *shmem;
+
+       shmem = kzalloc(sizeof(*shmem), GFP_KERNEL);
+       if (!shmem)
+               return NULL;
+       shmem->map_cached = true;
+
+       return &shmem->base;
+}
+EXPORT_SYMBOL(drm_gem_shmem_create_object_cached);
+
 /**
  * drm_gem_shmem_dumb_create - Create a dumb shmem buffer object
  * @file: DRM file structure to create the dumb buffer for
include/drm/drm_gem_shmem_helper.h +4 -0
index 294b2931c4cc0..5381f0c8cf6f6 100644
@@ -132,6 +132,10 @@ struct drm_gem_shmem_object *
 drm_gem_shmem_create_with_handle(struct drm_file *file_priv,
 				 struct drm_device *dev, size_t size,
 				 uint32_t *handle);
+
+struct drm_gem_object *
+drm_gem_shmem_create_object_cached(struct drm_device *dev, size_t size);
+
 int drm_gem_shmem_dumb_create(struct drm_file *file, struct drm_device *dev,
 			      struct drm_mode_create_dumb *args);
 
Signature · 6 lines
2.26.2

_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
author maintainer
#2 lore raw

PATCH v2 2/2 drm/udl: Use GEM vmap/mmap function from SHMEM helpers

In reply to Thomas Zimmermann

The udl driver contains an implementation of GEM vmap and mmap operations that is identical to the common SHMEM helper; except that udl's code uses cached pages by default.

Convert udl to regular SHMEM helper functions. There's no reason to have udl behave differently from all other SHMEM drivers. The udl driver uses the SHMEM helper to enable caching.

v2:
* implement .gem_create_object with SHMEM helper

---
 drivers/gpu/drm/udl/Makefile  |   2 +-
 drivers/gpu/drm/udl/udl_drv.c |   4 +-
 drivers/gpu/drm/udl/udl_drv.h |   3 -
 drivers/gpu/drm/udl/udl_gem.c | 106 ----------------------------------
 4 files changed, 3 insertions(+), 112 deletions(-)
 delete mode 100644 drivers/gpu/drm/udl/udl_gem.c
drivers/gpu/drm/udl/Makefile +1 -1
index b50179bb4de06..24d61f61d7db2 100644
@@ -1,4 +1,4 @@
 # SPDX-License-Identifier: GPL-2.0-only
-udl-y := udl_drv.o udl_modeset.o udl_connector.o udl_main.o udl_transfer.o udl_gem.o
+udl-y := udl_drv.o udl_modeset.o udl_connector.o udl_main.o udl_transfer.o
 
 obj-$(CONFIG_DRM_UDL) := udl.o
drivers/gpu/drm/udl/udl_drv.c +2 -2
index d1aa50fd6d65a..96d4317a2c1bd 100644
@@ -37,8 +37,8 @@ DEFINE_DRM_GEM_FOPS(udl_driver_fops);
 static struct drm_driver driver = {
 	.driver_features = DRIVER_ATOMIC | DRIVER_GEM | DRIVER_MODESET,
 
-	/* gem hooks */
-	.gem_create_object = udl_driver_gem_create_object,
+	/* GEM hooks */
+	.gem_create_object = drm_gem_shmem_create_object_cached,
 
 	.fops = &udl_driver_fops,
 	DRM_GEM_SHMEM_DRIVER_OPS,
drivers/gpu/drm/udl/udl_drv.h +0 -3
index 2642f94a63fc8..b1461f30780bc 100644
@@ -81,9 +81,6 @@ int udl_render_hline(struct drm_device *dev, int log_bpp, struct urb **urb_ptr,
 		     const char *front, char **urb_buf_ptr,
 		     u32 byte_offset, u32 device_byte_offset, u32 byte_width);
 
-struct drm_gem_object *udl_driver_gem_create_object(struct drm_device *dev,
-						    size_t size);
-
 int udl_drop_usb(struct drm_device *dev);
 
 #define CMD_WRITE_RAW8   "\xAF\x60" /**< 8 bit raw write command. */
drivers/gpu/drm/udl/udl_gem.c deleted +0 -106

106 lines not on this page · raw message

Signature · 6 lines
2.26.2

_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
#3 lore raw

Re: [PATCH v2 2/2] drm/udl: Use GEM vmap/mmap function from SHMEM helpers

Den 19.05.2020 10.04, skrev Thomas Zimmermann:

Quoted 19 lines

The udl driver contains an implementation of GEM vmap and mmap operations that is identical to the common SHMEM helper; except that udl's code uses cached pages by default.

Convert udl to regular SHMEM helper functions. There's no reason to have udl behave differently from all other SHMEM drivers. The udl driver uses the SHMEM helper to enable caching.

v2:
* implement .gem_create_object with SHMEM helper

---

drivers/gpu/drm/udl/udl_drv.c +0 -0
index d1aa50fd6d65a..96d4317a2c1bd 100644

drivers/gpu/drm/udl/udl_drv.c DEFINE_DRM_GEM_FOPS(udl_driver_fops); · line 44

Quoted 10 lines
drivers/gpu/drm/udl/udl_drv.c +2 -2
@@ -37,8 +37,8 @@ DEFINE_DRM_GEM_FOPS(udl_driver_fops);
 static struct drm_driver driver = {
 	.driver_features = DRIVER_ATOMIC | DRIVER_GEM | DRIVER_MODESET,
 
-	/* gem hooks */
-	.gem_create_object = udl_driver_gem_create_object,
+	/* GEM hooks */
+	.gem_create_object = drm_gem_shmem_create_object_cached,
 
 	.fops = &udl_driver_fops,
 	DRM_GEM_SHMEM_DRIVER_OPS,

You could add a DRM_GEM_SHMEM_CACHED_DRIVER_OPS macro and use that instead.

Noralf.
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel

Reviewed-by on the v2 series
#4 lore raw
In reply to Thomas Zimmermann
Quoted 10 lines · Thomas Zimmermann

(was: Default to cachable mappings for GEM SHMEM)

Udl implments cached mappings. Convert it to SHMEM's default helpers.

v2:
* keep writecombine mappings as the default
* add SHMEM helper for creating BOs with cached mappings
* update udl on the new helper

Quoted 5 lines

Thomas Zimmermann (2):
drm/shmem-helper: Add .gem_create_object helper that sets map_cached
flag
drm/udl: Use GEM vmap/mmap function from SHMEM helpers

For the series:

Quoted 9 lines
 drivers/gpu/drm/drm_gem_shmem_helper.c |  27 +++++++
 drivers/gpu/drm/udl/Makefile           |   2 +-
 drivers/gpu/drm/udl/udl_drv.c          |   4 +-
 drivers/gpu/drm/udl/udl_drv.h          |   3 -
 drivers/gpu/drm/udl/udl_gem.c          | 106 -------------------------
 include/drm/drm_gem_shmem_helper.h     |   4 +
 6 files changed, 34 insertions(+), 112 deletions(-)
 delete mode 100644 drivers/gpu/drm/udl/udl_gem.c

Please keep going with these nice stats \o/

-Emil
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel