Commit f581dbb3 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'drm-misc-fixes-2024-02-22' of git://anongit.freedesktop.org/drm/drm-misc into drm-fixes 



A list handling fix and 64bit division on 32bit platform fix for the
drm/buddy allocator, a cast warning and an initialization fix for
nouveau, a bridge handling fix for meson, an initialisation fix for
ivpu, a SPARC build fix for fbdev, a double-free fix for ttm, and two
fence handling fixes for syncobj.

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

From: Maxime Ripard <mripard@redhat.com>
Link: https://patchwork.freedesktop.org/patch/msgid/gl2antuifidtzn3dfm426p7xwh5fxj23behagwh26owfnosh2w@gqoa7vj5prnh
parents b401b621 2aa6f5b0

arch/sparc/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -60,7 +60,7 @@ libs-y += arch/sparc/prom/ 
libs-y                 += arch/sparc/lib/



drivers-$(CONFIG_PM) += arch/sparc/power/

drivers-$(CONFIG_FB) += arch/sparc/video/

drivers-$(CONFIG_FB_CORE) += arch/sparc/video/



boot := arch/sparc/boot

arch/sparc/video/Makefile

+1 −1
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0-only



obj-$(CONFIG_FB) += fbdev.o
 
obj-$(CONFIG_FB_CORE) += fbdev.o

drivers/accel/ivpu/ivpu_hw_40xx.c

+1 −1
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ 
#define SKU_HW_ID_SHIFT              16u

#define SKU_HW_ID_MASK               0xffff0000u



#define PLL_CONFIG_DEFAULT           0x1

#define PLL_CONFIG_DEFAULT           0x0

#define PLL_CDYN_DEFAULT             0x80

#define PLL_EPP_DEFAULT              0x80

#define PLL_REF_CLK_FREQ	     (50 * 1000000)

drivers/gpu/drm/drm_buddy.c

+2 −2
Original line number Diff line number Diff line
@@ -538,13 +538,13 @@ static int __alloc_range(struct drm_buddy *mm, 
		list_add(&block->left->tmp_link, dfs);

	} while (1);



	list_splice_tail(&allocated, blocks);



	if (total_allocated < size) {

		err = -ENOSPC;

		goto err_free;

	}



	list_splice_tail(&allocated, blocks);



	return 0;



err_undo:

drivers/gpu/drm/drm_syncobj.c

+16 −3
Original line number Diff line number Diff line
@@ -1040,7 +1040,8 @@ static signed long drm_syncobj_array_wait_timeout(struct drm_syncobj **syncobjs, 
	uint64_t *points;

	uint32_t signaled_count, i;



	if (flags & DRM_SYNCOBJ_WAIT_FLAGS_WAIT_FOR_SUBMIT)

	if (flags & (DRM_SYNCOBJ_WAIT_FLAGS_WAIT_FOR_SUBMIT |

		     DRM_SYNCOBJ_WAIT_FLAGS_WAIT_AVAILABLE))

		lockdep_assert_none_held_once();



	points = kmalloc_array(count, sizeof(*points), GFP_KERNEL);
@@ -1109,7 +1110,8 @@ static signed long drm_syncobj_array_wait_timeout(struct drm_syncobj **syncobjs, 
	 * fallthough and try a 0 timeout wait!

	 */



	if (flags & DRM_SYNCOBJ_WAIT_FLAGS_WAIT_FOR_SUBMIT) {

	if (flags & (DRM_SYNCOBJ_WAIT_FLAGS_WAIT_FOR_SUBMIT |

		     DRM_SYNCOBJ_WAIT_FLAGS_WAIT_AVAILABLE)) {

		for (i = 0; i < count; ++i)

			drm_syncobj_fence_add_wait(syncobjs[i], &entries[i]);

	}
@@ -1416,10 +1418,21 @@ syncobj_eventfd_entry_func(struct drm_syncobj *syncobj, 


	/* This happens inside the syncobj lock */

	fence = dma_fence_get(rcu_dereference_protected(syncobj->fence, 1));

	if (!fence)

		return;



	ret = dma_fence_chain_find_seqno(&fence, entry->point);

	if (ret != 0 || !fence) {

	if (ret != 0) {

		/* The given seqno has not been submitted yet. */

		dma_fence_put(fence);

		return;

	} else if (!fence) {

		/* If dma_fence_chain_find_seqno returns 0 but sets the fence

		 * to NULL, it implies that the given seqno is signaled and a

		 * later seqno has already been submitted. Assign a stub fence

		 * so that the eventfd still gets signaled below.

		 */

		fence = dma_fence_get_stub();

	}



	list_del_init(&entry->node);