drm/lima: Fix dma_resv deadlock at drm object pin time
authorAdrián Larumbe <adrian.larumbe@collabora.com>
Thu, 23 May 2024 11:32:18 +0000 (12:32 +0100)
committerBoris Brezillon <boris.brezillon@collabora.com>
Wed, 29 May 2024 07:30:39 +0000 (09:30 +0200)
commit8c2f5dd0c362ec036f0217da1d413ce2b8361080
treec9e3fd54db7520d4b62630b344968b5267b1bd20
parente57f2187ccc125f1f14f6d2c83da80831fc3ce9a
drm/lima: Fix dma_resv deadlock at drm object pin time

Commit a78027847226 ("drm/gem: Acquire reservation lock in
drm_gem_{pin/unpin}()") moved locking the DRM object's dma reservation to
drm_gem_pin(), but Lima's pin callback kept calling drm_gem_shmem_pin,
which also tries to lock the same dma_resv, leading to a double lock
situation.

As was already done for Panfrost in the previous commit, fix it by
replacing drm_gem_shmem_pin() with its locked variant.

Cc: Thomas Zimmermann <tzimmermann@suse.de>
Cc: Dmitry Osipenko <dmitry.osipenko@collabora.com>
Cc: Boris Brezillon <boris.brezillon@collabora.com>
Cc: Steven Price <steven.price@arm.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>
Tested-by: Val Packett <val@packett.cool>
Signed-off-by: Boris Brezillon <boris.brezillon@collabora.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20240523113236.432585-3-adrian.larumbe@collabora.com
drivers/gpu/drm/lima/lima_gem.c