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/dma-buf/sync_debug.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/dma-buf/sync_debug.c')
| -rw-r--r-- | drivers/dma-buf/sync_debug.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/dma-buf/sync_debug.c b/drivers/dma-buf/sync_debug.c index 101394f16930..237bce21d1e7 100644 --- a/drivers/dma-buf/sync_debug.c +++ b/drivers/dma-buf/sync_debug.c @@ -110,12 +110,12 @@ static void sync_print_obj(struct seq_file *s, struct sync_timeline *obj) seq_printf(s, "%s: %d\n", obj->name, obj->value); - spin_lock_irq(&obj->lock); + spin_lock(&obj->lock); /* Caller already disabled IRQ. */ list_for_each(pos, &obj->pt_list) { struct sync_pt *pt = container_of(pos, struct sync_pt, link); sync_print_fence(s, &pt->base, false); } - spin_unlock_irq(&obj->lock); + spin_unlock(&obj->lock); } static void sync_print_sync_file(struct seq_file *s, |