Skip to content

Commit

Permalink
drm/gem: Rename drm_gem_dumb_map_offset() to drm_gem_map_offset()
Browse files Browse the repository at this point in the history
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.

Signed-off-by: Steven Price <steven.price@arm.com>
Acked-by: Daniel Vetter <daniel@ffwll.ch>
Signed-off-by: Rob Herring <robh@kernel.org>
Link: https://patchwork.freedesktop.org/patch/msgid/20190627155318.38053-2-steven.price@arm.com
  • Loading branch information
Steven Price authored and Rob Herring committed Jun 28, 2019
1 parent 52500de commit 220df83
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 9 deletions.
4 changes: 2 additions & 2 deletions drivers/gpu/drm/drm_dumb_buffers.c
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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);
}

Expand Down
10 changes: 7 additions & 3 deletions drivers/gpu/drm/drm_gem.c
Original file line number Diff line number Diff line change
Expand Up @@ -297,7 +297,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
Expand All @@ -306,10 +306,14 @@ 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 GEM BO implementations which
* have same restriction that imported objects cannot be mapped. The
* shmem backend is one example.
*
* 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;
Expand All @@ -335,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
Expand Down
3 changes: 1 addition & 2 deletions drivers/gpu/drm/exynos/exynos_drm_gem.c
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
4 changes: 2 additions & 2 deletions include/drm/drm_gem.h
Original file line number Diff line number Diff line change
Expand Up @@ -401,8 +401,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);
Expand Down

0 comments on commit 220df83

Please sign in to comment.