NeroReflex/mesa
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

egl/drm: flush before calling get_back_bo

Browse source 
Similar to what was done for Wayland in 58f90fd03f:
the glthread unmarhsal thread needs to be idle to avoid
concurrent calls to get_back_bo.

Also the existing code flushed after setting dri2_surf->back
to NULL so a new back buffer was always allocated by the
glthread flush:

|---------------> dri2_drm_swap_buffers
| get_back_bo (back=0x55eb93c6c488) >       # First get_back_bo call
| get_back_bo (back=0x55eb93c6c488 age: 0)<
|                                           # dri2_surf->back = NULL
|-----> FLUSH
| get_back_bo (back=nil) >                  # Another get_back_bo call
| get_back_bo (back=0x55eb93c6c4c8 age: 3)<
|-----< FLUSH
|---------------< dri2_drm_swap_buffers

Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/10437
Cc: mesa-stable
Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/27143>
(cherry picked from commit 6f47e87a605897a851ab7ee6cc2ae49dc4f1f5a2)
This commit is contained in:
Pierre-Eric Pelloux-Prayer 2024-01-18 14:18:27 +01:00 • committed by Eric Engestrom
parent 9f0048a73f
commit 4ce8d2d8b3
2 changed files with 8 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
.pick_status.json
View file

@ -1974,7 +1974,7 @@
"description": "egl/drm: flush before calling get_back_bo", "description": "egl/drm: flush before calling get_back_bo",
"nominated": true, "nominated": true,
"nomination_type": 0, "nomination_type": 0,
"resolution": 0, "resolution": 1,
"main_sha": null, "main_sha": null,
"because_sha": null, "because_sha": null,
"notes": null "notes": null

10
src/egl/drivers/dri2/platform_drm.c
View file

@ -329,6 +329,13 @@ dri2_drm_swap_buffers(_EGLDisplay *disp, _EGLSurface *draw)
if (dri2_surf->color_buffers[i].age > 0) if (dri2_surf->color_buffers[i].age > 0)
dri2_surf->color_buffers[i].age++; dri2_surf->color_buffers[i].age++;
/* Flushing must be done before get_back_bo to make sure glthread's
* unmarshalling thread is idle otherwise it might concurrently
* call get_back_bo (eg: through dri2_drm_image_get_buffers).
*/
dri2_flush_drawable_for_swapbuffers(disp, draw);
dri2_dpy->flush->invalidate(dri2_surf->dri_drawable);
/* Make sure we have a back buffer in case we're swapping without /* Make sure we have a back buffer in case we're swapping without
* ever rendering. */ * ever rendering. */
if (get_back_bo(dri2_surf) < 0) if (get_back_bo(dri2_surf) < 0)
@ -338,9 +345,6 @@ dri2_drm_swap_buffers(_EGLDisplay *disp, _EGLSurface *draw)
dri2_surf->current->age = 1; dri2_surf->current->age = 1;
dri2_surf->back = NULL; dri2_surf->back = NULL;
dri2_flush_drawable_for_swapbuffers(disp, draw);
dri2_dpy->flush->invalidate(dri2_surf->dri_drawable);
return EGL_TRUE; return EGL_TRUE;
} }