Merge branch 'issue-1140' into 'master'

Draft: xfree86/modes: Use per-screen monitor for all outputs by default

See merge request xorg/xserver!615
This commit is contained in:
Olivier Certner 2025-12-08 11:46:28 +00:00
commit 22b67ca5c7
2 changed files with 4 additions and 3 deletions

View file

@ -1607,7 +1607,7 @@ following format:
for a VGA output)
.PP
In the absence of specific association of monitor sections to outputs, if a
monitor section is present the server will associate it with an output to
monitor section is present the server will associate it with all outputs to
preserve compatibility for previous single-head configurations.
.PP
Specifying video modes is optional because the server will use the DDC or other

View file

@ -651,9 +651,10 @@ xf86OutputCreate(ScrnInfoPtr scrn,
}
output->subpixel_order = SubPixelUnknown;
/*
* Use the old per-screen monitor section for the first output
* Use the old per-screen monitor section for all outputs that are
* not explicitly associated to a given monitor.
*/
output->use_screen_monitor = (xf86_config->num_output == 0);
output->use_screen_monitor = 1;
#ifdef RANDR_12_INTERFACE
output->randr_output = NULL;
#endif