Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

drm/gem-shmem: Add import attachment warning to locked pin function

Commit ec144244a43f ("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: a78027847226 ("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

authored by

Adrián Larumbe and committed by
Boris Brezillon
3b8407e8 8c2f5dd0

+2
+2
drivers/gpu/drm/drm_gem_shmem_helper.c
··· 233 233 234 234 dma_resv_assert_held(shmem->base.resv); 235 235 236 + drm_WARN_ON(shmem->base.dev, shmem->base.import_attach); 237 + 236 238 ret = drm_gem_shmem_get_pages(shmem); 237 239 238 240 return ret;