drm: Improve dumb callback docs

Noticed while reviewing a patch from Eric. Also add a todo for the
dumb_map_offset callbacks (it should be simple to do, but piles of
work). Plus fix up vbox, because vbox.

Cc: Maarten Lankhorst <[email protected]>
Cc: Maxime Ripard <[email protected]>
Cc: Sean Paul <[email protected]>
Cc: David Airlie <[email protected]>
Cc: Greg Kroah-Hartman <[email protected]>
Cc: Hans de Goede <[email protected]>
Cc: Nicholas Mc Guire <[email protected]>
Cc: Daniel Vetter <[email protected]>
Cc: Fabio Rafael da Rosa <[email protected]>
Reviewed-by: Maxime Ripard <[email protected]>
Signed-off-by: Daniel Vetter <[email protected]>
Link: https://patchwork.freedesktop.org/patch/msgid/[email protected]

diff --git a/Documentation/gpu/todo.rst b/Documentation/gpu/todo.rst
index 9815b3b82bd1931a95c5d304018726e6238a68ee..ab347dec507960ae696d026fe2ce4a2cc88a0cc9 100644 (file)
--- a/Documentation/gpu/todo.rst
+++ b/Documentation/gpu/todo.rst
@@ -28,6 +28,17 @@ them, but also all the virtual ones used by KVM, so everyone qualifies).
 
 Contact: Daniel Vetter, Thierry Reding, respective driver maintainers
 
+
+Remove custom dumb_map_offset implementations
+---------------------------------------------
+
+All GEM based drivers should be using drm_gem_create_mmap_offset() instead.
+Audit each individual driver, make sure it'll work with the generic
+implementation (there's lots of outdated locking leftovers in various
+implementations), and then remove it.
+
+Contact: Daniel Vetter, respective driver maintainers
+
 Convert existing KMS drivers to atomic modesetting
 --------------------------------------------------
 

diff --git a/drivers/staging/vboxvideo/vbox_drv.c b/drivers/staging/vboxvideo/vbox_drv.c
index 257030460fb620dd848977c971c9a2df7c4fcec4..d3e23dd70c1b1ec75c73a850c759cd7288ac2db6 100644 (file)
--- a/drivers/staging/vboxvideo/vbox_drv.c
+++ b/drivers/staging/vboxvideo/vbox_drv.c
@@ -279,7 +279,6 @@ static struct drm_driver driver = {
        .gem_free_object_unlocked = vbox_gem_free_object,
        .dumb_create = vbox_dumb_create,
        .dumb_map_offset = vbox_dumb_mmap_offset,
-       .dumb_destroy = drm_gem_dumb_destroy,
        .prime_handle_to_fd = drm_gem_prime_handle_to_fd,
        .prime_fd_to_handle = drm_gem_prime_fd_to_handle,
        .gem_prime_export = drm_gem_prime_export,

diff --git a/include/drm/drm_drv.h b/include/drm/drm_drv.h
index 252dd216cc607e4a25e6d3bb0dba281b93235d97..35af23f5fa0d081a97eef6fa8e2e805b1e768669 100644 (file)
--- a/include/drm/drm_drv.h
+++ b/include/drm/drm_drv.h
@@ -527,8 +527,10 @@ struct drm_driver {
         * @dumb_map_offset:
         *
         * Allocate an offset in the drm device node's address space to be able to
-        * memory map a dumb buffer. GEM-based drivers must use
-        * drm_gem_create_mmap_offset() to implement this.
+        * memory map a dumb buffer.
+        *
+        * The default implementation is drm_gem_create_mmap_offset(). GEM based
+        * drivers must not overwrite this.
         *
         * Called by the user via ioctl.
         *
@@ -548,6 +550,9 @@ struct drm_driver {
         *
         * Called by the user via ioctl.
         *
+        * The default implementation is drm_gem_dumb_destroy(). GEM based drivers
+        * must not overwrite this.
+        *
         * Returns:
         *
         * Zero on success, negative errno on failure.