github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-05-30 10:04:04 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

drm/shmem-helper: Refactor locked/unlocked functions

Browse Source 
Add locked and remove unlocked postfixes from drm-shmem function names,
making names consistent with the drm/gem core code.

Reviewed-by: Boris Brezillon <boris.brezillon@collabora.com>
Suggested-by: Boris Brezillon <boris.brezillon@collabora.com>
Acked-by: Thomas Zimmermann <tzimmermann@suse.d>
Signed-off-by: Dmitry Osipenko <dmitry.osipenko@collabora.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20250322212608.40511-6-dmitry.osipenko@collabora.com
This commit is contained in:
Dmitry Osipenko 2025-03-23 00:26:03 +03:00
parent 1d23391d7e
commit 954907f714
7 changed files with 56 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
drivers/gpu/drm/drm_gem_shmem_helper.c
View File

@ -174,7 +174,7 @@ void drm_gem_shmem_free(struct drm_gem_shmem_object *shmem)
kfree(shmem->sgt); kfree(shmem->sgt);
} }
if (shmem->pages) if (shmem->pages)
drm_gem_shmem_put_pages(shmem); drm_gem_shmem_put_pages_locked(shmem);
drm_WARN_ON(obj->dev, shmem->pages_use_count); drm_WARN_ON(obj->dev, shmem->pages_use_count);
@ -186,7 +186,7 @@ void drm_gem_shmem_free(struct drm_gem_shmem_object *shmem)
} }
EXPORT_SYMBOL_GPL(drm_gem_shmem_free); EXPORT_SYMBOL_GPL(drm_gem_shmem_free);
static int drm_gem_shmem_get_pages(struct drm_gem_shmem_object *shmem) static int drm_gem_shmem_get_pages_locked(struct drm_gem_shmem_object *shmem)
{ {
struct drm_gem_object *obj = &shmem->base; struct drm_gem_object *obj = &shmem->base;
struct page **pages; struct page **pages;
@ -220,12 +220,12 @@ static int drm_gem_shmem_get_pages(struct drm_gem_shmem_object *shmem)
} }
/* /*
* drm_gem_shmem_put_pages - Decrease use count on the backing pages for a shmem GEM object * drm_gem_shmem_put_pages_locked - Decrease use count on the backing pages for a shmem GEM object
* @shmem: shmem GEM object * @shmem: shmem GEM object
* *
* This function decreases the use count and puts the backing pages when use drops to zero. * This function decreases the use count and puts the backing pages when use drops to zero.
*/ */
void drm_gem_shmem_put_pages(struct drm_gem_shmem_object *shmem) void drm_gem_shmem_put_pages_locked(struct drm_gem_shmem_object *shmem)
{ {
struct drm_gem_object *obj = &shmem->base; struct drm_gem_object *obj = &shmem->base;
@ -247,7 +247,7 @@ void drm_gem_shmem_put_pages(struct drm_gem_shmem_object *shmem)
shmem->pages_mark_accessed_on_put); shmem->pages_mark_accessed_on_put);
shmem->pages = NULL; shmem->pages = NULL;
} }
EXPORT_SYMBOL_GPL(drm_gem_shmem_put_pages); EXPORT_SYMBOL_GPL(drm_gem_shmem_put_pages_locked);
int drm_gem_shmem_pin_locked(struct drm_gem_shmem_object *shmem) int drm_gem_shmem_pin_locked(struct drm_gem_shmem_object *shmem)
{ {
@ -257,7 +257,7 @@ int drm_gem_shmem_pin_locked(struct drm_gem_shmem_object *shmem)
drm_WARN_ON(shmem->base.dev, drm_gem_is_imported(&shmem->base)); drm_WARN_ON(shmem->base.dev, drm_gem_is_imported(&shmem->base));
ret = drm_gem_shmem_get_pages(shmem); ret = drm_gem_shmem_get_pages_locked(shmem);
return ret; return ret;
} }
@ -267,7 +267,7 @@ void drm_gem_shmem_unpin_locked(struct drm_gem_shmem_object *shmem)
{ {
dma_resv_assert_held(shmem->base.resv); dma_resv_assert_held(shmem->base.resv);
drm_gem_shmem_put_pages(shmem); drm_gem_shmem_put_pages_locked(shmem);
} }
EXPORT_SYMBOL(drm_gem_shmem_unpin_locked); EXPORT_SYMBOL(drm_gem_shmem_unpin_locked);
@ -318,7 +318,7 @@ void drm_gem_shmem_unpin(struct drm_gem_shmem_object *shmem)
EXPORT_SYMBOL_GPL(drm_gem_shmem_unpin); EXPORT_SYMBOL_GPL(drm_gem_shmem_unpin);
/* /*
* drm_gem_shmem_vmap - Create a virtual mapping for a shmem GEM object * drm_gem_shmem_vmap_locked - Create a virtual mapping for a shmem GEM object
* @shmem: shmem GEM object * @shmem: shmem GEM object
* @map: Returns the kernel virtual address of the SHMEM GEM object's backing * @map: Returns the kernel virtual address of the SHMEM GEM object's backing
* store. * store.
@ -327,13 +327,13 @@ EXPORT_SYMBOL_GPL(drm_gem_shmem_unpin);
* exists for the buffer backing the shmem GEM object. It hides the differences * exists for the buffer backing the shmem GEM object. It hides the differences
* between dma-buf imported and natively allocated objects. * between dma-buf imported and natively allocated objects.
* *
* Acquired mappings should be cleaned up by calling drm_gem_shmem_vunmap(). * Acquired mappings should be cleaned up by calling drm_gem_shmem_vunmap_locked().
* *
* Returns: * Returns:
* 0 on success or a negative error code on failure. * 0 on success or a negative error code on failure.
*/ */
int drm_gem_shmem_vmap(struct drm_gem_shmem_object *shmem, int drm_gem_shmem_vmap_locked(struct drm_gem_shmem_object *shmem,
struct iosys_map *map) struct iosys_map *map)
{ {
struct drm_gem_object *obj = &shmem->base; struct drm_gem_object *obj = &shmem->base;
int ret = 0; int ret = 0;
@ -356,7 +356,7 @@ int drm_gem_shmem_vmap(struct drm_gem_shmem_object *shmem,
return 0; return 0;
} }
ret = drm_gem_shmem_get_pages(shmem); ret = drm_gem_shmem_get_pages_locked(shmem);
if (ret) if (ret)
goto err_zero_use; goto err_zero_use;
@ -379,28 +379,28 @@ int drm_gem_shmem_vmap(struct drm_gem_shmem_object *shmem,
err_put_pages: err_put_pages:
if (!drm_gem_is_imported(obj)) if (!drm_gem_is_imported(obj))
drm_gem_shmem_put_pages(shmem); drm_gem_shmem_put_pages_locked(shmem);
err_zero_use: err_zero_use:
shmem->vmap_use_count = 0; shmem->vmap_use_count = 0;
return ret; return ret;
} }
EXPORT_SYMBOL_GPL(drm_gem_shmem_vmap); EXPORT_SYMBOL_GPL(drm_gem_shmem_vmap_locked);
/* /*
* drm_gem_shmem_vunmap - Unmap a virtual mapping for a shmem GEM object * drm_gem_shmem_vunmap_locked - Unmap a virtual mapping for a shmem GEM object
* @shmem: shmem GEM object * @shmem: shmem GEM object
* @map: Kernel virtual address where the SHMEM GEM object was mapped * @map: Kernel virtual address where the SHMEM GEM object was mapped
* *
* This function cleans up a kernel virtual address mapping acquired by * This function cleans up a kernel virtual address mapping acquired by
* drm_gem_shmem_vmap(). The mapping is only removed when the use count drops to * drm_gem_shmem_vmap_locked(). The mapping is only removed when the use count
* zero. * drops to zero.
* *
* This function hides the differences between dma-buf imported and natively * This function hides the differences between dma-buf imported and natively
* allocated objects. * allocated objects.
*/ */
void drm_gem_shmem_vunmap(struct drm_gem_shmem_object *shmem, void drm_gem_shmem_vunmap_locked(struct drm_gem_shmem_object *shmem,
struct iosys_map *map) struct iosys_map *map)
{ {
struct drm_gem_object *obj = &shmem->base; struct drm_gem_object *obj = &shmem->base;
@ -416,12 +416,12 @@ void drm_gem_shmem_vunmap(struct drm_gem_shmem_object *shmem,
return; return;
vunmap(shmem->vaddr); vunmap(shmem->vaddr);
drm_gem_shmem_put_pages(shmem); drm_gem_shmem_put_pages_locked(shmem);
} }
shmem->vaddr = NULL; shmem->vaddr = NULL;
} }
EXPORT_SYMBOL_GPL(drm_gem_shmem_vunmap); EXPORT_SYMBOL_GPL(drm_gem_shmem_vunmap_locked);
static int static int
drm_gem_shmem_create_with_handle(struct drm_file *file_priv, drm_gem_shmem_create_with_handle(struct drm_file *file_priv,
@ -449,7 +449,7 @@ drm_gem_shmem_create_with_handle(struct drm_file *file_priv,
/* Update madvise status, returns true if not purged, else /* Update madvise status, returns true if not purged, else
* false or -errno. * false or -errno.
*/ */
int drm_gem_shmem_madvise(struct drm_gem_shmem_object *shmem, int madv) int drm_gem_shmem_madvise_locked(struct drm_gem_shmem_object *shmem, int madv)
{ {
dma_resv_assert_held(shmem->base.resv); dma_resv_assert_held(shmem->base.resv);
@ -460,9 +460,9 @@ int drm_gem_shmem_madvise(struct drm_gem_shmem_object *shmem, int madv)
return (madv >= 0); return (madv >= 0);
} }
EXPORT_SYMBOL_GPL(drm_gem_shmem_madvise); EXPORT_SYMBOL_GPL(drm_gem_shmem_madvise_locked);
void drm_gem_shmem_purge(struct drm_gem_shmem_object *shmem) void drm_gem_shmem_purge_locked(struct drm_gem_shmem_object *shmem)
{ {
struct drm_gem_object *obj = &shmem->base; struct drm_gem_object *obj = &shmem->base;
struct drm_device *dev = obj->dev; struct drm_device *dev = obj->dev;
@ -476,7 +476,7 @@ void drm_gem_shmem_purge(struct drm_gem_shmem_object *shmem)
kfree(shmem->sgt); kfree(shmem->sgt);
shmem->sgt = NULL; shmem->sgt = NULL;
drm_gem_shmem_put_pages(shmem); drm_gem_shmem_put_pages_locked(shmem);
shmem->madv = -1; shmem->madv = -1;
@ -492,7 +492,7 @@ void drm_gem_shmem_purge(struct drm_gem_shmem_object *shmem)
invalidate_mapping_pages(file_inode(obj->filp)->i_mapping, 0, (loff_t)-1); invalidate_mapping_pages(file_inode(obj->filp)->i_mapping, 0, (loff_t)-1);
} }
EXPORT_SYMBOL_GPL(drm_gem_shmem_purge); EXPORT_SYMBOL_GPL(drm_gem_shmem_purge_locked);
/** /**
* drm_gem_shmem_dumb_create - Create a dumb shmem buffer object * drm_gem_shmem_dumb_create - Create a dumb shmem buffer object
@ -589,7 +589,7 @@ static void drm_gem_shmem_vm_close(struct vm_area_struct *vma)
struct drm_gem_shmem_object *shmem = to_drm_gem_shmem_obj(obj); struct drm_gem_shmem_object *shmem = to_drm_gem_shmem_obj(obj);
dma_resv_lock(shmem->base.resv, NULL); dma_resv_lock(shmem->base.resv, NULL);
drm_gem_shmem_put_pages(shmem); drm_gem_shmem_put_pages_locked(shmem);
dma_resv_unlock(shmem->base.resv); dma_resv_unlock(shmem->base.resv);
drm_gem_vm_close(vma); drm_gem_vm_close(vma);
@ -639,7 +639,7 @@ int drm_gem_shmem_mmap(struct drm_gem_shmem_object *shmem, struct vm_area_struct
return -EINVAL; return -EINVAL;
dma_resv_lock(shmem->base.resv, NULL); dma_resv_lock(shmem->base.resv, NULL);
ret = drm_gem_shmem_get_pages(shmem); ret = drm_gem_shmem_get_pages_locked(shmem);
dma_resv_unlock(shmem->base.resv); dma_resv_unlock(shmem->base.resv);
if (ret) if (ret)
@ -707,7 +707,7 @@ static struct sg_table *drm_gem_shmem_get_pages_sgt_locked(struct drm_gem_shmem_
drm_WARN_ON(obj->dev, drm_gem_is_imported(obj)); drm_WARN_ON(obj->dev, drm_gem_is_imported(obj));
ret = drm_gem_shmem_get_pages(shmem); ret = drm_gem_shmem_get_pages_locked(shmem);
if (ret) if (ret)
return ERR_PTR(ret); return ERR_PTR(ret);
@ -729,7 +729,7 @@ static struct sg_table *drm_gem_shmem_get_pages_sgt_locked(struct drm_gem_shmem_
sg_free_table(sgt); sg_free_table(sgt);
kfree(sgt); kfree(sgt);
err_put_pages: err_put_pages:
drm_gem_shmem_put_pages(shmem); drm_gem_shmem_put_pages_locked(shmem);
return ERR_PTR(ret); return ERR_PTR(ret);
} }

4
drivers/gpu/drm/imagination/pvr_gem.c
View File

@ -203,7 +203,7 @@ pvr_gem_object_vmap(struct pvr_gem_object *pvr_obj)
dma_resv_lock(obj->resv, NULL); dma_resv_lock(obj->resv, NULL);
err = drm_gem_shmem_vmap(shmem_obj, &map); err = drm_gem_shmem_vmap_locked(shmem_obj, &map);
if (err) if (err)
goto err_unlock; goto err_unlock;
@ -257,7 +257,7 @@ pvr_gem_object_vunmap(struct pvr_gem_object *pvr_obj)
dma_sync_sgtable_for_device(dev, shmem_obj->sgt, DMA_BIDIRECTIONAL); dma_sync_sgtable_for_device(dev, shmem_obj->sgt, DMA_BIDIRECTIONAL);
} }
drm_gem_shmem_vunmap(shmem_obj, &map); drm_gem_shmem_vunmap_locked(shmem_obj, &map);
dma_resv_unlock(obj->resv); dma_resv_unlock(obj->resv);
} }

2
drivers/gpu/drm/lima/lima_gem.c
View File

@ -195,7 +195,7 @@ static int lima_gem_vmap(struct drm_gem_object *obj, struct iosys_map *map)
if (bo->heap_size) if (bo->heap_size)
return -EINVAL; return -EINVAL;
return drm_gem_shmem_vmap(&bo->base, map); return drm_gem_shmem_vmap_locked(&bo->base, map);
} }
static int lima_gem_mmap(struct drm_gem_object *obj, struct vm_area_struct *vma) static int lima_gem_mmap(struct drm_gem_object *obj, struct vm_area_struct *vma)

2
drivers/gpu/drm/panfrost/panfrost_drv.c
View File

@ -476,7 +476,7 @@ static int panfrost_ioctl_madvise(struct drm_device *dev, void *data,
} }
} }
args->retained = drm_gem_shmem_madvise(&bo->base, args->madv); args->retained = drm_gem_shmem_madvise_locked(&bo->base, args->madv);
if (args->retained) { if (args->retained) {
if (args->madv == PANFROST_MADV_DONTNEED) if (args->madv == PANFROST_MADV_DONTNEED)

2
drivers/gpu/drm/panfrost/panfrost_gem_shrinker.c
View File

@ -51,7 +51,7 @@ static bool panfrost_gem_purge(struct drm_gem_object *obj)
goto unlock_mappings; goto unlock_mappings;
panfrost_gem_teardown_mappings_locked(bo); panfrost_gem_teardown_mappings_locked(bo);
drm_gem_shmem_purge(&bo->base); drm_gem_shmem_purge_locked(&bo->base);
ret = true; ret = true;
dma_resv_unlock(shmem->base.resv); dma_resv_unlock(shmem->base.resv);

14
drivers/gpu/drm/tests/drm_gem_shmem_test.c
View File

@ -173,7 +173,7 @@ static void drm_gem_shmem_test_vmap(struct kunit *test)
ret = kunit_add_action_or_reset(test, drm_gem_shmem_free_wrapper, shmem); ret = kunit_add_action_or_reset(test, drm_gem_shmem_free_wrapper, shmem);
KUNIT_ASSERT_EQ(test, ret, 0); KUNIT_ASSERT_EQ(test, ret, 0);
ret = drm_gem_shmem_vmap(shmem, &map); ret = drm_gem_shmem_vmap_locked(shmem, &map);
KUNIT_ASSERT_EQ(test, ret, 0); KUNIT_ASSERT_EQ(test, ret, 0);
KUNIT_ASSERT_NOT_NULL(test, shmem->vaddr); KUNIT_ASSERT_NOT_NULL(test, shmem->vaddr);
KUNIT_ASSERT_FALSE(test, iosys_map_is_null(&map)); KUNIT_ASSERT_FALSE(test, iosys_map_is_null(&map));
@ -183,7 +183,7 @@ static void drm_gem_shmem_test_vmap(struct kunit *test)
for (i = 0; i < TEST_SIZE; i++) for (i = 0; i < TEST_SIZE; i++)
KUNIT_EXPECT_EQ(test, iosys_map_rd(&map, i, u8), TEST_BYTE); KUNIT_EXPECT_EQ(test, iosys_map_rd(&map, i, u8), TEST_BYTE);
drm_gem_shmem_vunmap(shmem, &map); drm_gem_shmem_vunmap_locked(shmem, &map);
KUNIT_EXPECT_NULL(test, shmem->vaddr); KUNIT_EXPECT_NULL(test, shmem->vaddr);
KUNIT_EXPECT_EQ(test, shmem->vmap_use_count, 0); KUNIT_EXPECT_EQ(test, shmem->vmap_use_count, 0);
} }
@ -281,17 +281,17 @@ static void drm_gem_shmem_test_madvise(struct kunit *test)
ret = kunit_add_action_or_reset(test, drm_gem_shmem_free_wrapper, shmem); ret = kunit_add_action_or_reset(test, drm_gem_shmem_free_wrapper, shmem);
KUNIT_ASSERT_EQ(test, ret, 0); KUNIT_ASSERT_EQ(test, ret, 0);
ret = drm_gem_shmem_madvise(shmem, 1); ret = drm_gem_shmem_madvise_locked(shmem, 1);
KUNIT_EXPECT_TRUE(test, ret); KUNIT_EXPECT_TRUE(test, ret);
KUNIT_ASSERT_EQ(test, shmem->madv, 1); KUNIT_ASSERT_EQ(test, shmem->madv, 1);
/* Set madv to a negative value */ /* Set madv to a negative value */
ret = drm_gem_shmem_madvise(shmem, -1); ret = drm_gem_shmem_madvise_locked(shmem, -1);
KUNIT_EXPECT_FALSE(test, ret); KUNIT_EXPECT_FALSE(test, ret);
KUNIT_ASSERT_EQ(test, shmem->madv, -1); KUNIT_ASSERT_EQ(test, shmem->madv, -1);
/* Check that madv cannot be set back to a positive value */ /* Check that madv cannot be set back to a positive value */
ret = drm_gem_shmem_madvise(shmem, 0); ret = drm_gem_shmem_madvise_locked(shmem, 0);
KUNIT_EXPECT_FALSE(test, ret); KUNIT_EXPECT_FALSE(test, ret);
KUNIT_ASSERT_EQ(test, shmem->madv, -1); KUNIT_ASSERT_EQ(test, shmem->madv, -1);
} }
@ -319,7 +319,7 @@ static void drm_gem_shmem_test_purge(struct kunit *test)
ret = drm_gem_shmem_is_purgeable(shmem); ret = drm_gem_shmem_is_purgeable(shmem);
KUNIT_EXPECT_FALSE(test, ret); KUNIT_EXPECT_FALSE(test, ret);
ret = drm_gem_shmem_madvise(shmem, 1); ret = drm_gem_shmem_madvise_locked(shmem, 1);
KUNIT_EXPECT_TRUE(test, ret); KUNIT_EXPECT_TRUE(test, ret);
/* The scatter/gather table will be freed by drm_gem_shmem_free */ /* The scatter/gather table will be freed by drm_gem_shmem_free */
@ -329,7 +329,7 @@ static void drm_gem_shmem_test_purge(struct kunit *test)
ret = drm_gem_shmem_is_purgeable(shmem); ret = drm_gem_shmem_is_purgeable(shmem);
KUNIT_EXPECT_TRUE(test, ret); KUNIT_EXPECT_TRUE(test, ret);
drm_gem_shmem_purge(shmem); drm_gem_shmem_purge_locked(shmem);
KUNIT_EXPECT_NULL(test, shmem->pages); KUNIT_EXPECT_NULL(test, shmem->pages);
KUNIT_EXPECT_NULL(test, shmem->sgt); KUNIT_EXPECT_NULL(test, shmem->sgt);
KUNIT_EXPECT_EQ(test, shmem->madv, -1); KUNIT_EXPECT_EQ(test, shmem->madv, -1);

28
include/drm/drm_gem_shmem_helper.h
View File

@ -102,19 +102,19 @@ struct drm_gem_shmem_object *drm_gem_shmem_create_with_mnt(struct drm_device *de
struct vfsmount *gemfs); struct vfsmount *gemfs);
void drm_gem_shmem_free(struct drm_gem_shmem_object *shmem); void drm_gem_shmem_free(struct drm_gem_shmem_object *shmem);
void drm_gem_shmem_put_pages(struct drm_gem_shmem_object *shmem); void drm_gem_shmem_put_pages_locked(struct drm_gem_shmem_object *shmem);
int drm_gem_shmem_pin(struct drm_gem_shmem_object *shmem); int drm_gem_shmem_pin(struct drm_gem_shmem_object *shmem);
void drm_gem_shmem_unpin(struct drm_gem_shmem_object *shmem); void drm_gem_shmem_unpin(struct drm_gem_shmem_object *shmem);
int drm_gem_shmem_vmap(struct drm_gem_shmem_object *shmem, int drm_gem_shmem_vmap_locked(struct drm_gem_shmem_object *shmem,
struct iosys_map *map); struct iosys_map *map);
void drm_gem_shmem_vunmap(struct drm_gem_shmem_object *shmem, void drm_gem_shmem_vunmap_locked(struct drm_gem_shmem_object *shmem,
struct iosys_map *map); struct iosys_map *map);
int drm_gem_shmem_mmap(struct drm_gem_shmem_object *shmem, struct vm_area_struct *vma); int drm_gem_shmem_mmap(struct drm_gem_shmem_object *shmem, struct vm_area_struct *vma);
int drm_gem_shmem_pin_locked(struct drm_gem_shmem_object *shmem); int drm_gem_shmem_pin_locked(struct drm_gem_shmem_object *shmem);
void drm_gem_shmem_unpin_locked(struct drm_gem_shmem_object *shmem); void drm_gem_shmem_unpin_locked(struct drm_gem_shmem_object *shmem);
int drm_gem_shmem_madvise(struct drm_gem_shmem_object *shmem, int madv); int drm_gem_shmem_madvise_locked(struct drm_gem_shmem_object *shmem, int madv);
static inline bool drm_gem_shmem_is_purgeable(struct drm_gem_shmem_object *shmem) static inline bool drm_gem_shmem_is_purgeable(struct drm_gem_shmem_object *shmem)
{ {
@ -123,7 +123,7 @@ static inline bool drm_gem_shmem_is_purgeable(struct drm_gem_shmem_object *shmem
!shmem->base.dma_buf && !drm_gem_is_imported(&shmem->base); !shmem->base.dma_buf && !drm_gem_is_imported(&shmem->base);
} }
void drm_gem_shmem_purge(struct drm_gem_shmem_object *shmem); void drm_gem_shmem_purge_locked(struct drm_gem_shmem_object *shmem);
struct sg_table *drm_gem_shmem_get_sg_table(struct drm_gem_shmem_object *shmem); struct sg_table *drm_gem_shmem_get_sg_table(struct drm_gem_shmem_object *shmem);
struct sg_table *drm_gem_shmem_get_pages_sgt(struct drm_gem_shmem_object *shmem); struct sg_table *drm_gem_shmem_get_pages_sgt(struct drm_gem_shmem_object *shmem);
@ -214,12 +214,12 @@ static inline struct sg_table *drm_gem_shmem_object_get_sg_table(struct drm_gem_
} }
/* /*
* drm_gem_shmem_object_vmap - GEM object function for drm_gem_shmem_vmap() * drm_gem_shmem_object_vmap - GEM object function for drm_gem_shmem_vmap_locked()
* @obj: GEM object * @obj: GEM object
* @map: Returns the kernel virtual address of the SHMEM GEM object's backing store. * @map: Returns the kernel virtual address of the SHMEM GEM object's backing store.
* *
* This function wraps drm_gem_shmem_vmap(). Drivers that employ the shmem helpers should * This function wraps drm_gem_shmem_vmap_locked(). Drivers that employ the shmem
* use it as their &drm_gem_object_funcs.vmap handler. * helpers should use it as their &drm_gem_object_funcs.vmap handler.
* *
* Returns: * Returns:
* 0 on success or a negative error code on failure. * 0 on success or a negative error code on failure.
@ -229,7 +229,7 @@ static inline int drm_gem_shmem_object_vmap(struct drm_gem_object *obj,
{ {
struct drm_gem_shmem_object *shmem = to_drm_gem_shmem_obj(obj); struct drm_gem_shmem_object *shmem = to_drm_gem_shmem_obj(obj);
return drm_gem_shmem_vmap(shmem, map); return drm_gem_shmem_vmap_locked(shmem, map);
} }
/* /*
@ -237,15 +237,15 @@ static inline int drm_gem_shmem_object_vmap(struct drm_gem_object *obj,
* @obj: GEM object * @obj: GEM object
* @map: Kernel virtual address where the SHMEM GEM object was mapped * @map: Kernel virtual address where the SHMEM GEM object was mapped
* *
* This function wraps drm_gem_shmem_vunmap(). Drivers that employ the shmem helpers should * This function wraps drm_gem_shmem_vunmap_locked(). Drivers that employ the shmem
* use it as their &drm_gem_object_funcs.vunmap handler. * helpers should use it as their &drm_gem_object_funcs.vunmap handler.
*/ */
static inline void drm_gem_shmem_object_vunmap(struct drm_gem_object *obj, static inline void drm_gem_shmem_object_vunmap(struct drm_gem_object *obj,
struct iosys_map *map) struct iosys_map *map)
{ {
struct drm_gem_shmem_object *shmem = to_drm_gem_shmem_obj(obj); struct drm_gem_shmem_object *shmem = to_drm_gem_shmem_obj(obj);
drm_gem_shmem_vunmap(shmem, map); drm_gem_shmem_vunmap_locked(shmem, map);
} }
/** /**