Skip to content

Commit c8de526

Browse files
committed
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: Daniel Vetter <[email protected]> From: Maxime Ripard <[email protected]> Link: https://patchwork.freedesktop.org/patch/msgid/20230103144926.bmjjni3xnuis2jmq@houat
2 parents 88603b6 + 03dec92 commit c8de526

File tree

4 files changed

+8
-6
lines changed

4 files changed

+8
-6
lines changed

drivers/gpu/drm/scheduler/sched_entity.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ int drm_sched_entity_init(struct drm_sched_entity *entity,
8181
init_completion(&entity->entity_idle);
8282

8383
/* We start in an idle state. */
84-
complete(&entity->entity_idle);
84+
complete_all(&entity->entity_idle);
8585

8686
spin_lock_init(&entity->rq_lock);
8787
spsc_queue_init(&entity->job_queue);

drivers/gpu/drm/scheduler/sched_main.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -987,7 +987,7 @@ static int drm_sched_main(void *param)
987987
sched_job = drm_sched_entity_pop_job(entity);
988988

989989
if (!sched_job) {
990-
complete(&entity->entity_idle);
990+
complete_all(&entity->entity_idle);
991991
continue;
992992
}
993993

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

999999
trace_drm_run_job(sched_job, entity);
10001000
fence = sched->ops->run_job(sched_job);
1001-
complete(&entity->entity_idle);
1001+
complete_all(&entity->entity_idle);
10021002
drm_sched_fence_scheduled(s_fence);
10031003

10041004
if (!IS_ERR_OR_NULL(fence)) {

drivers/gpu/drm/tests/Makefile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,3 +12,5 @@ obj-$(CONFIG_DRM_KUNIT_TEST) += \
1212
drm_mm_test.o \
1313
drm_plane_helper_test.o \
1414
drm_rect_test.o
15+
16+
CFLAGS_drm_mm_test.o := $(DISABLE_STRUCTLEAK_PLUGIN)

drivers/gpu/drm/tests/drm_mm_test.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -298,9 +298,9 @@ static bool expect_reserve_fail(struct kunit *test, struct drm_mm *mm, struct dr
298298
return false;
299299
}
300300

301-
static bool check_reserve_boundaries(struct kunit *test, struct drm_mm *mm,
302-
unsigned int count,
303-
u64 size)
301+
static bool noinline_for_stack check_reserve_boundaries(struct kunit *test, struct drm_mm *mm,
302+
unsigned int count,
303+
u64 size)
304304
{
305305
const struct boundary {
306306
u64 start, size;

0 commit comments

Comments
 (0)