Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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

This reverts commit 220df83a5394fbf7c1486ba7848794b7b351d598.

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

authored by

Rob Herring and committed by
Sean Paul
abd4e745 e6be0a99

+9 -12
+2 -2
drivers/gpu/drm/drm_dumb_buffers.c
··· 48 48 * To support dumb objects drivers must implement the &drm_driver.dumb_create 49 49 * operation. &drm_driver.dumb_destroy defaults to drm_gem_dumb_destroy() if 50 50 * not set and &drm_driver.dumb_map_offset defaults to 51 - * drm_gem_map_offset(). See the callbacks for further details. 51 + * drm_gem_dumb_map_offset(). See the callbacks for further details. 52 52 * 53 53 * Note that dumb objects may not be used for gpu acceleration, as has been 54 54 * attempted on some ARM embedded platforms. Such drivers really must have ··· 127 127 args->handle, 128 128 &args->offset); 129 129 else 130 - return drm_gem_map_offset(file_priv, dev, args->handle, 130 + return drm_gem_dumb_map_offset(file_priv, dev, args->handle, 131 131 &args->offset); 132 132 } 133 133
+3 -7
drivers/gpu/drm/drm_gem.c
··· 298 298 EXPORT_SYMBOL(drm_gem_handle_delete); 299 299 300 300 /** 301 - * drm_gem_map_offset - return the fake mmap offset for a gem object 301 + * drm_gem_dumb_map_offset - return the fake mmap offset for a gem object 302 302 * @file: drm file-private structure containing the gem object 303 303 * @dev: corresponding drm_device 304 304 * @handle: gem object handle ··· 307 307 * This implements the &drm_driver.dumb_map_offset kms driver callback for 308 308 * drivers which use gem to manage their backing storage. 309 309 * 310 - * It can also be used by drivers using GEM BO implementations which 311 - * have same restriction that imported objects cannot be mapped. The 312 - * shmem backend is one example. 313 - * 314 310 * Returns: 315 311 * 0 on success or a negative error code on failure. 316 312 */ 317 - int drm_gem_map_offset(struct drm_file *file, struct drm_device *dev, 313 + int drm_gem_dumb_map_offset(struct drm_file *file, struct drm_device *dev, 318 314 u32 handle, u64 *offset) 319 315 { 320 316 struct drm_gem_object *obj; ··· 336 340 337 341 return ret; 338 342 } 339 - EXPORT_SYMBOL_GPL(drm_gem_map_offset); 343 + EXPORT_SYMBOL_GPL(drm_gem_dumb_map_offset); 340 344 341 345 /** 342 346 * drm_gem_dumb_destroy - dumb fb callback helper for gem based drivers
+2 -1
drivers/gpu/drm/exynos/exynos_drm_gem.c
··· 273 273 { 274 274 struct drm_exynos_gem_map *args = data; 275 275 276 - return drm_gem_map_offset(file_priv, dev, args->handle, &args->offset); 276 + return drm_gem_dumb_map_offset(file_priv, dev, args->handle, 277 + &args->offset); 277 278 } 278 279 279 280 struct exynos_drm_gem *exynos_drm_gem_get(struct drm_file *filp,
+2 -2
include/drm/drm_gem.h
··· 401 401 int drm_gem_fence_array_add_implicit(struct xarray *fence_array, 402 402 struct drm_gem_object *obj, 403 403 bool write); 404 - int drm_gem_map_offset(struct drm_file *file, struct drm_device *dev, 405 - u32 handle, u64 *offset); 404 + int drm_gem_dumb_map_offset(struct drm_file *file, struct drm_device *dev, 405 + u32 handle, u64 *offset); 406 406 int drm_gem_dumb_destroy(struct drm_file *file, 407 407 struct drm_device *dev, 408 408 uint32_t handle);