drm/panfrost: drm_gem_map_offset() helper
Subsystems (5)
Steven Price
maintainerv4 cover drm/panfrost: drm_gem_map_offset() helper
Panfrost has a re-implementation of drm_gem_dumb_map_offset() with an extra bug regarding the handling of imported buffers. However we don't really want Panfrost calling _dumb functions because it's not a KMS driver.
This series renames drm_gem_dumb_map_offset() to drop the '_dumb' and updates Panfrost to use it rather than it's own implementation.
Previous versions:
v3: https://lore.kernel.org/lkml/[email protected]
Changes since v3:
* Add a comment to drm_gem_map_offset() explaining that it can be used with shmem clients as well as dumb clients.
v2: https://lore.kernel.org/lkml/[email protected]/
Changes since v2:
* Drop the shmem helper
v1: https://lore.kernel.org/lkml/[email protected]/
Changes since v1:
* Rename drm_gem_dumb_map_offset to drop _dumb
* Add a shmem helper
Steven Price (2):
drm/gem: Rename drm_gem_dumb_map_offset() to drm_gem_map_offset() drm/panfrost: Use drm_gem_map_offset()
drivers/gpu/drm/drm_dumb_buffers.c | 4 ++-- drivers/gpu/drm/drm_gem.c | 9 ++++++--- drivers/gpu/drm/exynos/exynos_drm_gem.c | 3 +-- drivers/gpu/drm/panfrost/panfrost_drv.c | 16 ++-------------- include/drm/drm_gem.h | 4 ++-- 5 files changed, 13 insertions(+), 23 deletions(-)
Signature · 1 line
2.20.1
Steven Price
maintainerPATCH v4 1/2 drm/gem: Rename drm_gem_dumb_map_offset() to drm_gem_map_offset()
drm_gem_dumb_map_offset() is a useful helper for non-dumb clients, so rename it to remove the _dumb and add a comment that it can be used by shmem clients.
--- drivers/gpu/drm/drm_dumb_buffers.c | 4 ++-- drivers/gpu/drm/drm_gem.c | 9 ++++++--- drivers/gpu/drm/exynos/exynos_drm_gem.c | 3 +-- include/drm/drm_gem.h | 4 ++-- 4 files changed, 11 insertions(+), 9 deletions(-)
drivers/gpu/drm/drm_dumb_buffers.c +2 -2
@@ -48,7 +48,7 @@* To support dumb objects drivers must implement the &drm_driver.dumb_create * operation. &drm_driver.dumb_destroy defaults to drm_gem_dumb_destroy() if * not set and &drm_driver.dumb_map_offset defaults to -* drm_gem_dumb_map_offset(). See the callbacks for further details. +* drm_gem_map_offset(). See the callbacks for further details. * * Note that dumb objects may not be used for gpu acceleration, as has been * attempted on some ARM embedded platforms. Such drivers really must have
@@ -127,7 +127,7 @@ int drm_mode_mmap_dumb_ioctl(struct drm_device *dev, args->handle, &args->offset); else - return drm_gem_dumb_map_offset(file_priv, dev, args->handle, + return drm_gem_map_offset(file_priv, dev, args->handle, &args->offset); }
drivers/gpu/drm/drm_gem.c +6 -3
@@ -298,7 +298,7 @@ drm_gem_handle_delete(struct drm_file *filp, u32 handle)EXPORT_SYMBOL (drm_gem_handle_delete);/** -* drm_gem_dumb_map_offset - return the fake mmap offset for a gem object +* drm_gem_map_offset - return the fake mmap offset for a gem object * @file: drm file-private structure containing the gem object * @dev: corresponding drm_device * @handle: gem object handle
@@ -307,10 +307,13 @@ EXPORT_SYMBOL(drm_gem_handle_delete);* This implements the &drm_driver.dumb_map_offset kms driver callback for * drivers which use gem to manage their backing storage. * +* It can also be used by drivers using the shmem backend as they have the +* same restriction that imported objects cannot be mapped. +* * Returns: * 0 on success or a negative error code on failure. */ -int drm_gem_dumb_map_offset (struct drm_file *file,struct drm_device *dev, +int drm_gem_map_offset (struct drm_file *file,struct drm_device *dev,u32 handle,u64 *offset) {struct drm_gem_object *obj;
@@ -336,7 +339,7 @@ int drm_gem_dumb_map_offset(struct drm_file *file, struct drm_device *dev,return ret; } -EXPORT_SYMBOL_GPL (drm_gem_dumb_map_offset); +EXPORT_SYMBOL_GPL (drm_gem_map_offset);/** * drm_gem_dumb_destroy - dumb fb callback helper for gem based drivers
drivers/gpu/drm/exynos/exynos_drm_gem.c +1 -2
@@ -272,8 +272,7 @@ int exynos_drm_gem_map_ioctl(struct drm_device *dev, void *data, {struct drm_exynos_gem_map *args = data; -return drm_gem_dumb_map_offset (file_priv, dev, args->handle, - &args->offset); +return drm_gem_map_offset (file_priv, dev, args->handle, &args->offset); } struct exynos_drm_gem *exynos_drm_gem_get(struct drm_file *filp,
include/drm/drm_gem.h +2 -2
@@ -395,8 +395,8 @@ int drm_gem_fence_array_add(struct xarray *fence_array,int drm_gem_fence_array_add_implicit (struct xarray *fence_array,struct drm_gem_object *obj,bool write); -int drm_gem_dumb_map_offset (struct drm_file *file,struct drm_device *dev, -u32 handle,u64 *offset); +int drm_gem_map_offset (struct drm_file *file,struct drm_device *dev, +u32 handle,u64 *offset);int drm_gem_dumb_destroy (struct drm_file *file,struct drm_device *dev,uint32_t handle);
Signature · 1 line
2.20.1
Rob Herring
maintainerRe: [PATCH v4 1/2] drm/gem: Rename drm_gem_dumb_map_offset() to drm_gem_map_offset()
Quoted 49 lines · Steven Price
drm_gem_dumb_map_offset()is a useful helper for non-dumb clients, so rename it to remove the_dumband add a comment that it can be used by shmem clients.Signed-off-by Steven Price <[email protected]>--- drivers/gpu/drm/drm_dumb_buffers.c | 4 ++-- drivers/gpu/drm/drm_gem.c | 9 ++++++--- drivers/gpu/drm/exynos/exynos_drm_gem.c | 3 +-- include/drm/drm_gem.h | 4 ++-- 4 files changed, 11 insertions(+), 9 deletions(-)drivers/gpu/drm/drm_dumb_buffers.c +2
-2@@ -48,7 +48,7 @@* To support dumb objects drivers must implement the &drm_driver.dumb_create * operation. &drm_driver.dumb_destroy defaults to drm_gem_dumb_destroy() if * not set and &drm_driver.dumb_map_offset defaults to -* drm_gem_dumb_map_offset(). See the callbacks for further details. +* drm_gem_map_offset(). See the callbacks for further details. * * Note that dumb objects may not be used for gpu acceleration, as has been * attempted on some ARM embedded platforms. Such drivers really must have @@ -127,7 +127,7 @@ int drm_mode_mmap_dumb_ioctl(struct drm_device *dev, args->handle, &args->offset); else - return drm_gem_dumb_map_offset(file_priv, dev, args->handle, + return drm_gem_map_offset(file_priv, dev, args->handle, &args->offset); }drivers/gpu/drm/drm_gem.c +1
-1@@ -298,7 +298,7 @@ drm_gem_handle_delete(struct drm_file *filp, u32 handle)EXPORT_SYMBOL (drm_gem_handle_delete);/** -* drm_gem_dumb_map_offset - return the fake mmap offset for a gem object +* drm_gem_map_offset - return the fake mmap offset for a gem object * @file: drm file-private structure containing the gem object * @dev: corresponding drm_device * @handle: gem object handle
drivers/gpu/drm/drm_gem.c EXPORT_SYMBOL(drm_gem_handle_delete); · line 311
Quoted 5 lines
drivers/gpu/drm/drm_gem.c +2
-0@@ -307,10 +307,13 @@ EXPORT_SYMBOL(drm_gem_handle_delete);* This implements the &drm_driver.dumb_map_offset kms driver callback for * drivers which use gem to manage their backing storage. * +* It can also be used by drivers using the shmem backend as they have the +* same restriction that imported objects cannot be mapped.
Maybe better not to say 'shmem' explicitly or just mention it as an example so when we have a 2nd case we don't have to update the comment.
...drivers with GEM BO implementations which have the same...
I can fix up and apply. Some other acks would be nice first.
Rob
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Re: [PATCH v4 1/2] drm/gem: Rename drm_gem_dumb_map_offset() to drm_gem_map_offset()
Quoted 60 lines · Rob Herring
Quoted 49 lines · Steven Price
drm_gem_dumb_map_offset()is a useful helper for non-dumb clients, so rename it to remove the_dumband add a comment that it can be used by shmem clients.Signed-off-by Steven Price <[email protected]>--- drivers/gpu/drm/drm_dumb_buffers.c | 4 ++-- drivers/gpu/drm/drm_gem.c | 9 ++++++--- drivers/gpu/drm/exynos/exynos_drm_gem.c | 3 +-- include/drm/drm_gem.h | 4 ++-- 4 files changed, 11 insertions(+), 9 deletions(-)drivers/gpu/drm/drm_dumb_buffers.c +2
-2@@ -48,7 +48,7 @@* To support dumb objects drivers must implement the &drm_driver.dumb_create * operation. &drm_driver.dumb_destroy defaults to drm_gem_dumb_destroy() if * not set and &drm_driver.dumb_map_offset defaults to -* drm_gem_dumb_map_offset(). See the callbacks for further details. +* drm_gem_map_offset(). See the callbacks for further details. * * Note that dumb objects may not be used for gpu acceleration, as has been * attempted on some ARM embedded platforms. Such drivers really must have @@ -127,7 +127,7 @@ int drm_mode_mmap_dumb_ioctl(struct drm_device *dev, args->handle, &args->offset); else - return drm_gem_dumb_map_offset(file_priv, dev, args->handle, + return drm_gem_map_offset(file_priv, dev, args->handle, &args->offset); }drivers/gpu/drm/drm_gem.c +1
-1@@ -298,7 +298,7 @@ drm_gem_handle_delete(struct drm_file *filp, u32 handle)EXPORT_SYMBOL (drm_gem_handle_delete);/** -* drm_gem_dumb_map_offset - return the fake mmap offset for a gem object +* drm_gem_map_offset - return the fake mmap offset for a gem object * @file: drm file-private structure containing the gem object * @dev: corresponding drm_device * @handle: gem object handle drivers/gpu/drm/drm_gem.c EXPORT_SYMBOL(drm_gem_handle_delete); · line 311
Quoted 5 lines
drivers/gpu/drm/drm_gem.c +2
-0@@ -307,10 +307,13 @@ EXPORT_SYMBOL(drm_gem_handle_delete);* This implements the &drm_driver.dumb_map_offset kms driver callback for * drivers which use gem to manage their backing storage. * +* It can also be used by drivers using the shmem backend as they have the +* same restriction that imported objects cannot be mapped. Maybe better not to say 'shmem' explicitly or just mention it as an example so when we have a 2nd case we don't have to update the comment.
Quoted 3 lines
...drivers with GEM BO implementations which have the same...
I can fix up and apply. Some other acks would be nice first.
Yeah kerneldoc is a bit suboptimal, with that polished, a-b: me. Yours should be good enough though.
-Daniel
Signature · 3 lines
Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch
Steven Price
maintainerPATCH v4 2/2 drm/panfrost: Use drm_gem_map_offset()
In reply to Steven Pricepanfrost_ioctl_mmap_bo() contains a reimplementation of drm_gem_map_offset() but with a bug - it allows mapping imported objects (without going through the exporter). Fix this by switching to use the newly renamed drm_gem_map_offset() function instead which has the bonus of simplifying the code.
--- drivers/gpu/drm/panfrost/panfrost_drv.c | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-)
drivers/gpu/drm/panfrost/panfrost_drv.c +2 -14
@@ -259,26 +259,14 @@ static int panfrost_ioctl_mmap_bo(struct drm_device *dev, void *data, struct drm_file *file_priv) {struct drm_panfrost_mmap_bo *args = data; -struct drm_gem_object *gem_obj; -int ret;if (args->flags !=0 ) {DRM_INFO ("unknown mmap_bo flags: %d\n" , args->flags);return -EINVAL ; } - gem_obj =drm_gem_object_lookup (file_priv, args->handle); -if (!gem_obj) { -DRM_DEBUG ("Failed to look up GEM BO %d\n" , args->handle); -return -ENOENT ; - } - - ret =drm_gem_create_mmap_offset (gem_obj); -if (ret ==0 ) - args->offset =drm_vma_node_offset_addr (&gem_obj->vma_node); -drm_gem_object_put_unlocked (gem_obj); - -return ret; +return drm_gem_map_offset (file_priv, dev, args->handle, + &args->offset); } static int panfrost_ioctl_get_bo_offset(struct drm_device *dev, void *data,
Signature · 1 line
2.20.1
Rob Herring
maintainerRe: [PATCH v4 2/2] drm/panfrost: Use drm_gem_map_offset()
Quoted 6 lines · Steven Price
panfrost_ioctl_mmap_bo()contains a reimplementation ofdrm_gem_map_offset()but with a bug - it allows mapping imported objects (without going through the exporter). Fix this by switching to use the newly renameddrm_gem_map_offset()function instead which has the bonus of simplifying the code.
While it may have been a bug, it worked (by some definition of worked). Now mesa breaks on importing buffers which always get mmapped. So we need to revert this, get import mmaps to work, or drop mmapping of imports and backport that to 19.1. I don't think there should be any need to mmap imports.
Rob