Mesa (master): nouveau: trigger the current fence's work on destroy explicitly

[GitLab Mirror]

Module: Mesa
Branch: master
Commit: f9237619d353d34c6d471cd39fe31c765d8dc529
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=f9237619d353d34c6d471cd39fe31c765d8dc529

Author: Ilia Mirkin <imirkin at alum.mit.edu>
Date:   Wed Jan 13 00:38:10 2021 -0500

nouveau: trigger the current fence's work on destroy explicitly

Otherwise the delete yells at us that there's still work pending. This
isn't an actual problem, but annoying to see each time.

Signed-off-by: Ilia Mirkin <imirkin at alum.mit.edu>
Reviewed-by: Karol Herbst <kherbst at redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/8462>

---

 src/gallium/drivers/nouveau/nouveau_fence.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/gallium/drivers/nouveau/nouveau_fence.c b/src/gallium/drivers/nouveau/nouveau_fence.c
index f317d0451d4..49f686bfbb5 100644
--- a/src/gallium/drivers/nouveau/nouveau_fence.c
+++ b/src/gallium/drivers/nouveau/nouveau_fence.c
@@ -120,7 +120,10 @@ nouveau_fence_cleanup(struct nouveau_screen *screen)
    }
    screen->fence.head = NULL;
    screen->fence.tail = NULL;
-   nouveau_fence_ref(NULL, &screen->fence.current);
+   if (screen->fence.current) {
+      nouveau_fence_trigger_work(screen->fence.current);
+      nouveau_fence_ref(NULL, &screen->fence.current);
+   }
 }
 
 void