Commit 03d54ef0 authored by Dave Airlie's avatar Dave Airlie
Browse files

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: default avatarDave Airlie <airlied@redhat.com>

From: Thomas Zimmermann <tzimmermann@suse.de>
Link: https://patchwork.freedesktop.org/patch/msgid/20200715171756.GA18606@linux-uq9g
parents 8257a0d9 6348dd29

drivers/dma-buf/dma-buf.c

+7 −4
Original line number Diff line number Diff line
@@ -45,10 +45,10 @@ static char *dmabuffs_dname(struct dentry *dentry, char *buffer, int buflen) 
	size_t ret = 0;



	dmabuf = dentry->d_fsdata;

	dma_resv_lock(dmabuf->resv, NULL);

	spin_lock(&dmabuf->name_lock);

	if (dmabuf->name)

		ret = strlcpy(name, dmabuf->name, DMA_BUF_NAME_LEN);

	dma_resv_unlock(dmabuf->resv);

	spin_unlock(&dmabuf->name_lock);



	return dynamic_dname(dentry, buffer, buflen, "/%s:%s",

			     dentry->d_name.name, ret > 0 ? name : "");
@@ -338,8 +338,10 @@ static long dma_buf_set_name(struct dma_buf *dmabuf, const char __user *buf) 
		kfree(name);

		goto out_unlock;

	}

	spin_lock(&dmabuf->name_lock);

	kfree(dmabuf->name);

	dmabuf->name = name;

	spin_unlock(&dmabuf->name_lock);



out_unlock:

	dma_resv_unlock(dmabuf->resv);
@@ -402,10 +404,10 @@ static void dma_buf_show_fdinfo(struct seq_file *m, struct file *file) 
	/* Don't count the temporary reference taken inside procfs seq_show */

	seq_printf(m, "count:\t%ld\n", file_count(dmabuf->file) - 1);

	seq_printf(m, "exp_name:\t%s\n", dmabuf->exp_name);

	dma_resv_lock(dmabuf->resv, NULL);

	spin_lock(&dmabuf->name_lock);

	if (dmabuf->name)

		seq_printf(m, "name:\t%s\n", dmabuf->name);

	dma_resv_unlock(dmabuf->resv);

	spin_unlock(&dmabuf->name_lock);

}



static const struct file_operations dma_buf_fops = {
@@ -542,6 +544,7 @@ struct dma_buf *dma_buf_export(const struct dma_buf_export_info *exp_info) 
	dmabuf->size = exp_info->size;

	dmabuf->exp_name = exp_info->exp_name;

	dmabuf->owner = exp_info->owner;

	spin_lock_init(&dmabuf->name_lock);

	init_waitqueue_head(&dmabuf->poll);

	dmabuf->cb_excl.poll = dmabuf->cb_shared.poll = &dmabuf->poll;

	dmabuf->cb_excl.active = dmabuf->cb_shared.active = 0;

drivers/gpu/drm/aspeed/aspeed_gfx_drv.c

+1 −2
Original line number Diff line number Diff line
@@ -173,8 +173,6 @@ static int aspeed_gfx_load(struct drm_device *drm) 


	drm_mode_config_reset(drm);



	drm_fbdev_generic_setup(drm, 32);



	return 0;

}
@@ -225,6 +223,7 @@ static int aspeed_gfx_probe(struct platform_device *pdev) 
	if (ret)

		goto err_unload;



	drm_fbdev_generic_setup(&priv->drm, 32);

	return 0;



err_unload:

include/linux/dma-buf.h

+1 −0
Original line number Diff line number Diff line
@@ -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;