Commit 89e7ffd3 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'drm-misc-fixes-2021-07-28' of git://anongit.freedesktop.org/drm/drm-misc into drm-fixes 



Short summary of fixes pull:

 * panel: Fix bpc for ytc700tlag_05_201c
 * ttm: debugfs init fixes

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

From: Thomas Zimmermann <tzimmermann@suse.de>
Link: https://patchwork.freedesktop.org/patch/msgid/YQFTESngqkeqzlhN@linux-uq9g.fritz.box
parents 792ca7e3 8ee18e76

drivers/gpu/drm/panel/panel-simple.c

+1 −1
Original line number Diff line number Diff line
@@ -4166,7 +4166,7 @@ static const struct drm_display_mode yes_optoelectronics_ytc700tlag_05_201c_mode 
static const struct panel_desc yes_optoelectronics_ytc700tlag_05_201c = {

	.modes = &yes_optoelectronics_ytc700tlag_05_201c_mode,

	.num_modes = 1,

	.bpc = 6,

	.bpc = 8,

	.size = {

		.width = 154,

		.height = 90,

drivers/gpu/drm/ttm/ttm_device.c

+12 −0
Original line number Diff line number Diff line
@@ -44,6 +44,8 @@ static unsigned ttm_glob_use_count; 
struct ttm_global ttm_glob;

EXPORT_SYMBOL(ttm_glob);



struct dentry *ttm_debugfs_root;



static void ttm_global_release(void)

{

	struct ttm_global *glob = &ttm_glob;
@@ -53,6 +55,7 @@ static void ttm_global_release(void) 
		goto out;



	ttm_pool_mgr_fini();

	debugfs_remove(ttm_debugfs_root);



	__free_page(glob->dummy_read_page);

	memset(glob, 0, sizeof(*glob));
@@ -73,6 +76,13 @@ static int ttm_global_init(void) 


	si_meminfo(&si);



	ttm_debugfs_root = debugfs_create_dir("ttm", NULL);

	if (IS_ERR(ttm_debugfs_root)) {

		ret = PTR_ERR(ttm_debugfs_root);

		ttm_debugfs_root = NULL;

		goto out;

	}



	/* Limit the number of pages in the pool to about 50% of the total

	 * system memory.

	 */
@@ -100,6 +110,8 @@ static int ttm_global_init(void) 
	debugfs_create_atomic_t("buffer_objects", 0444, ttm_debugfs_root,

				&glob->bo_count);

out:

	if (ret && ttm_debugfs_root)

		debugfs_remove(ttm_debugfs_root);

	if (ret)

		--ttm_glob_use_count;

	mutex_unlock(&ttm_global_mutex);

drivers/gpu/drm/ttm/ttm_module.c

+0 −16
Original line number Diff line number Diff line
@@ -72,22 +72,6 @@ pgprot_t ttm_prot_from_caching(enum ttm_caching caching, pgprot_t tmp) 
	return tmp;

}



struct dentry *ttm_debugfs_root;



static int __init ttm_init(void)

{

	ttm_debugfs_root = debugfs_create_dir("ttm", NULL);

	return 0;

}



static void __exit ttm_exit(void)

{

	debugfs_remove(ttm_debugfs_root);

}



module_init(ttm_init);

module_exit(ttm_exit);



MODULE_AUTHOR("Thomas Hellstrom, Jerome Glisse");

MODULE_DESCRIPTION("TTM memory manager subsystem (for DRM device)");

MODULE_LICENSE("GPL and additional rights");