iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

drm/gem: Unexport drm_gem_(un)pin/v(un)map

Browse Source 
They're purely for internal use, not for drivers.

Cc: Noralf Trønnes <noralf@tronnes.org>
Cc: Christian König <christian.koenig@amd.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20190614203615.12639-3-daniel.vetter@ffwll.ch
This commit is contained in:
Daniel Vetter 2019-06-14 22:35:18 +02:00
parent 8db420ac6c
commit eb69c8a4bf
3 changed files with 5 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1216,15 +1216,6 @@ void drm_gem_print_info(struct drm_printer *p, unsigned int indent,
obj->dev->driver->gem_print_info(p, indent, obj); obj->dev->driver->gem_print_info(p, indent, obj);
} }
/**
* drm_gem_pin - Pin backing buffer in memory
* @obj: GEM object
*
* Make sure the backing buffer is pinned in memory.
*
* Returns:
* 0 on success or a negative error code on failure.
*/
int drm_gem_pin(struct drm_gem_object *obj) int drm_gem_pin(struct drm_gem_object *obj)
{ {
if (obj->funcs && obj->funcs->pin) if (obj->funcs && obj->funcs->pin)
@ -1234,14 +1225,7 @@ int drm_gem_pin(struct drm_gem_object *obj)
else else
return 0; return 0;
} }
EXPORT_SYMBOL(drm_gem_pin);
/**
* drm_gem_unpin - Unpin backing buffer from memory
* @obj: GEM object
*
* Relax the requirement that the backing buffer is pinned in memory.
*/
void drm_gem_unpin(struct drm_gem_object *obj) void drm_gem_unpin(struct drm_gem_object *obj)
{ {
if (obj->funcs && obj->funcs->unpin) if (obj->funcs && obj->funcs->unpin)
@ -1249,16 +1233,7 @@ void drm_gem_unpin(struct drm_gem_object *obj)
else if (obj->dev->driver->gem_prime_unpin) else if (obj->dev->driver->gem_prime_unpin)
obj->dev->driver->gem_prime_unpin(obj); obj->dev->driver->gem_prime_unpin(obj);
} }
EXPORT_SYMBOL(drm_gem_unpin);
/**
* drm_gem_vmap - Map buffer into kernel virtual address space
* @obj: GEM object
*
* Returns:
* A virtual pointer to a newly created GEM object or an ERR_PTR-encoded negative
* error code on failure.
*/
void *drm_gem_vmap(struct drm_gem_object *obj) void *drm_gem_vmap(struct drm_gem_object *obj)
{ {
void *vaddr; void *vaddr;
@ -1275,13 +1250,7 @@ void *drm_gem_vmap(struct drm_gem_object *obj)
return vaddr; return vaddr;
} }
EXPORT_SYMBOL(drm_gem_vmap);
/**
* drm_gem_vunmap - Remove buffer mapping from kernel virtual address space
* @obj: GEM object
* @vaddr: Virtual address (can be NULL)
*/
void drm_gem_vunmap(struct drm_gem_object *obj, void *vaddr) void drm_gem_vunmap(struct drm_gem_object *obj, void *vaddr)
{ {
if (!vaddr) if (!vaddr)
@ -1292,7 +1261,6 @@ void drm_gem_vunmap(struct drm_gem_object *obj, void *vaddr)
else if (obj->dev->driver->gem_prime_vunmap) else if (obj->dev->driver->gem_prime_vunmap)
obj->dev->driver->gem_prime_vunmap(obj, vaddr); obj->dev->driver->gem_prime_vunmap(obj, vaddr);
} }
EXPORT_SYMBOL(drm_gem_vunmap);
/** /**
* drm_gem_lock_reservations - Sets up the ww context and acquires * drm_gem_lock_reservations - Sets up the ww context and acquires

5
drivers/gpu/drm/drm_internal.h
View File

@ -133,6 +133,11 @@ void drm_gem_release(struct drm_device *dev, struct drm_file *file_private);
void drm_gem_print_info(struct drm_printer *p, unsigned int indent, void drm_gem_print_info(struct drm_printer *p, unsigned int indent,
const struct drm_gem_object *obj); const struct drm_gem_object *obj);
int drm_gem_pin(struct drm_gem_object *obj);
void drm_gem_unpin(struct drm_gem_object *obj);
void *drm_gem_vmap(struct drm_gem_object *obj);
void drm_gem_vunmap(struct drm_gem_object *obj, void *vaddr);
/* drm_debugfs.c drm_debugfs_crc.c */ /* drm_debugfs.c drm_debugfs_crc.c */
#if defined(CONFIG_DEBUG_FS) #if defined(CONFIG_DEBUG_FS)
int drm_debugfs_init(struct drm_minor *minor, int minor_id, int drm_debugfs_init(struct drm_minor *minor, int minor_id,

5
include/drm/drm_gem.h
View File

@ -401,9 +401,4 @@ int drm_gem_dumb_destroy(struct drm_file *file,
struct drm_device *dev, struct drm_device *dev,
uint32_t handle); uint32_t handle);
int drm_gem_pin(struct drm_gem_object *obj);
void drm_gem_unpin(struct drm_gem_object *obj);
void *drm_gem_vmap(struct drm_gem_object *obj);
void drm_gem_vunmap(struct drm_gem_object *obj, void *vaddr);
#endif /* __DRM_GEM_H__ */ #endif /* __DRM_GEM_H__ */