Commit f422fa7c authored by Daniel Vetter's avatar Daniel Vetter
Browse files

Merge tag 'drm-misc-next-2022-11-24' of git://anongit.freedesktop.org/drm/drm-misc into drm-next 



drm-misc-next for 6.2:

Cross-subsystem Changes:
- fbdev: Make fb_modesetting_disabled() static
- udmabuf: Add vmap and vunmap methods to udmabuf_ops

Core Changes:
- doc: make drm-uapi igt-tests more readable
- fb-helper: Revert of the damage worker removal
- fourcc: Add missing big-endian XRGB1555 and RGB565 formats
- gem-shmem: Fix for resource leakage in __drm_gem_shmem_create()
- scheduler: Fix lockup in drm_sched_entity_kill()

Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
From: Maxime Ripard <maxime@cerno.tech>
Link: https://patchwork.freedesktop.org/patch/msgid/20221124074615.ahflw5q5ktfdsr7k@houat
parents 88603b6d 6fb6c979

Documentation/gpu/drm-uapi.rst

+6 −6
Original line number Diff line number Diff line
@@ -402,19 +402,19 @@ It's possible to run the IGT-tests in a VM in two ways: 
	1. Use IGT inside a VM

	2. Use IGT from the host machine and write the results in a shared directory.



As follow, there is an example of using a VM with a shared directory with

the host machine to run igt-tests. As an example it's used virtme::

Following is an example of using a VM with a shared directory with

the host machine to run igt-tests. This example uses virtme::



	$ virtme-run --rwdir /path/for/shared_dir --kdir=path/for/kernel/directory --mods=auto



Run the igt-tests in the guest machine, as example it's ran the 'kms_flip'

Run the igt-tests in the guest machine. This example runs the 'kms_flip'

tests::



	$ /path/for/igt-gpu-tools/scripts/run-tests.sh -p -s -t "kms_flip.*" -v



In this example, instead of build the igt_runner, Piglit is used

(-p option); it's created html summary of the tests results and it's saved

in the folder "igt-gpu-tools/results"; it's executed only the igt-tests

In this example, instead of building the igt_runner, Piglit is used

(-p option). It creates an HTML summary of the test results and saves

them in the folder "igt-gpu-tools/results". It executes only the igt-tests

matching the -t option.



Display CRC Support

drivers/dma-buf/udmabuf.c

+28 −0
Original line number Diff line number Diff line
@@ -13,6 +13,8 @@ 
#include <linux/slab.h>

#include <linux/udmabuf.h>

#include <linux/hugetlb.h>

#include <linux/vmalloc.h>

#include <linux/iosys-map.h>



static int list_limit = 1024;

module_param(list_limit, int, 0644);
@@ -60,6 +62,30 @@ static int mmap_udmabuf(struct dma_buf *buf, struct vm_area_struct *vma) 
	return 0;

}



static int vmap_udmabuf(struct dma_buf *buf, struct iosys_map *map)

{

	struct udmabuf *ubuf = buf->priv;

	void *vaddr;



	dma_resv_assert_held(buf->resv);



	vaddr = vm_map_ram(ubuf->pages, ubuf->pagecount, -1);

	if (!vaddr)

		return -EINVAL;



	iosys_map_set_vaddr(map, vaddr);

	return 0;

}



static void vunmap_udmabuf(struct dma_buf *buf, struct iosys_map *map)

{

	struct udmabuf *ubuf = buf->priv;



	dma_resv_assert_held(buf->resv);



	vm_unmap_ram(map->vaddr, ubuf->pagecount);

}



static struct sg_table *get_sg_table(struct device *dev, struct dma_buf *buf,

				     enum dma_data_direction direction)

{
@@ -162,6 +188,8 @@ static const struct dma_buf_ops udmabuf_ops = { 
	.unmap_dma_buf	   = unmap_udmabuf,

	.release	   = release_udmabuf,

	.mmap		   = mmap_udmabuf,

	.vmap		   = vmap_udmabuf,

	.vunmap		   = vunmap_udmabuf,

	.begin_cpu_access  = begin_cpu_udmabuf,

	.end_cpu_access    = end_cpu_udmabuf,

};

drivers/gpu/drm/drm_fourcc.c

+4 −0
Original line number Diff line number Diff line
@@ -190,6 +190,10 @@ const struct drm_format_info *__drm_format_info(u32 format) 
		{ .format = DRM_FORMAT_BGRA5551,	.depth = 15, .num_planes = 1, .cpp = { 2, 0, 0 }, .hsub = 1, .vsub = 1, .has_alpha = true },

		{ .format = DRM_FORMAT_RGB565,		.depth = 16, .num_planes = 1, .cpp = { 2, 0, 0 }, .hsub = 1, .vsub = 1 },

		{ .format = DRM_FORMAT_BGR565,		.depth = 16, .num_planes = 1, .cpp = { 2, 0, 0 }, .hsub = 1, .vsub = 1 },

#ifdef __BIG_ENDIAN

		{ .format = DRM_FORMAT_XRGB1555 | DRM_FORMAT_BIG_ENDIAN, .depth = 15, .num_planes = 1, .cpp = { 2, 0, 0 }, .hsub = 1, .vsub = 1 },

		{ .format = DRM_FORMAT_RGB565 | DRM_FORMAT_BIG_ENDIAN, .depth = 16, .num_planes = 1, .cpp = { 2, 0, 0 }, .hsub = 1, .vsub = 1 },

#endif

		{ .format = DRM_FORMAT_RGB888,		.depth = 24, .num_planes = 1, .cpp = { 3, 0, 0 }, .hsub = 1, .vsub = 1 },

		{ .format = DRM_FORMAT_BGR888,		.depth = 24, .num_planes = 1, .cpp = { 3, 0, 0 }, .hsub = 1, .vsub = 1 },

		{ .format = DRM_FORMAT_XRGB8888,	.depth = 24, .num_planes = 1, .cpp = { 4, 0, 0 }, .hsub = 1, .vsub = 1 },

drivers/gpu/drm/drm_gem.c

+16 −3
Original line number Diff line number Diff line
@@ -169,6 +169,20 @@ void drm_gem_private_object_init(struct drm_device *dev, 
}

EXPORT_SYMBOL(drm_gem_private_object_init);



/**

 * drm_gem_private_object_fini - Finalize a failed drm_gem_object

 * @obj: drm_gem_object

 *

 * Uninitialize an already allocated GEM object when it initialized failed

 */

void drm_gem_private_object_fini(struct drm_gem_object *obj)

{

	WARN_ON(obj->dma_buf);



	dma_resv_fini(&obj->_resv);

}

EXPORT_SYMBOL(drm_gem_private_object_fini);



/**

 * drm_gem_object_handle_free - release resources bound to userspace handles

 * @obj: GEM object to clean up.
@@ -930,12 +944,11 @@ drm_gem_release(struct drm_device *dev, struct drm_file *file_private) 
void

drm_gem_object_release(struct drm_gem_object *obj)

{

	WARN_ON(obj->dma_buf);



	if (obj->filp)

		fput(obj->filp);



	dma_resv_fini(&obj->_resv);

	drm_gem_private_object_fini(obj);



	drm_gem_free_mmap_offset(obj);

	drm_gem_lru_remove(obj);

}

drivers/gpu/drm/drm_gem_shmem_helper.c

+3 −1
Original line number Diff line number Diff line
@@ -79,8 +79,10 @@ __drm_gem_shmem_create(struct drm_device *dev, size_t size, bool private) 
	} else {

		ret = drm_gem_object_init(dev, obj, size);

	}

	if (ret)

	if (ret) {

		drm_gem_private_object_fini(obj);

		goto err_free;

	}



	ret = drm_gem_create_mmap_offset(obj);

	if (ret)