Commit 657803cb authored by Boris Brezillon's avatar Boris Brezillon Committed by Liviu Dudau
Browse files

drm/panthor: Drop a WARN_ON() in group_free_queue() 



It appears the timeout can still be enabled when we reach that point,
because of the asynchronous progress check done on queues that resets
the timer when jobs are still in-flight, but progress was made.
We could add more checks to make sure the timer is not re-enabled when
a group can't run anymore, but we don't have a group to pass to
queue_check_job_completion() in some context.

It's just as safe (we just want to be sure the timer is stopped before
we destroy the queue) and simpler to drop the WARN_ON() in
group_free_queue().

v2:
- Collect R-bs

Signed-off-by: default avatarBoris Brezillon <boris.brezillon@collabora.com>
Reviewed-by: default avatarLiviu Dudau <liviu.dudau@arm.com>
Reviewed-by: default avatarChia-I Wu <olvaffe@gmail.com>
Signed-off-by: default avatarLiviu Dudau <liviu.dudau@arm.com>
Link: https://patch.msgid.link/20251203121750.404340-2-boris.brezillon@collabora.com
parent 41f23117

drivers/gpu/drm/panthor/panthor_sched.c

+2 −3
Original line number Diff line number Diff line
@@ -893,9 +893,8 @@ static void group_free_queue(struct panthor_group *group, struct panthor_queue * 
	if (IS_ERR_OR_NULL(queue))

		return;



	/* This should have been disabled before that point. */

	drm_WARN_ON(&group->ptdev->base,

		    disable_delayed_work_sync(&queue->timeout.work));

	/* Disable the timeout before tearing down drm_sched components. */

	disable_delayed_work_sync(&queue->timeout.work);



	if (queue->entity.fence_context)

		drm_sched_entity_destroy(&queue->entity);