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

Merge tag 'drm-misc-next-fixes-2023-01-03' of... 

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

 into drm-fixes

Maxime writes:

"The drm-misc-next-fixes leftovers. It addresses a bug in drm/scheduler
ending up causing a lockup, and reduces the stack usage of some drm/mm
kunit tests."

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

drivers/gpu/drm/scheduler/sched_entity.c

+1 −1
Original line number Diff line number Diff line
@@ -81,7 +81,7 @@ int drm_sched_entity_init(struct drm_sched_entity *entity, 
	init_completion(&entity->entity_idle);



	/* We start in an idle state. */

	complete(&entity->entity_idle);

	complete_all(&entity->entity_idle);



	spin_lock_init(&entity->rq_lock);

	spsc_queue_init(&entity->job_queue);

drivers/gpu/drm/scheduler/sched_main.c

+2 −2
Original line number Diff line number Diff line
@@ -987,7 +987,7 @@ static int drm_sched_main(void *param) 
		sched_job = drm_sched_entity_pop_job(entity);



		if (!sched_job) {

			complete(&entity->entity_idle);

			complete_all(&entity->entity_idle);

			continue;

		}
@@ -998,7 +998,7 @@ static int drm_sched_main(void *param) 


		trace_drm_run_job(sched_job, entity);

		fence = sched->ops->run_job(sched_job);

		complete(&entity->entity_idle);

		complete_all(&entity->entity_idle);

		drm_sched_fence_scheduled(s_fence);



		if (!IS_ERR_OR_NULL(fence)) {

drivers/gpu/drm/tests/Makefile

+2 −0
Original line number Diff line number Diff line
@@ -12,3 +12,5 @@ obj-$(CONFIG_DRM_KUNIT_TEST) += \ 
	drm_mm_test.o \

	drm_plane_helper_test.o \

	drm_rect_test.o



CFLAGS_drm_mm_test.o := $(DISABLE_STRUCTLEAK_PLUGIN)

drivers/gpu/drm/tests/drm_mm_test.c

+3 −3
Original line number Diff line number Diff line
@@ -298,7 +298,7 @@ static bool expect_reserve_fail(struct kunit *test, struct drm_mm *mm, struct dr 
	return false;

}



static bool check_reserve_boundaries(struct kunit *test, struct drm_mm *mm,

static bool noinline_for_stack check_reserve_boundaries(struct kunit *test, struct drm_mm *mm,

							unsigned int count,

							u64 size)

{