frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

make busID non mandatory 

Currently the driver only probes a device when it has a
busID. The busID is optional so don't depend on it.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Signed-off-by: Dave Airlie <airlied@redhat.com>
This commit is contained in:
Sascha Hauer 2012-03-03 14:09:25 +01:00 committed by Dave Airlie
parent bb7e39c1f2
commit 53204d5c8b
1 changed files with 21 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
hw/xfree86/drivers/modesetting/driver.c
View File

@ -273,32 +273,30 @@ Probe(DriverPtr drv, int flags)
for (i = 0; i < numDevSections; i++) { for (i = 0; i < numDevSections; i++) {
dev = xf86FindOptionValue(devSections[i]->options,"kmsdev"); dev = xf86FindOptionValue(devSections[i]->options,"kmsdev");
if (devSections[i]->busID) { if (probe_hw(dev)) {
if (probe_hw(dev)) { int entity;
int entity; entity = xf86ClaimFbSlot(drv, 0, devSections[i], TRUE);
entity = xf86ClaimFbSlot(drv, 0, devSections[i], TRUE); scrn = xf86ConfigFbEntity(scrn, 0, entity,
scrn = xf86ConfigFbEntity(scrn, 0, entity, NULL, NULL, NULL, NULL);
NULL, NULL, NULL, NULL); }
}
if (scrn) { if (scrn) {
foundScreen = TRUE; foundScreen = TRUE;
scrn->driverVersion = 1; scrn->driverVersion = 1;
scrn->driverName = "modesetting"; scrn->driverName = "modesetting";
scrn->name = "modesetting"; scrn->name = "modesetting";
scrn->Probe = Probe; scrn->Probe = Probe;
scrn->PreInit = PreInit; scrn->PreInit = PreInit;
scrn->ScreenInit = ScreenInit; scrn->ScreenInit = ScreenInit;
scrn->SwitchMode = SwitchMode; scrn->SwitchMode = SwitchMode;
scrn->AdjustFrame = AdjustFrame; scrn->AdjustFrame = AdjustFrame;
scrn->EnterVT = EnterVT; scrn->EnterVT = EnterVT;
scrn->LeaveVT = LeaveVT; scrn->LeaveVT = LeaveVT;
scrn->FreeScreen = FreeScreen; scrn->FreeScreen = FreeScreen;
scrn->ValidMode = ValidMode; scrn->ValidMode = ValidMode;
xf86DrvMsg(scrn->scrnIndex, X_INFO, xf86DrvMsg(scrn->scrnIndex, X_INFO,
"using %s\n", dev ? dev : "default device"); "using %s\n", dev ? dev : "default device");
}
} }
} }