diff options
| author | Dave Airlie <airlied@redhat.com> | 2021-11-12 13:06:37 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2021-11-12 13:06:41 +1000 |
| commit | b6c24725249a6c1a889665d720cdff088f686f98 (patch) | |
| tree | 68865fe0a2e4b93cf75aa51a45b466873bba3a81 /drivers/dma-buf | |
| parent | 447212bb4f8ebd7d95dd6e160cd82c69c9a23c4c (diff) | |
| parent | 7120a447c7fe37a123ab7a63afefdbf0787b9002 (diff) | |
Merge tag 'drm-misc-fixes-2021-11-11' of git://anongit.freedesktop.org/drm/drm-misc into drm-next
* dma-buf: name_lock fixes
* prime: Keep object ref during mmap
* nouveau: Fix a refcount issue; Fix device removal; Protect client
list with dedicated mutex; Fix address CE0 address calculation
* ttm: Fix race condition during BO eviction
Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Thomas Zimmermann <tzimmermann@suse.de>
Link: https://patchwork.freedesktop.org/patch/msgid/YYzY6jeox9EeI15i@linux-uq9g.fritz.box
Diffstat (limited to 'drivers/dma-buf')
| -rw-r--r-- | drivers/dma-buf/dma-buf.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/dma-buf/dma-buf.c b/drivers/dma-buf/dma-buf.c index 35fe1cb5ad98..cc8f09bfa1a3 100644 --- a/drivers/dma-buf/dma-buf.c +++ b/drivers/dma-buf/dma-buf.c @@ -1359,6 +1359,8 @@ static int dma_buf_debug_show(struct seq_file *s, void *unused) if (ret) goto error_unlock; + + spin_lock(&buf_obj->name_lock); seq_printf(s, "%08zu\t%08x\t%08x\t%08ld\t%s\t%08lu\t%s\n", buf_obj->size, buf_obj->file->f_flags, buf_obj->file->f_mode, @@ -1366,6 +1368,7 @@ static int dma_buf_debug_show(struct seq_file *s, void *unused) buf_obj->exp_name, file_inode(buf_obj->file)->i_ino, buf_obj->name ?: ""); + spin_unlock(&buf_obj->name_lock); dma_resv_for_each_fence(&cursor, buf_obj->resv, true, fence) { seq_printf(s, "\t%s fence: %s %s %ssignalled\n", |