Skip to content
This repository was archived by the owner on Nov 8, 2023. It is now read-only.

Commit 3b8407e

Browse files
larunbebbrezillon
authored andcommitted
drm/gem-shmem: Add import attachment warning to locked pin function
Commit ec14424 ("drm/gem-shmem: Acquire reservation lock in GEM pin/unpin callbacks") moved locking DRM object's dma reservation to drm_gem_shmem_object_pin, and made drm_gem_shmem_pin_locked public, so we need to make sure the not-imported check warning is also added to the latter. Cc: Thomas Zimmermann <tzimmermann@suse.de> Cc: Dmitry Osipenko <dmitry.osipenko@collabora.com> Cc: Boris Brezillon <boris.brezillon@collabora.com> Fixes: a780278 ("drm/gem: Acquire reservation lock in drm_gem_{pin/unpin}()") Signed-off-by: Adrián Larumbe <adrian.larumbe@collabora.com> Reviewed-by: Boris Brezillon <boris.brezillon@collabora.com> Signed-off-by: Boris Brezillon <boris.brezillon@collabora.com> Link: https://patchwork.freedesktop.org/patch/msgid/20240523113236.432585-4-adrian.larumbe@collabora.com
1 parent 8c2f5dd commit 3b8407e

File tree

1 file changed

+2
-0
lines changed

1 file changed

+2
-0
lines changed

drivers/gpu/drm/drm_gem_shmem_helper.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -233,6 +233,8 @@ int drm_gem_shmem_pin_locked(struct drm_gem_shmem_object *shmem)
233233

234234
dma_resv_assert_held(shmem->base.resv);
235235

236+
drm_WARN_ON(shmem->base.dev, shmem->base.import_attach);
237+
236238
ret = drm_gem_shmem_get_pages(shmem);
237239

238240
return ret;

0 commit comments

Comments
 (0)