Commit c8de5262 authored by Daniel Vetter's avatar Daniel Vetter

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
...@@ -81,7 +81,7 @@ int drm_sched_entity_init(struct drm_sched_entity *entity, ...@@ -81,7 +81,7 @@ int drm_sched_entity_init(struct drm_sched_entity *entity,
init_completion(&entity->entity_idle); init_completion(&entity->entity_idle);
/* We start in an idle state. */ /* We start in an idle state. */
complete(&entity->entity_idle); complete_all(&entity->entity_idle);
spin_lock_init(&entity->rq_lock); spin_lock_init(&entity->rq_lock);
spsc_queue_init(&entity->job_queue); spsc_queue_init(&entity->job_queue);
......
...@@ -987,7 +987,7 @@ static int drm_sched_main(void *param) ...@@ -987,7 +987,7 @@ static int drm_sched_main(void *param)
sched_job = drm_sched_entity_pop_job(entity); sched_job = drm_sched_entity_pop_job(entity);
if (!sched_job) { if (!sched_job) {
complete(&entity->entity_idle); complete_all(&entity->entity_idle);
continue; continue;
} }
...@@ -998,7 +998,7 @@ static int drm_sched_main(void *param) ...@@ -998,7 +998,7 @@ static int drm_sched_main(void *param)
trace_drm_run_job(sched_job, entity); trace_drm_run_job(sched_job, entity);
fence = sched->ops->run_job(sched_job); fence = sched->ops->run_job(sched_job);
complete(&entity->entity_idle); complete_all(&entity->entity_idle);
drm_sched_fence_scheduled(s_fence); drm_sched_fence_scheduled(s_fence);
if (!IS_ERR_OR_NULL(fence)) { if (!IS_ERR_OR_NULL(fence)) {
......
...@@ -12,3 +12,5 @@ obj-$(CONFIG_DRM_KUNIT_TEST) += \ ...@@ -12,3 +12,5 @@ obj-$(CONFIG_DRM_KUNIT_TEST) += \
drm_mm_test.o \ drm_mm_test.o \
drm_plane_helper_test.o \ drm_plane_helper_test.o \
drm_rect_test.o drm_rect_test.o
CFLAGS_drm_mm_test.o := $(DISABLE_STRUCTLEAK_PLUGIN)
...@@ -298,9 +298,9 @@ static bool expect_reserve_fail(struct kunit *test, struct drm_mm *mm, struct dr ...@@ -298,9 +298,9 @@ static bool expect_reserve_fail(struct kunit *test, struct drm_mm *mm, struct dr
return false; 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, unsigned int count,
u64 size) u64 size)
{ {
const struct boundary { const struct boundary {
u64 start, size; u64 start, size;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment