Merge tag 'drm-misc-fixes-2024-08-29' of... (27f5b729) · Commits · git / linux-net

drivers/firmware/sysfb.c

+13 −6

Original line number	Diff line number	Diff line
		@@ -39,6 +39,8 @@ static struct platform_device *pd;
		static DEFINE_MUTEX(disable_lock);
		static bool disabled;

		static struct device sysfb_parent_dev(const struct screen_info si);

		static bool sysfb_unregister(void)
		{
		if (IS_ERR_OR_NULL(pd))
		@@ -52,6 +54,7 @@ static bool sysfb_unregister(void)

		/**
		* sysfb_disable() - disable the Generic System Framebuffers support
		* @dev: the device to check if non-NULL
		*
		* This disables the registration of system framebuffer devices that match the
		* generic drivers that make use of the system framebuffer set up by firmware.
		@@ -61,17 +64,21 @@ static bool sysfb_unregister(void)
		* Context: The function can sleep. A @disable_lock mutex is acquired to serialize
		* against sysfb_init(), that registers a system framebuffer device.
		*/
		void sysfb_disable(void)
		void sysfb_disable(struct device *dev)
		{
		struct screen_info *si = &screen_info;

		mutex_lock(&disable_lock);
		if (!dev \|\| dev == sysfb_parent_dev(si)) {
		sysfb_unregister();
		disabled = true;
		}
		mutex_unlock(&disable_lock);
		}
		EXPORT_SYMBOL_GPL(sysfb_disable);

		#if defined(CONFIG_PCI)
		static __init bool sysfb_pci_dev_is_enabled(struct pci_dev *pdev)
		static bool sysfb_pci_dev_is_enabled(struct pci_dev *pdev)
		{
		/*
		* TODO: Try to integrate this code into the PCI subsystem
		@@ -87,13 +94,13 @@ static __init bool sysfb_pci_dev_is_enabled(struct pci_dev *pdev)
		return true;
		}
		#else
		static __init bool sysfb_pci_dev_is_enabled(struct pci_dev *pdev)
		static bool sysfb_pci_dev_is_enabled(struct pci_dev *pdev)
		{
		return false;
		}
		#endif

		static __init struct device sysfb_parent_dev(const struct screen_info si)
		static struct device sysfb_parent_dev(const struct screen_info si)
		{
		struct pci_dev *pdev;

drivers/gpu/drm/v3d/v3d_sched.c

+6 −0

Original line number	Diff line number	Diff line
		@@ -134,6 +134,8 @@ v3d_job_start_stats(struct v3d_job *job, enum v3d_queue queue)
		struct v3d_stats *local_stats = &file->stats[queue];
		u64 now = local_clock();

		preempt_disable();

		write_seqcount_begin(&local_stats->lock);
		local_stats->start_ns = now;
		write_seqcount_end(&local_stats->lock);
		@@ -141,6 +143,8 @@ v3d_job_start_stats(struct v3d_job *job, enum v3d_queue queue)
		write_seqcount_begin(&global_stats->lock);
		global_stats->start_ns = now;
		write_seqcount_end(&global_stats->lock);

		preempt_enable();
		}

		static void
		@@ -162,8 +166,10 @@ v3d_job_update_stats(struct v3d_job *job, enum v3d_queue queue)
		struct v3d_stats *local_stats = &file->stats[queue];
		u64 now = local_clock();

		preempt_disable();
		v3d_stats_update(local_stats, now);
		v3d_stats_update(global_stats, now);
		preempt_enable();
		}

		static struct dma_fence v3d_bin_job_run(struct drm_sched_job sched_job)

drivers/gpu/drm/vmwgfx/vmwgfx_blit.c

+110 −4

Original line number	Diff line number	Diff line
		@@ -27,6 +27,8 @@
		**************************************************************************/

		#include "vmwgfx_drv.h"

		#include "vmwgfx_bo.h"
		#include <linux/highmem.h>

		/*
		@@ -420,13 +422,105 @@ static int vmw_bo_cpu_blit_line(struct vmw_bo_blit_line_data *d,
		return 0;
		}

		static void map_external(struct vmw_bo bo, struct iosys_map *map)
		{
		struct vmw_private *vmw =
		container_of(bo->tbo.bdev, struct vmw_private, bdev);
		void *ptr = NULL;
		int ret;

		if (bo->tbo.base.import_attach) {
		ret = dma_buf_vmap(bo->tbo.base.dma_buf, map);
		if (ret) {
		drm_dbg_driver(&vmw->drm,
		"Wasn't able to map external bo!\n");
		goto out;
		}
		ptr = map->vaddr;
		} else {
		ptr = vmw_bo_map_and_cache(bo);
		}

		out:
		return ptr;
		}

		static void unmap_external(struct vmw_bo bo, struct iosys_map map)
		{
		if (bo->tbo.base.import_attach)
		dma_buf_vunmap(bo->tbo.base.dma_buf, map);
		else
		vmw_bo_unmap(bo);
		}

		static int vmw_external_bo_copy(struct vmw_bo *dst, u32 dst_offset,
		u32 dst_stride, struct vmw_bo *src,
		u32 src_offset, u32 src_stride,
		u32 width_in_bytes, u32 height,
		struct vmw_diff_cpy *diff)
		{
		struct vmw_private *vmw =
		container_of(dst->tbo.bdev, struct vmw_private, bdev);
		size_t dst_size = dst->tbo.resource->size;
		size_t src_size = src->tbo.resource->size;
		struct iosys_map dst_map = {0};
		struct iosys_map src_map = {0};
		int ret, i;
		int x_in_bytes;
		u8 *vsrc;
		u8 *vdst;

		vsrc = map_external(src, &src_map);
		if (!vsrc) {
		drm_dbg_driver(&vmw->drm, "Wasn't able to map src\n");
		ret = -ENOMEM;
		goto out;
		}

		vdst = map_external(dst, &dst_map);
		if (!vdst) {
		drm_dbg_driver(&vmw->drm, "Wasn't able to map dst\n");
		ret = -ENOMEM;
		goto out;
		}

		vsrc += src_offset;
		vdst += dst_offset;
		if (src_stride == dst_stride) {
		dst_size -= dst_offset;
		src_size -= src_offset;
		memcpy(vdst, vsrc,
		min(dst_stride * height, min(dst_size, src_size)));
		} else {
		WARN_ON(dst_stride < width_in_bytes);
		for (i = 0; i < height; ++i) {
		memcpy(vdst, vsrc, width_in_bytes);
		vsrc += src_stride;
		vdst += dst_stride;
		}
		}

		x_in_bytes = (dst_offset % dst_stride);
		diff->rect.x1 = x_in_bytes / diff->cpp;
		diff->rect.y1 = ((dst_offset - x_in_bytes) / dst_stride);
		diff->rect.x2 = diff->rect.x1 + width_in_bytes / diff->cpp;
		diff->rect.y2 = diff->rect.y1 + height;

		ret = 0;
		out:
		unmap_external(src, &src_map);
		unmap_external(dst, &dst_map);

		return ret;
		}

		/**
		* vmw_bo_cpu_blit - in-kernel cpu blit.
		*
		* @dst: Destination buffer object.
		* @vmw_dst: Destination buffer object.
		* @dst_offset: Destination offset of blit start in bytes.
		* @dst_stride: Destination stride in bytes.
		* @src: Source buffer object.
		* @vmw_src: Source buffer object.
		* @src_offset: Source offset of blit start in bytes.
		* @src_stride: Source stride in bytes.
		* @w: Width of blit.
		@@ -444,13 +538,15 @@ static int vmw_bo_cpu_blit_line(struct vmw_bo_blit_line_data *d,
		* Neither of the buffer objects may be placed in PCI memory
		* (Fixed memory in TTM terminology) when using this function.
		*/
		int vmw_bo_cpu_blit(struct ttm_buffer_object *dst,
		int vmw_bo_cpu_blit(struct vmw_bo *vmw_dst,
		u32 dst_offset, u32 dst_stride,
		struct ttm_buffer_object *src,
		struct vmw_bo *vmw_src,
		u32 src_offset, u32 src_stride,
		u32 w, u32 h,
		struct vmw_diff_cpy *diff)
		{
		struct ttm_buffer_object *src = &vmw_src->tbo;
		struct ttm_buffer_object *dst = &vmw_dst->tbo;
		struct ttm_operation_ctx ctx = {
		.interruptible = false,
		.no_wait_gpu = false
		@@ -460,6 +556,11 @@ int vmw_bo_cpu_blit(struct ttm_buffer_object *dst,
		int ret = 0;
		struct page **dst_pages = NULL;
		struct page **src_pages = NULL;
		bool src_external = (src->ttm->page_flags & TTM_TT_FLAG_EXTERNAL) != 0;
		bool dst_external = (dst->ttm->page_flags & TTM_TT_FLAG_EXTERNAL) != 0;

		if (WARN_ON(dst == src))
		return -EINVAL;

		/* Buffer objects need to be either pinned or reserved: */
		if (!(dst->pin_count))
		@@ -479,6 +580,11 @@ int vmw_bo_cpu_blit(struct ttm_buffer_object *dst,
		return ret;
		}

		if (src_external \|\| dst_external)
		return vmw_external_bo_copy(vmw_dst, dst_offset, dst_stride,
		vmw_src, src_offset, src_stride,
		w, h, diff);

		if (!src->ttm->pages && src->ttm->sg) {
		src_pages = kvmalloc_array(src->ttm->num_pages,
		sizeof(struct page *), GFP_KERNEL);

drivers/gpu/drm/vmwgfx/vmwgfx_bo.c

+11 −2

Original line number	Diff line number	Diff line
		@@ -360,6 +360,8 @@ void vmw_bo_map_and_cache_size(struct vmw_bo vbo, size_t size)
		void *virtual;
		int ret;

		atomic_inc(&vbo->map_count);

		virtual = ttm_kmap_obj_virtual(&vbo->map, &not_used);
		if (virtual)
		return virtual;
		@@ -383,12 +385,18 @@ void vmw_bo_map_and_cache_size(struct vmw_bo vbo, size_t size)
		*/
		void vmw_bo_unmap(struct vmw_bo *vbo)
		{
		int map_count;

		if (vbo->map.bo == NULL)
		return;

		map_count = atomic_dec_return(&vbo->map_count);

		if (!map_count) {
		ttm_bo_kunmap(&vbo->map);
		vbo->map.bo = NULL;
		}
		}


		/**
		@@ -421,6 +429,7 @@ static int vmw_bo_init(struct vmw_private *dev_priv,
		vmw_bo->tbo.priority = 3;
		vmw_bo->res_tree = RB_ROOT;
		xa_init(&vmw_bo->detached_resources);
		atomic_set(&vmw_bo->map_count, 0);

		params->size = ALIGN(params->size, PAGE_SIZE);
		drm_gem_private_object_init(vdev, &vmw_bo->tbo.base, params->size);

drivers/gpu/drm/vmwgfx/vmwgfx_bo.h

+3 −0

Original line number	Diff line number	Diff line
		@@ -71,6 +71,8 @@ struct vmw_bo_params {
		* @map: Kmap object for semi-persistent mappings
		* @res_tree: RB tree of resources using this buffer object as a backing MOB
		* @res_prios: Eviction priority counts for attached resources
		* @map_count: The number of currently active maps. Will differ from the
		* cpu_writers because it includes kernel maps.
		* @cpu_writers: Number of synccpu write grabs. Protected by reservation when
		* increased. May be decreased without reservation.
		* @dx_query_ctx: DX context if this buffer object is used as a DX query MOB
		@@ -90,6 +92,7 @@ struct vmw_bo {
		u32 res_prios[TTM_MAX_BO_PRIORITY];
		struct xarray detached_resources;

		atomic_t map_count;
		atomic_t cpu_writers;
		/* Not ref-counted. Protected by binding_mutex */
		struct vmw_resource *dx_query_ctx;