Commit 13daf536 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'drm-misc-next-fixes-2023-02-21' of... 

Merge tag 'drm-misc-next-fixes-2023-02-21' of git://anongit.freedesktop.org/drm/drm-misc

 into drm-next

Short summary of fixes pull:

Fixes GEM SHMEM locking and generic fbdev hotplugging. Constifies
dma_buf kobj type.

Signed-off-by: default avatarDave Airlie <airlied@redhat.com>

From: Thomas Zimmermann <tzimmermann@suse.de>
Link: https://patchwork.freedesktop.org/patch/msgid/Y/S6tu3gdQ0VizR+@linux-uq9g
parents 5582f3c1 3fb1f62f

drivers/dma-buf/dma-buf-sysfs-stats.c

+1 −1
Original line number Diff line number Diff line
@@ -112,7 +112,7 @@ static void dma_buf_sysfs_release(struct kobject *kobj) 
	kfree(sysfs_entry);

}



static struct kobj_type dma_buf_ktype = {

static const struct kobj_type dma_buf_ktype = {

	.sysfs_ops = &dma_buf_stats_sysfs_ops,

	.release = dma_buf_sysfs_release,

	.default_groups = dma_buf_stats_default_groups,

drivers/gpu/drm/armada/armada_fbdev.c

+3 −0
Original line number Diff line number Diff line
@@ -147,6 +147,7 @@ int armada_fbdev_init(struct drm_device *dev) 
 err_fb_setup:

	drm_fb_helper_fini(fbh);

 err_fb_helper:

	drm_fb_helper_unprepare(fbh);

	priv->fbdev = NULL;

	return ret;

}
@@ -164,6 +165,8 @@ void armada_fbdev_fini(struct drm_device *dev) 
		if (fbh->fb)

			fbh->fb->funcs->destroy(fbh->fb);



		drm_fb_helper_unprepare(fbh);



		priv->fbdev = NULL;

	}

}

drivers/gpu/drm/drm_fb_helper.c

+0 −2
Original line number Diff line number Diff line
@@ -590,8 +590,6 @@ void drm_fb_helper_fini(struct drm_fb_helper *fb_helper) 
	}

	mutex_unlock(&kernel_fb_helper_lock);



	drm_fb_helper_unprepare(fb_helper);



	if (!fb_helper->client.funcs)

		drm_client_release(&fb_helper->client);

}

drivers/gpu/drm/drm_fbdev_generic.c

+2 −0
Original line number Diff line number Diff line
@@ -65,6 +65,8 @@ static void drm_fbdev_fb_destroy(struct fb_info *info) 


	drm_client_framebuffer_delete(fb_helper->buffer);

	drm_client_release(&fb_helper->client);



	drm_fb_helper_unprepare(fb_helper);

	kfree(fb_helper);

}

drivers/gpu/drm/drm_gem_shmem_helper.c

+34 −20
Original line number Diff line number Diff line
@@ -678,23 +678,7 @@ struct sg_table *drm_gem_shmem_get_sg_table(struct drm_gem_shmem_object *shmem) 
}

EXPORT_SYMBOL_GPL(drm_gem_shmem_get_sg_table);



/**

 * drm_gem_shmem_get_pages_sgt - Pin pages, dma map them, and return a

 *				 scatter/gather table for a shmem GEM object.

 * @shmem: shmem GEM object

 *

 * This function returns a scatter/gather table suitable for driver usage. If

 * the sg table doesn't exist, the pages are pinned, dma-mapped, and a sg

 * table created.

 *

 * This is the main function for drivers to get at backing storage, and it hides

 * and difference between dma-buf imported and natively allocated objects.

 * drm_gem_shmem_get_sg_table() should not be directly called by drivers.

 *

 * Returns:

 * A pointer to the scatter/gather table of pinned pages or errno on failure.

 */

struct sg_table *drm_gem_shmem_get_pages_sgt(struct drm_gem_shmem_object *shmem)

static struct sg_table *drm_gem_shmem_get_pages_sgt_locked(struct drm_gem_shmem_object *shmem)

{

	struct drm_gem_object *obj = &shmem->base;

	int ret;
@@ -705,7 +689,7 @@ struct sg_table *drm_gem_shmem_get_pages_sgt(struct drm_gem_shmem_object *shmem) 


	WARN_ON(obj->import_attach);



	ret = drm_gem_shmem_get_pages(shmem);

	ret = drm_gem_shmem_get_pages_locked(shmem);

	if (ret)

		return ERR_PTR(ret);
@@ -727,10 +711,40 @@ struct sg_table *drm_gem_shmem_get_pages_sgt(struct drm_gem_shmem_object *shmem) 
	sg_free_table(sgt);

	kfree(sgt);

err_put_pages:

	drm_gem_shmem_put_pages(shmem);

	drm_gem_shmem_put_pages_locked(shmem);

	return ERR_PTR(ret);

}



/**

 * drm_gem_shmem_get_pages_sgt - Pin pages, dma map them, and return a

 *				 scatter/gather table for a shmem GEM object.

 * @shmem: shmem GEM object

 *

 * This function returns a scatter/gather table suitable for driver usage. If

 * the sg table doesn't exist, the pages are pinned, dma-mapped, and a sg

 * table created.

 *

 * This is the main function for drivers to get at backing storage, and it hides

 * and difference between dma-buf imported and natively allocated objects.

 * drm_gem_shmem_get_sg_table() should not be directly called by drivers.

 *

 * Returns:

 * A pointer to the scatter/gather table of pinned pages or errno on failure.

 */

struct sg_table *drm_gem_shmem_get_pages_sgt(struct drm_gem_shmem_object *shmem)

{

	int ret;

	struct sg_table *sgt;



	ret = mutex_lock_interruptible(&shmem->pages_lock);

	if (ret)

		return ERR_PTR(ret);

	sgt = drm_gem_shmem_get_pages_sgt_locked(shmem);

	mutex_unlock(&shmem->pages_lock);



	return sgt;

}

EXPORT_SYMBOL_GPL(drm_gem_shmem_get_pages_sgt);

EXPORT_SYMBOL(drm_gem_shmem_get_pages_sgt);



/**

 * drm_gem_shmem_prime_import_sg_table - Produce a shmem GEM object from