From 92f12952f32ee08cd302f8591ab059ca5f167239 Mon Sep 17 00:00:00 2001 From: Ilia Mirkin Date: Thu, 4 Feb 2021 12:15:43 -0500 Subject: [PATCH] nouveau: reinstate fencing on screen destroy As it turns out, the wait is required as the driver expects for rendering to be quiesced on exit. This can trigger channel failures, which in turn trigger recovery. This can fail and destroy the whole system. Fixes: 28a781323fb ("nouveau: change fence destruction logic on screen destroy") References: https://gitlab.freedesktop.org/mesa/mesa/-/issues/4223 Signed-off-by: Ilia Mirkin Reviewed-by: Karol Herbst Part-of: --- src/gallium/drivers/nouveau/nouveau_fence.c | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/src/gallium/drivers/nouveau/nouveau_fence.c b/src/gallium/drivers/nouveau/nouveau_fence.c index 49f686bfbb5..b4c938fff61 100644 --- a/src/gallium/drivers/nouveau/nouveau_fence.c +++ b/src/gallium/drivers/nouveau/nouveau_fence.c @@ -111,17 +111,15 @@ nouveau_fence_del(struct nouveau_fence *fence) void nouveau_fence_cleanup(struct nouveau_screen *screen) { - struct nouveau_fence *fence, *next; - - for (fence = screen->fence.head; fence; fence = next) { - next = fence->next; - nouveau_fence_trigger_work(fence); - nouveau_fence_ref(NULL, &fence); - } - screen->fence.head = NULL; - screen->fence.tail = NULL; if (screen->fence.current) { - nouveau_fence_trigger_work(screen->fence.current); + struct nouveau_fence *current = NULL; + + /* nouveau_fence_wait will create a new current fence, so wait on the + * _current_ one, and remove both. + */ + nouveau_fence_ref(screen->fence.current, ¤t); + nouveau_fence_wait(current, NULL); + nouveau_fence_ref(NULL, ¤t); nouveau_fence_ref(NULL, &screen->fence.current); } }