Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 87160d2b authored by Sean Paul's avatar Sean Paul
Browse files

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



This reverts commit 415d2e9e.

Mandatory review was missing from this patch.

Acked-by: default avatarMaxime Ripard <maxime.ripard@bootlin.com>
Signed-off-by: default avatarSean Paul <seanpaul@chromium.org>
Link: https://patchwork.freedesktop.org/patch/msgid/20190807142101.251400-2-sean@poorly.run
parent fcfce9f3

drivers/gpu/drm/drm_dumb_buffers.c

+2 −2
Original line number Diff line number Diff line
@@ -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

+7 −3
Original line number Diff line number Diff line
@@ -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,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;
@@ -336,7 +340,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
Original line number Diff line number Diff line
@@ -273,8 +273,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
Original line number Diff line number Diff line
@@ -401,7 +401,7 @@ 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,

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,