From nobody Thu Dec 18 16:33:12 2025 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id DC943C83F01 for ; Sun, 27 Aug 2023 17:57:03 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230140AbjH0R4e (ORCPT ); Sun, 27 Aug 2023 13:56:34 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50460 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230008AbjH0R4I (ORCPT ); Sun, 27 Aug 2023 13:56:08 -0400 Received: from madras.collabora.co.uk (madras.collabora.co.uk [IPv6:2a00:1098:0:82:1000:25:2eeb:e5ab]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4B33E102 for ; Sun, 27 Aug 2023 10:56:05 -0700 (PDT) Received: from workpc.. (109-252-153-31.dynamic.spd-mgts.ru [109.252.153.31]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: dmitry.osipenko) by madras.collabora.co.uk (Postfix) with ESMTPSA id 913B16607181; Sun, 27 Aug 2023 18:56:02 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1693158964; bh=ByinIBR6C889Wc7J5QSlS+UZS3TDGPt4wJQxb1KoG58=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=RlhxgmgAcy0Ut1eEelzG9PzJCngwjXq+B4SSIC+Kxao5VUoRpcHLM8kxPI2cp5AGn 27m6OgT32qcuONvXZ2Ct6TdyM2ha01rQ7wGSCzw4aHDkMKGLLQ7f5lY5qj8sInRa2U AMgT9++zV7IrqFjUmOTxCKblM/RcKqmotIW+n7wMDbNvJ7mHLpPH4ApeAlwXygnq/d zcSRFOCXHoKIfpW/MYh6N3nYbbdQE2wjjKWyiC86uqHSc+ny8/jfof43WUMKlDUaIV rVwEfLMAIZe583RhFd2td6fGjaC0fY3Hyrs33rtIcrs9aqaGB76PG/Zp3Yc6fJS5jq wsQsSxq3GNc7w== From: Dmitry Osipenko To: David Airlie , Gerd Hoffmann , Gurchetan Singh , Chia-I Wu , Daniel Vetter , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , =?UTF-8?q?Christian=20K=C3=B6nig?= , Qiang Yu , Steven Price , Boris Brezillon , Emma Anholt , Melissa Wen , Will Deacon , Peter Zijlstra , Boqun Feng , Mark Rutland Cc: dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, kernel@collabora.com, virtualization@lists.linux-foundation.org, intel-gfx@lists.freedesktop.org Subject: [PATCH v15 08/23] drm/shmem-helper: Refactor locked/unlocked functions Date: Sun, 27 Aug 2023 20:54:34 +0300 Message-ID: <20230827175449.1766701-9-dmitry.osipenko@collabora.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230827175449.1766701-1-dmitry.osipenko@collabora.com> References: <20230827175449.1766701-1-dmitry.osipenko@collabora.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Add locked and remove unlocked postfixes from drm-shmem function names, making names consistent with the drm/gem core code. Suggested-by: Boris Brezillon Signed-off-by: Dmitry Osipenko Reviewed-by: Boris Brezillon --- drivers/gpu/drm/drm_gem_shmem_helper.c | 64 +++++++++---------- drivers/gpu/drm/lima/lima_gem.c | 8 +-- drivers/gpu/drm/panfrost/panfrost_drv.c | 2 +- drivers/gpu/drm/panfrost/panfrost_gem.c | 6 +- .../gpu/drm/panfrost/panfrost_gem_shrinker.c | 2 +- drivers/gpu/drm/panfrost/panfrost_mmu.c | 2 +- drivers/gpu/drm/v3d/v3d_bo.c | 4 +- drivers/gpu/drm/virtio/virtgpu_object.c | 4 +- include/drm/drm_gem_shmem_helper.h | 36 +++++------ 9 files changed, 64 insertions(+), 64 deletions(-) diff --git a/drivers/gpu/drm/drm_gem_shmem_helper.c b/drivers/gpu/drm/drm_g= em_shmem_helper.c index 575704f38808..f053dc511508 100644 --- a/drivers/gpu/drm/drm_gem_shmem_helper.c +++ b/drivers/gpu/drm/drm_gem_shmem_helper.c @@ -43,8 +43,8 @@ static const struct drm_gem_object_funcs drm_gem_shmem_fu= ncs =3D { .pin =3D drm_gem_shmem_object_pin, .unpin =3D drm_gem_shmem_object_unpin, .get_sg_table =3D drm_gem_shmem_object_get_sg_table, - .vmap =3D drm_gem_shmem_object_vmap, - .vunmap =3D drm_gem_shmem_object_vunmap, + .vmap =3D drm_gem_shmem_object_vmap_locked, + .vunmap =3D drm_gem_shmem_object_vunmap_locked, .mmap =3D drm_gem_shmem_object_mmap, .vm_ops =3D &drm_gem_shmem_vm_ops, }; @@ -153,7 +153,7 @@ void drm_gem_shmem_free(struct drm_gem_shmem_object *sh= mem) kfree(shmem->sgt); } if (shmem->got_sgt) - drm_gem_shmem_put_pages(shmem); + drm_gem_shmem_put_pages_locked(shmem); =20 drm_WARN_ON(obj->dev, shmem->pages_use_count); =20 @@ -165,7 +165,7 @@ void drm_gem_shmem_free(struct drm_gem_shmem_object *sh= mem) } EXPORT_SYMBOL_GPL(drm_gem_shmem_free); =20 -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 *shm= em) { struct drm_gem_object *obj =3D &shmem->base; struct page **pages; @@ -199,12 +199,12 @@ static int drm_gem_shmem_get_pages(struct drm_gem_shm= em_object *shmem) } =20 /* - * 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 page= s for a shmem GEM object * @shmem: shmem GEM object * * This function decreases the use count and puts the backing pages when u= se 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 =3D &shmem->base; =20 @@ -226,7 +226,7 @@ void drm_gem_shmem_put_pages(struct drm_gem_shmem_objec= t *shmem) shmem->pages_mark_accessed_on_put); shmem->pages =3D NULL; } -EXPORT_SYMBOL_GPL(drm_gem_shmem_put_pages); +EXPORT_SYMBOL_GPL(drm_gem_shmem_put_pages_locked); =20 static int drm_gem_shmem_pin_locked(struct drm_gem_shmem_object *shmem) { @@ -234,7 +234,7 @@ static int drm_gem_shmem_pin_locked(struct drm_gem_shme= m_object *shmem) =20 dma_resv_assert_held(shmem->base.resv); =20 - ret =3D drm_gem_shmem_get_pages(shmem); + ret =3D drm_gem_shmem_get_pages_locked(shmem); =20 return ret; } @@ -243,7 +243,7 @@ static void drm_gem_shmem_unpin_locked(struct drm_gem_s= hmem_object *shmem) { dma_resv_assert_held(shmem->base.resv); =20 - drm_gem_shmem_put_pages(shmem); + drm_gem_shmem_put_pages_locked(shmem); } =20 /** @@ -293,7 +293,7 @@ void drm_gem_shmem_unpin(struct drm_gem_shmem_object *s= hmem) EXPORT_SYMBOL_GPL(drm_gem_shmem_unpin); =20 /* - * 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 ob= ject * @shmem: shmem GEM object * @map: Returns the kernel virtual address of the SHMEM GEM object's back= ing * store. @@ -302,13 +302,13 @@ EXPORT_SYMBOL_GPL(drm_gem_shmem_unpin); * exists for the buffer backing the shmem GEM object. It hides the differ= ences * 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: * 0 on success or a negative error code on failure. */ -int drm_gem_shmem_vmap(struct drm_gem_shmem_object *shmem, - struct iosys_map *map) +int drm_gem_shmem_vmap_locked(struct drm_gem_shmem_object *shmem, + struct iosys_map *map) { struct drm_gem_object *obj =3D &shmem->base; int ret =3D 0; @@ -331,7 +331,7 @@ int drm_gem_shmem_vmap(struct drm_gem_shmem_object *shm= em, return 0; } =20 - ret =3D drm_gem_shmem_get_pages(shmem); + ret =3D drm_gem_shmem_get_pages_locked(shmem); if (ret) goto err_zero_use; =20 @@ -354,28 +354,28 @@ int drm_gem_shmem_vmap(struct drm_gem_shmem_object *s= hmem, =20 err_put_pages: if (!obj->import_attach) - drm_gem_shmem_put_pages(shmem); + drm_gem_shmem_put_pages_locked(shmem); err_zero_use: shmem->vmap_use_count =3D 0; =20 return ret; } -EXPORT_SYMBOL_GPL(drm_gem_shmem_vmap); +EXPORT_SYMBOL_GPL(drm_gem_shmem_vmap_locked); =20 /* - * 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 o= bject * @shmem: shmem GEM object * @map: Kernel virtual address where the SHMEM GEM object was mapped * * This function cleans up a kernel virtual address mapping acquired by - * drm_gem_shmem_vmap(). The mapping is only removed when the use count dr= ops to - * zero. + * drm_gem_shmem_vmap_locked(). The mapping is only removed when the use c= ount + * drops to zero. * * This function hides the differences between dma-buf imported and native= ly * allocated objects. */ -void drm_gem_shmem_vunmap(struct drm_gem_shmem_object *shmem, - struct iosys_map *map) +void drm_gem_shmem_vunmap_locked(struct drm_gem_shmem_object *shmem, + struct iosys_map *map) { struct drm_gem_object *obj =3D &shmem->base; =20 @@ -391,12 +391,12 @@ void drm_gem_shmem_vunmap(struct drm_gem_shmem_object= *shmem, return; =20 vunmap(shmem->vaddr); - drm_gem_shmem_put_pages(shmem); + drm_gem_shmem_put_pages_locked(shmem); } =20 shmem->vaddr =3D NULL; } -EXPORT_SYMBOL_GPL(drm_gem_shmem_vunmap); +EXPORT_SYMBOL_GPL(drm_gem_shmem_vunmap_locked); =20 static int drm_gem_shmem_create_with_handle(struct drm_file *file_priv, @@ -424,7 +424,7 @@ drm_gem_shmem_create_with_handle(struct drm_file *file_= priv, /* Update madvise status, returns true if not purged, else * 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 m= adv) { dma_resv_assert_held(shmem->base.resv); =20 @@ -435,9 +435,9 @@ int drm_gem_shmem_madvise(struct drm_gem_shmem_object *= shmem, int madv) =20 return (madv >=3D 0); } -EXPORT_SYMBOL_GPL(drm_gem_shmem_madvise); +EXPORT_SYMBOL_GPL(drm_gem_shmem_madvise_locked); =20 -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 =3D &shmem->base; struct drm_device *dev =3D obj->dev; @@ -451,7 +451,7 @@ void drm_gem_shmem_purge(struct drm_gem_shmem_object *s= hmem) kfree(shmem->sgt); shmem->sgt =3D NULL; =20 - drm_gem_shmem_put_pages(shmem); + drm_gem_shmem_put_pages_locked(shmem); =20 shmem->madv =3D -1; =20 @@ -467,7 +467,7 @@ void drm_gem_shmem_purge(struct drm_gem_shmem_object *s= hmem) =20 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); =20 /** * drm_gem_shmem_dumb_create - Create a dumb shmem buffer object @@ -564,7 +564,7 @@ static void drm_gem_shmem_vm_close(struct vm_area_struc= t *vma) struct drm_gem_shmem_object *shmem =3D to_drm_gem_shmem_obj(obj); =20 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); =20 drm_gem_vm_close(vma); @@ -605,7 +605,7 @@ int drm_gem_shmem_mmap(struct drm_gem_shmem_object *shm= em, struct vm_area_struct } =20 dma_resv_lock(shmem->base.resv, NULL); - ret =3D drm_gem_shmem_get_pages(shmem); + ret =3D drm_gem_shmem_get_pages_locked(shmem); dma_resv_unlock(shmem->base.resv); =20 if (ret) @@ -673,7 +673,7 @@ static struct sg_table *drm_gem_shmem_get_pages_sgt_loc= ked(struct drm_gem_shmem_ =20 drm_WARN_ON(obj->dev, obj->import_attach); =20 - ret =3D drm_gem_shmem_get_pages(shmem); + ret =3D drm_gem_shmem_get_pages_locked(shmem); if (ret) return ERR_PTR(ret); =20 @@ -696,7 +696,7 @@ static struct sg_table *drm_gem_shmem_get_pages_sgt_loc= ked(struct drm_gem_shmem_ sg_free_table(sgt); kfree(sgt); err_put_pages: - drm_gem_shmem_put_pages(shmem); + drm_gem_shmem_put_pages_locked(shmem); return ERR_PTR(ret); } =20 diff --git a/drivers/gpu/drm/lima/lima_gem.c b/drivers/gpu/drm/lima/lima_ge= m.c index 28602302c281..7d74c71f5558 100644 --- a/drivers/gpu/drm/lima/lima_gem.c +++ b/drivers/gpu/drm/lima/lima_gem.c @@ -181,7 +181,7 @@ static int lima_gem_pin(struct drm_gem_object *obj) if (bo->heap_size) return -EINVAL; =20 - return drm_gem_shmem_pin(&bo->base); + return drm_gem_shmem_object_pin(obj); } =20 static int lima_gem_vmap(struct drm_gem_object *obj, struct iosys_map *map) @@ -191,7 +191,7 @@ static int lima_gem_vmap(struct drm_gem_object *obj, st= ruct iosys_map *map) if (bo->heap_size) return -EINVAL; =20 - return drm_gem_shmem_vmap(&bo->base, map); + return drm_gem_shmem_object_vmap_locked(obj, map); } =20 static int lima_gem_mmap(struct drm_gem_object *obj, struct vm_area_struct= *vma) @@ -201,7 +201,7 @@ static int lima_gem_mmap(struct drm_gem_object *obj, st= ruct vm_area_struct *vma) if (bo->heap_size) return -EINVAL; =20 - return drm_gem_shmem_mmap(&bo->base, vma); + return drm_gem_shmem_object_mmap(obj, vma); } =20 static const struct drm_gem_object_funcs lima_gem_funcs =3D { @@ -213,7 +213,7 @@ static const struct drm_gem_object_funcs lima_gem_funcs= =3D { .unpin =3D drm_gem_shmem_object_unpin, .get_sg_table =3D drm_gem_shmem_object_get_sg_table, .vmap =3D lima_gem_vmap, - .vunmap =3D drm_gem_shmem_object_vunmap, + .vunmap =3D drm_gem_shmem_object_vunmap_locked, .mmap =3D lima_gem_mmap, .vm_ops =3D &drm_gem_shmem_vm_ops, }; diff --git a/drivers/gpu/drm/panfrost/panfrost_drv.c b/drivers/gpu/drm/panf= rost/panfrost_drv.c index a2ab99698ca8..175443eacead 100644 --- a/drivers/gpu/drm/panfrost/panfrost_drv.c +++ b/drivers/gpu/drm/panfrost/panfrost_drv.c @@ -436,7 +436,7 @@ static int panfrost_ioctl_madvise(struct drm_device *de= v, void *data, } } =20 - args->retained =3D drm_gem_shmem_madvise(&bo->base, args->madv); + args->retained =3D drm_gem_shmem_madvise_locked(&bo->base, args->madv); =20 if (args->retained) { if (args->madv =3D=3D PANFROST_MADV_DONTNEED) diff --git a/drivers/gpu/drm/panfrost/panfrost_gem.c b/drivers/gpu/drm/panf= rost/panfrost_gem.c index 3c812fbd126f..59c8c73c6a59 100644 --- a/drivers/gpu/drm/panfrost/panfrost_gem.c +++ b/drivers/gpu/drm/panfrost/panfrost_gem.c @@ -192,7 +192,7 @@ static int panfrost_gem_pin(struct drm_gem_object *obj) if (bo->is_heap) return -EINVAL; =20 - return drm_gem_shmem_pin(&bo->base); + return drm_gem_shmem_object_pin(obj); } =20 static const struct drm_gem_object_funcs panfrost_gem_funcs =3D { @@ -203,8 +203,8 @@ static const struct drm_gem_object_funcs panfrost_gem_f= uncs =3D { .pin =3D panfrost_gem_pin, .unpin =3D drm_gem_shmem_object_unpin, .get_sg_table =3D drm_gem_shmem_object_get_sg_table, - .vmap =3D drm_gem_shmem_object_vmap, - .vunmap =3D drm_gem_shmem_object_vunmap, + .vmap =3D drm_gem_shmem_object_vmap_locked, + .vunmap =3D drm_gem_shmem_object_vunmap_locked, .mmap =3D drm_gem_shmem_object_mmap, .vm_ops =3D &drm_gem_shmem_vm_ops, }; diff --git a/drivers/gpu/drm/panfrost/panfrost_gem_shrinker.c b/drivers/gpu= /drm/panfrost/panfrost_gem_shrinker.c index 6a71a2555f85..72193bd734e1 100644 --- a/drivers/gpu/drm/panfrost/panfrost_gem_shrinker.c +++ b/drivers/gpu/drm/panfrost/panfrost_gem_shrinker.c @@ -52,7 +52,7 @@ static bool panfrost_gem_purge(struct drm_gem_object *obj) goto unlock_mappings; =20 panfrost_gem_teardown_mappings_locked(bo); - drm_gem_shmem_purge(&bo->base); + drm_gem_shmem_purge_locked(&bo->base); ret =3D true; =20 dma_resv_unlock(shmem->base.resv); diff --git a/drivers/gpu/drm/panfrost/panfrost_mmu.c b/drivers/gpu/drm/panf= rost/panfrost_mmu.c index c0123d09f699..7771769f0ce0 100644 --- a/drivers/gpu/drm/panfrost/panfrost_mmu.c +++ b/drivers/gpu/drm/panfrost/panfrost_mmu.c @@ -535,7 +535,7 @@ static int panfrost_mmu_map_fault_addr(struct panfrost_= device *pfdev, int as, err_map: sg_free_table(sgt); err_pages: - drm_gem_shmem_put_pages(&bo->base); + drm_gem_shmem_put_pages_locked(&bo->base); err_unlock: dma_resv_unlock(obj->resv); err_bo: diff --git a/drivers/gpu/drm/v3d/v3d_bo.c b/drivers/gpu/drm/v3d/v3d_bo.c index 70c1095d6eec..6a0e7b6177d5 100644 --- a/drivers/gpu/drm/v3d/v3d_bo.c +++ b/drivers/gpu/drm/v3d/v3d_bo.c @@ -58,8 +58,8 @@ static const struct drm_gem_object_funcs v3d_gem_funcs = =3D { .pin =3D drm_gem_shmem_object_pin, .unpin =3D drm_gem_shmem_object_unpin, .get_sg_table =3D drm_gem_shmem_object_get_sg_table, - .vmap =3D drm_gem_shmem_object_vmap, - .vunmap =3D drm_gem_shmem_object_vunmap, + .vmap =3D drm_gem_shmem_object_vmap_locked, + .vunmap =3D drm_gem_shmem_object_vunmap_locked, .mmap =3D drm_gem_shmem_object_mmap, .vm_ops =3D &drm_gem_shmem_vm_ops, }; diff --git a/drivers/gpu/drm/virtio/virtgpu_object.c b/drivers/gpu/drm/virt= io/virtgpu_object.c index 343b13428125..97020ed56b81 100644 --- a/drivers/gpu/drm/virtio/virtgpu_object.c +++ b/drivers/gpu/drm/virtio/virtgpu_object.c @@ -106,8 +106,8 @@ static const struct drm_gem_object_funcs virtio_gpu_shm= em_funcs =3D { .pin =3D drm_gem_shmem_object_pin, .unpin =3D drm_gem_shmem_object_unpin, .get_sg_table =3D drm_gem_shmem_object_get_sg_table, - .vmap =3D drm_gem_shmem_object_vmap, - .vunmap =3D drm_gem_shmem_object_vunmap, + .vmap =3D drm_gem_shmem_object_vmap_locked, + .vunmap =3D drm_gem_shmem_object_vunmap_locked, .mmap =3D drm_gem_shmem_object_mmap, .vm_ops =3D &drm_gem_shmem_vm_ops, }; diff --git a/include/drm/drm_gem_shmem_helper.h b/include/drm/drm_gem_shmem= _helper.h index f87124629bb5..ec2d8b24e3cf 100644 --- a/include/drm/drm_gem_shmem_helper.h +++ b/include/drm/drm_gem_shmem_helper.h @@ -113,16 +113,16 @@ struct drm_gem_shmem_object { struct drm_gem_shmem_object *drm_gem_shmem_create(struct drm_device *dev, = size_t size); void drm_gem_shmem_free(struct drm_gem_shmem_object *shmem); =20 -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); void drm_gem_shmem_unpin(struct drm_gem_shmem_object *shmem); -int drm_gem_shmem_vmap(struct drm_gem_shmem_object *shmem, - struct iosys_map *map); -void drm_gem_shmem_vunmap(struct drm_gem_shmem_object *shmem, - struct iosys_map *map); +int drm_gem_shmem_vmap_locked(struct drm_gem_shmem_object *shmem, + struct iosys_map *map); +void drm_gem_shmem_vunmap_locked(struct drm_gem_shmem_object *shmem, + struct iosys_map *map); int drm_gem_shmem_mmap(struct drm_gem_shmem_object *shmem, struct vm_area_= struct *vma); =20 -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 m= adv); =20 static inline bool drm_gem_shmem_is_purgeable(struct drm_gem_shmem_object = *shmem) { @@ -131,7 +131,7 @@ static inline bool drm_gem_shmem_is_purgeable(struct dr= m_gem_shmem_object *shmem !shmem->base.dma_buf && !shmem->base.import_attach; } =20 -void drm_gem_shmem_purge(struct drm_gem_shmem_object *shmem); +void drm_gem_shmem_purge_locked(struct drm_gem_shmem_object *shmem); =20 struct sg_table *drm_gem_shmem_get_sg_table(struct drm_gem_shmem_object *s= hmem); struct sg_table *drm_gem_shmem_get_pages_sgt(struct drm_gem_shmem_object *= shmem); @@ -222,22 +222,22 @@ static inline struct sg_table *drm_gem_shmem_object_g= et_sg_table(struct drm_gem_ } =20 /* - * drm_gem_shmem_object_vmap - GEM object function for drm_gem_shmem_vmap() + * drm_gem_shmem_object_vmap_locked - GEM object function for drm_gem_shme= m_vmap_locked() * @obj: GEM object * @map: Returns the kernel virtual address of the SHMEM GEM object's back= ing store. * - * This function wraps drm_gem_shmem_vmap(). Drivers that employ the shmem= helpers should - * use it as their &drm_gem_object_funcs.vmap handler. + * This function wraps drm_gem_shmem_vmap_locked(). Drivers that employ th= e shmem + * helpers should use it as their &drm_gem_object_funcs.vmap handler. * * Returns: * 0 on success or a negative error code on failure. */ -static inline int drm_gem_shmem_object_vmap(struct drm_gem_object *obj, - struct iosys_map *map) +static inline int drm_gem_shmem_object_vmap_locked(struct drm_gem_object *= obj, + struct iosys_map *map) { struct drm_gem_shmem_object *shmem =3D to_drm_gem_shmem_obj(obj); =20 - return drm_gem_shmem_vmap(shmem, map); + return drm_gem_shmem_vmap_locked(shmem, map); } =20 /* @@ -245,15 +245,15 @@ static inline int drm_gem_shmem_object_vmap(struct dr= m_gem_object *obj, * @obj: GEM object * @map: Kernel virtual address where the SHMEM GEM object was mapped * - * This function wraps drm_gem_shmem_vunmap(). Drivers that employ the shm= em helpers should - * use it as their &drm_gem_object_funcs.vunmap handler. + * This function wraps drm_gem_shmem_vunmap_locked(). Drivers that employ = the shmem + * 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, - struct iosys_map *map) +static inline void drm_gem_shmem_object_vunmap_locked(struct drm_gem_objec= t *obj, + struct iosys_map *map) { struct drm_gem_shmem_object *shmem =3D to_drm_gem_shmem_obj(obj); =20 - drm_gem_shmem_vunmap(shmem, map); + drm_gem_shmem_vunmap_locked(shmem, map); } =20 /** --=20 2.41.0