From 482d9fcbf304e41a0a4ab461894277e5cfd2c9b2 Mon Sep 17 00:00:00 2001 From: Yusuf Khan Date: Sun, 7 Apr 2024 04:44:12 -0500 Subject: [PATCH] nouveau: Fix crash when destination or source screen fences are null Fixes: dEQP-EGL.functional.sharing.gles2.multithread.random_egl_sync.*, one of them, its quite finiky, one may say random Signed-off-by: Yusuf Khan Reviewed-by: Karol Herbst Cc: mesa-stable Part-of: --- src/gallium/drivers/nouveau/nouveau_screen.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/gallium/drivers/nouveau/nouveau_screen.c b/src/gallium/drivers/nouveau/nouveau_screen.c index ec6c731d7d8..33ac4d92374 100644 --- a/src/gallium/drivers/nouveau/nouveau_screen.c +++ b/src/gallium/drivers/nouveau/nouveau_screen.c @@ -80,7 +80,8 @@ nouveau_screen_fence_ref(struct pipe_screen *pscreen, struct pipe_fence_handle **ptr, struct pipe_fence_handle *pfence) { - nouveau_fence_ref(nouveau_fence(pfence), (struct nouveau_fence **)ptr); + nouveau_fence_ref((pfence ? nouveau_fence(pfence) : NULL), + (ptr ? (struct nouveau_fence **)ptr : NULL)); } static bool