XLibre/xserver
1
1
Fork 0
mirror of https://github.com/X11Libre/xserver.git synced 2026-04-14 17:18:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

xfree86/common: make screenConfig take autoAddGPU into account

Browse Source 
This patch puts configServerFlags() before configScreen()'s and
makes the latter to use xf86Info.autoAddGPU value.

Fixes: https://github.com/X11Libre/xserver/issues/1658
Signed-off-by: Oleh Nykyforchyn <oleh.nyk@gmail.com>
This commit is contained in:
Oleh Nykyforchyn
2025-12-13 14:18:08 +02:00
committed by Enrico Weigelt
parent 0292d41748
commit ee73f84c65
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
hw/xfree86/common/xf86Config.c
View File

@@ -1744,7 +1744,7 @@ configScreen(confScreenPtr screenp, XF86ConfScreenPtr conf_screen, int scrnum,
screenp->device = NULL;
}
if (auto_gpu_device && conf_screen->num_gpu_devices == 0 &&
if (xf86Info.autoAddGPU && auto_gpu_device && conf_screen->num_gpu_devices == 0 &&
xf86configptr->conf_device_lst) {
/* Loop through the entire device list and skip the primary device
* assigned to the screen. This is important because there are two
@@ -2390,7 +2390,10 @@ xf86HandleConfigFile(Bool autoconfig)
* And while we are at it, we'll decode the rest of the stuff as well
*/
/* First check if a layout section is present, and if it is valid. */
/* Global server options should go first, e.g., GPU devices probing depends on this */
configServerFlags(xf86configptr->conf_flags, xf86ConfigLayout.options);
/* Check if a layout section is present, and if it is valid. */
FIND_SUITABLE(XF86ConfLayoutPtr, xf86configptr->conf_layout_lst, layout);
if (layout == NULL || xf86ScreenName != NULL) {
XF86ConfScreenPtr screen;
@@ -2449,7 +2452,6 @@ xf86HandleConfigFile(Bool autoconfig)
}
#endif
/* Now process everything else */
configServerFlags(xf86configptr->conf_flags, xf86ConfigLayout.options);
configFiles(xf86configptr->conf_files);
configExtensions(xf86configptr->conf_extensions);
configDRI(xf86configptr->conf_dri);