Skip to content

Commit 835b14c

Browse files
bbrezillondigetx
authored andcommitted
accel/ivpu: s/drm_gem_shmem_v[un]map/drm_gem_shmem_v[un]map_locked/
Commit 954907f ("drm/shmem-helper: Refactor locked/unlocked functions") suffixed drm_gem_shmem_v[un]map with _locked to reflect the fact these functions must be called with the GEM resv lock held, but accel drivers were left behind. Fixes: 954907f ("drm/shmem-helper: Refactor locked/unlocked functions") Signed-off-by: Boris Brezillon <boris.brezillon@collabora.com> Cc: Dmitry Osipenko <dmitry.osipenko@collabora.com> Cc: Jacek Lawrynowicz <jacek.lawrynowicz@linux.intel.com> Cc: Maciej Falkowski <maciej.falkowski@linux.intel.com> Cc: Oded Gabbay <ogabbay@kernel.org> Cc: dri-devel@lists.freedesktop.org Reviewed-by: Dmitry Osipenko <dmitry.osipenko@collabora.com> Tested-by: Jani Nikula <jani.nikula@intel.com> Signed-off-by: Dmitry Osipenko <dmitry.osipenko@collabora.com> Link: https://patchwork.freedesktop.org/patch/msgid/20250327104300.1982058-2-boris.brezillon@collabora.com
1 parent d5d0daf commit 835b14c

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

drivers/accel/ivpu/ivpu_gem.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -362,7 +362,7 @@ ivpu_bo_create(struct ivpu_device *vdev, struct ivpu_mmu_context *ctx,
362362

363363
if (flags & DRM_IVPU_BO_MAPPABLE) {
364364
dma_resv_lock(bo->base.base.resv, NULL);
365-
ret = drm_gem_shmem_vmap(&bo->base, &map);
365+
ret = drm_gem_shmem_vmap_locked(&bo->base, &map);
366366
dma_resv_unlock(bo->base.base.resv);
367367

368368
if (ret)
@@ -387,7 +387,7 @@ void ivpu_bo_free(struct ivpu_bo *bo)
387387

388388
if (bo->flags & DRM_IVPU_BO_MAPPABLE) {
389389
dma_resv_lock(bo->base.base.resv, NULL);
390-
drm_gem_shmem_vunmap(&bo->base, &map);
390+
drm_gem_shmem_vunmap_locked(&bo->base, &map);
391391
dma_resv_unlock(bo->base.base.resv);
392392
}
393393

0 commit comments

Comments
 (0)