diff options
| author | Dave Airlie <airlied@redhat.com> | 2020-07-16 10:09:55 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2020-07-16 10:09:59 +1000 |
| commit | 03d54ef0a1d5e5115744cb7dc7058e9852228114 (patch) | |
| tree | 440db326e4b3d73b3f8fe5bcfe605eb54039cb41 /include | |
| parent | 8257a0d91310a71e4fa04b9aef8f2c4173ec9fb5 (diff) | |
| parent | 6348dd291e3653534a9e28e6917569bc9967b35b (diff) | |
Merge tag 'drm-misc-fixes-2020-07-15' of git://anongit.freedesktop.org/drm/drm-misc into drm-fixes
* aspeed: setup fbdev console after registering device; avoids warning
and stacktrace in dmesg log
* dmabuf: protect dmabuf->name with a spinlock; avoids sleeping in
atomic context
Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Thomas Zimmermann <tzimmermann@suse.de>
Link: https://patchwork.freedesktop.org/patch/msgid/20200715171756.GA18606@linux-uq9g
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/dma-buf.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/dma-buf.h b/include/linux/dma-buf.h index ab0c156abee6..a2ca294eaebe 100644 --- a/include/linux/dma-buf.h +++ b/include/linux/dma-buf.h @@ -311,6 +311,7 @@ struct dma_buf { void *vmap_ptr; const char *exp_name; const char *name; + spinlock_t name_lock; /* spinlock to protect name access */ struct module *owner; struct list_head list_node; void *priv; |