egl: fix fd_display_gpu on surfaceless and device platforms
The original commit missed these.
Signed-off-by: Simon Ser <contact@emersion.fr>
Fixes: 31013f3ce7 ("egl: remove is_different_gpu variable from struct dri2_egl_display")
Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/8194
Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/20992>
This commit is contained in:
@@ -288,6 +288,8 @@ device_probe_device(_EGLDisplay *disp)
|
||||
if (dri2_dpy->fd_render_gpu < 0)
|
||||
return false;
|
||||
|
||||
dri2_dpy->fd_display_gpu = dri2_dpy->fd_render_gpu;
|
||||
|
||||
dri2_dpy->driver_name = loader_get_driver_for_fd(dri2_dpy->fd_render_gpu);
|
||||
if (!dri2_dpy->driver_name)
|
||||
goto err_name;
|
||||
@@ -316,7 +318,7 @@ err_load:
|
||||
|
||||
err_name:
|
||||
close(dri2_dpy->fd_render_gpu);
|
||||
dri2_dpy->fd_render_gpu = -1;
|
||||
dri2_dpy->fd_render_gpu = dri2_dpy->fd_display_gpu = -1;
|
||||
return false;
|
||||
|
||||
}
|
||||
@@ -327,6 +329,7 @@ device_probe_device_sw(_EGLDisplay *disp)
|
||||
struct dri2_egl_display *dri2_dpy = dri2_egl_display(disp);
|
||||
|
||||
dri2_dpy->fd_render_gpu = -1;
|
||||
dri2_dpy->fd_display_gpu = -1;
|
||||
dri2_dpy->driver_name = strdup(disp->Options.Zink ? "zink" : "swrast");
|
||||
if (!dri2_dpy->driver_name)
|
||||
return false;
|
||||
|
||||
@@ -714,6 +714,7 @@ dri2_initialize_drm(_EGLDisplay *disp)
|
||||
goto cleanup;
|
||||
}
|
||||
}
|
||||
dri2_dpy->fd_display_gpu = dri2_dpy->fd_render_gpu;
|
||||
dri2_dpy->gbm_dri = gbm_dri_device(gbm);
|
||||
|
||||
if (strcmp(gbm_device_get_backend_name(gbm), "drm") != 0) {
|
||||
|
||||
Reference in New Issue
Block a user