redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

Revert "drm/gem: Rename drm_gem_dumb_map_offset() to drm_gem_map_offset()" 

This reverts commit 220df83a53.

Turns out drm_gem_dumb_map_offset really only worked for the dumb buffer
case, so revert the name change.

Signed-off-by: Rob Herring <robh@kernel.org>
Signed-off-by: Sean Paul <sean@poorly.run>
Link: https://patchwork.freedesktop.org/patch/msgid/20190807145253.2037-2-sean@poorly.run
alistair/sunxi64-5.4-dsi
Rob Herring 2019-08-07 10:52:47 -04:00 committed by Sean Paul
parent e6be0a9913
commit abd4e745ff
4 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/gpu/drm/drm_dumb_buffers.c
View File

@ -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_map_offset(). See the callbacks for further details.
* drm_gem_dumb_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_map_offset(file_priv, dev, args->handle,
return drm_gem_dumb_map_offset(file_priv, dev, args->handle,
&args->offset);
}

10
drivers/gpu/drm/drm_gem.c
View File

@ -298,7 +298,7 @@ drm_gem_handle_delete(struct drm_file *filp, u32 handle)
EXPORT_SYMBOL(drm_gem_handle_delete);
/**
* drm_gem_map_offset - return the fake mmap offset for a gem object
* drm_gem_dumb_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,14 +307,10 @@ 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_map_offset(struct drm_file *file, struct drm_device *dev,
int drm_gem_dumb_map_offset(struct drm_file *file, struct drm_device *dev,
u32 handle, u64 *offset)
{
struct drm_gem_object *obj;
@ -340,7 +336,7 @@ out:
return ret;
}
EXPORT_SYMBOL_GPL(drm_gem_map_offset);
EXPORT_SYMBOL_GPL(drm_gem_dumb_map_offset);
/**
* drm_gem_dumb_destroy - dumb fb callback helper for gem based drivers

3
drivers/gpu/drm/exynos/exynos_drm_gem.c
View File

@ -273,7 +273,8 @@ int exynos_drm_gem_map_ioctl(struct drm_device *dev, void *data,
{
struct drm_exynos_gem_map *args = data;
return drm_gem_map_offset(file_priv, dev, args->handle, &args->offset);
return drm_gem_dumb_map_offset(file_priv, dev, args->handle,
&args->offset);
}
struct exynos_drm_gem *exynos_drm_gem_get(struct drm_file *filp,

4
include/drm/drm_gem.h
View File

@ -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_map_offset(struct drm_file *file, struct drm_device *dev,
u32 handle, u64 *offset);
int drm_gem_dumb_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);