fdo-mirrors/xserver
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/xorg/xserver.git synced 2026-02-08 05:40:34 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'fix-modesettimg-multiple-kmsdev-probe' into 'master'

Browse source 
modesetting: Fix Probe method for multiple devices

See merge request xorg/xserver!543
This commit is contained in:
Daniel Abrecht 2026-01-22 19:45:24 +00:00
commit cf147271fa
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
hw/xfree86/drivers/modesetting/driver.c
View file

@ -480,7 +480,6 @@ Probe(DriverPtr drv, int flags)
GDevPtr *devSections;
Bool foundScreen = FALSE;
const char *dev;
ScrnInfoPtr scrn = NULL;
/* For now, just bail out for PROBE_DETECT. */
if (flags & PROBE_DETECT)
@ -495,12 +494,13 @@ Probe(DriverPtr drv, int flags)
}
for (i = 0; i < numDevSections; i++) {
ScrnInfoPtr scrn = NULL;
int entity_num;
dev = xf86FindOptionValue(devSections[i]->options, "kmsdev");
if (probe_hw(dev, NULL)) {
entity_num = xf86ClaimFbSlot(drv, 0, devSections[i], TRUE);
scrn = xf86ConfigFbEntity(scrn, 0, entity_num, NULL, NULL, NULL, NULL);
entity_num = xf86ClaimNoSlot(drv, 0, devSections[i], TRUE);
scrn = xf86ConfigFbEntity(NULL, devSections[i]->myScreenSection->device != devSections[i] ? XF86_ALLOCATE_GPU_SCREEN : 0, entity_num, NULL, NULL, NULL, NULL);
}
if (scrn) {