AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

gbm/dri: Match zink autoloading from egl

Browse Source 
Essentially, match the Zink autoloading order that was implemented as
part of https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/25640

Reviewed-by: Yiwei Zhang <zzyiwei@chromium.org>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/34163>
This commit is contained in:
Aaron Ruby
2025-03-21 12:18:52 -04:00
committed by Marge Bot
parent 49aec32f57
commit d64df991bb
1 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/gbm/backends/dri/gbm_dri.c
View File

@@ -268,15 +268,23 @@ fail:
}
static int
dri_screen_create(struct gbm_dri_device *dri, bool driver_name_is_inferred)
dri_screen_create(struct gbm_dri_device *dri)
{
char *driver_name;
int ret;
driver_name = loader_get_driver_for_fd(dri->base.v0.fd);
if (!driver_name)
return -1;
return dri_screen_create_for_driver(dri, driver_name, driver_name_is_inferred);
ret = dri_screen_create_for_driver(dri, driver_name, /*driver_name_is_inferred=*/false);
if (ret) {
/* Note: driver_name freed by called function */
driver_name = strdup("zink");
ret = dri_screen_create_for_driver(dri, driver_name, /*driver_name_is_inferred=*/true);
}
return ret;
}
static int
@@ -1197,7 +1205,7 @@ dri_device_create(int fd, uint32_t gbm_backend_version)
force_sw = debug_get_bool_option("GBM_ALWAYS_SOFTWARE", false);
if (!force_sw) {
ret = dri_screen_create(dri, false);
ret = dri_screen_create(dri);
if (ret)
ret = dri_screen_create_sw(dri, true);
} else {