fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-02-04 19:20:38 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

nouveau: Fix crash when destination or source screen fences are null

Browse source 
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 <yusisamerican@gmail.com>
Reviewed-by: Karol Herbst <kherbst@redhat.com>

Cc: mesa-stable
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/28618>
(cherry picked from commit 482d9fcbf3)
This commit is contained in:
Yusuf Khan 2024-04-07 04:44:12 -05:00 • committed by Eric Engestrom
parent 726c28f92f
commit 7252bb2d96
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.pick_status.json
View file

@ -764,7 +764,7 @@
"description": "nouveau: Fix crash when destination or source screen fences are null",
"nominated": true,
"nomination_type": 0,
"resolution": 0,
"resolution": 1,
"main_sha": null,
"because_sha": null,
"notes": null

3
src/gallium/drivers/nouveau/nouveau_screen.c
View file

@ -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