Skip to content

xfree86/common: make screenConfig take autoAddGPU into account #1659

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
metux merged 1 commit into from
Dec 13, 2025
Merged

xfree86/common: make screenConfig take autoAddGPU into account #1659

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions hw/xfree86/common/xf86Config.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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);
Expand Down