diff options
| author | Dave Airlie <airlied@redhat.com> | 2024-05-31 10:08:52 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2024-05-31 11:51:20 +1000 |
| commit | a2ce3f7752bfbb47e659574fc2e1e6942bca3c29 (patch) | |
| tree | f816b99784348e731003be5f95fcfdff51cb8f50 /drivers/gpu/drm/lima/lima_gem.c | |
| parent | bb61cf46b66a875bc30b930f7ccf93fa8c8a1797 (diff) | |
| parent | bb195358806847217efba98de62b7decec3b371f (diff) | |
Merge tag 'drm-misc-fixes-2024-05-30' of https://gitlab.freedesktop.org/drm/misc/kernel into drm-fixes
Short summary of fixes pull:
dma-buf:
- sw-sync: Don't interfere with IRQ handling
- Fix kthreads-handling error path
gem-shmem:
- Warn when trying to pin imported objects
lima:
- Fix dma_resv-related deadlock in object pin
msm:
- Remove build-time dependency on Python 3.9
nouveau:
- nvif: Fix possible integer overflow
panel:
- lg-sw43408: Select DP helpers; Declare backlight ops as static
- sitronix-st7789v: Various fixes for jt240mhqs_hwt_ek_e3 panel
panfrost:
- Fix dma_resv-related deadlock in object pin
Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Thomas Zimmermann <tzimmermann@suse.de>
Link: https://patchwork.freedesktop.org/patch/msgid/20240530192307.GA14809@localhost.localdomain
Diffstat (limited to 'drivers/gpu/drm/lima/lima_gem.c')
| -rw-r--r-- | drivers/gpu/drm/lima/lima_gem.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/lima/lima_gem.c b/drivers/gpu/drm/lima/lima_gem.c index 7ea244d876ca..9bb997dbb4b9 100644 --- a/drivers/gpu/drm/lima/lima_gem.c +++ b/drivers/gpu/drm/lima/lima_gem.c @@ -185,7 +185,7 @@ static int lima_gem_pin(struct drm_gem_object *obj) if (bo->heap_size) return -EINVAL; - return drm_gem_shmem_pin(&bo->base); + return drm_gem_shmem_pin_locked(&bo->base); } static int lima_gem_vmap(struct drm_gem_object *obj, struct iosys_map *map) |