Before commit
f7e0cdcf1a5, we tried these in order
- if (!ForceSoftware) surfaceless_probe_device(disp, false);
- surfaceless_probe_device(disp, true);
- surfaceless_probe_device_sw(disp);
The commit changed it to
- surfaceless_probe_device(disp, ForceSoftware);
- surfaceless_probe_device_sw(disp);
and broke 2D virtio-gpu and vgem when ForceSoftware is false. This
commit restores the old behavior.
Fixes:
f7e0cdcf1a5 ("egl/surfaceless: simplify dri2_initialize_surfaceless()")
Signed-off-by: Chia-I Wu <olvaffe@gmail.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Emil Velikov <emil.l.velikov@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/11992>
dri2_dpy->fd = -1;
disp->DriverData = (void *) dri2_dpy;
+ /* When ForceSoftware is false, we try the HW driver. When ForceSoftware
+ * is true, we try kms_swrast and swrast in order.
+ */
driver_loaded = surfaceless_probe_device(disp, disp->Options.ForceSoftware);
+ if (!driver_loaded && disp->Options.ForceSoftware) {
+ _eglLog(_EGL_DEBUG, "Falling back to surfaceless swrast without DRM.");
+ driver_loaded = surfaceless_probe_device_sw(disp);
+ }
if (!driver_loaded) {
- _eglLog(_EGL_DEBUG, "Falling back to surfaceless swrast without DRM.");
- if (!surfaceless_probe_device_sw(disp)) {
- err = "DRI2: failed to load driver";
- goto cleanup;
- }
+ err = "DRI2: failed to load driver";
+ goto cleanup;
}
if (!dri2_create_screen(disp)) {