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

egl: fix sw fallback rejection in non-sw EGL_PLATFORM=device
Some checks are pending
macOS-CI / macOS-CI (dri) (push) Waiting to run
Details
macOS-CI / macOS-CI (xlib) (push) Waiting to run
Details

Browse source 
previously progress could still be made during sw fallback here,
which would lead to unpredictable results with driver loading e.g., crashing

cc: mesa-stable

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/34609>
This commit is contained in:
Mike Blumenkrantz 2025-04-18 09:33:46 -04:00 • committed by Marge Bot
parent 4d8146befb
commit 8a339cdebc
1 changed files with 15 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
src/egl/drivers/dri2/platform_device.c
View file

@ -282,16 +282,21 @@ device_probe_device(_EGLDisplay *disp)
if (!dri2_dpy->driver_name)
goto err_name;
/* When doing software rendering, some times user still want to explicitly
* choose the render node device since cross node import doesn't work between
* vgem/virtio_gpu yet. It would be nice to have a new EXTENSION for this.
* For now, just fallback to kms_swrast. */
if (disp->Options.ForceSoftware && !request_software &&
(strcmp(dri2_dpy->driver_name, "vgem") == 0 ||
strcmp(dri2_dpy->driver_name, "virtio_gpu") == 0)) {
free(dri2_dpy->driver_name);
_eglLog(_EGL_WARNING, "NEEDS EXTENSION: falling back to kms_swrast");
dri2_dpy->driver_name = strdup("kms_swrast");
/* this is software fallback */
if (disp->Options.ForceSoftware && !request_software) {
/* When doing software rendering, some times user still want to explicitly
* choose the render node device since cross node import doesn't work between
* vgem/virtio_gpu yet. It would be nice to have a new EXTENSION for this.
* For now, just fallback to kms_swrast. */
if (strcmp(dri2_dpy->driver_name, "vgem") == 0 ||
strcmp(dri2_dpy->driver_name, "virtio_gpu") == 0) {
free(dri2_dpy->driver_name);
_eglLog(_EGL_WARNING, "NEEDS EXTENSION: falling back to kms_swrast");
dri2_dpy->driver_name = strdup("kms_swrast");
} else if (strcmp(dri2_dpy->driver_name, "vmwgfx")) {
/* this is software fallback; deny progress since a hardware device was requested */
return false;
}
}
dri2_detect_swrast(disp);