Commit ae0aeffa authored by Adam Jackson's avatar Adam Jackson

Pass the pci device (if any) through to fbdevhw in probe and preinit

Signed-off-by: Adam Jackson's avatarAdam Jackson <ajax@redhat.com>
parent 2673e727
...@@ -280,7 +280,7 @@ static Bool FBDevPciProbe(DriverPtr drv, int entity_num, ...@@ -280,7 +280,7 @@ static Bool FBDevPciProbe(DriverPtr drv, int entity_num,
pScrn->entityInstanceList[0]); pScrn->entityInstanceList[0]);
device = xf86FindOptionValue(devSection->options, "fbdev"); device = xf86FindOptionValue(devSection->options, "fbdev");
if (fbdevHWProbe(NULL, device, NULL)) { if (fbdevHWProbe(dev, device, NULL)) {
pScrn->driverVersion = FBDEV_VERSION; pScrn->driverVersion = FBDEV_VERSION;
pScrn->driverName = FBDEV_DRIVER_NAME; pScrn->driverName = FBDEV_DRIVER_NAME;
pScrn->name = FBDEV_NAME; pScrn->name = FBDEV_NAME;
...@@ -427,6 +427,7 @@ FBDevPreInit(ScrnInfoPtr pScrn, int flags) ...@@ -427,6 +427,7 @@ FBDevPreInit(ScrnInfoPtr pScrn, int flags)
int default_depth, fbbpp; int default_depth, fbbpp;
const char *s; const char *s;
int type; int type;
void *pci_dev;
if (flags & PROBE_DETECT) return FALSE; if (flags & PROBE_DETECT) return FALSE;
...@@ -454,9 +455,14 @@ FBDevPreInit(ScrnInfoPtr pScrn, int flags) ...@@ -454,9 +455,14 @@ FBDevPreInit(ScrnInfoPtr pScrn, int flags)
"xf86RegisterResources() found resource conflicts\n"); "xf86RegisterResources() found resource conflicts\n");
return FALSE; return FALSE;
} }
#else
if (fPtr->pEnt->location.type == BUS_PCI)
pci_dev = fPtr->pEnt->location.id.pci;
#endif #endif
/* open device */ /* open device */
if (!fbdevHWInit(pScrn,NULL,xf86FindOptionValue(fPtr->pEnt->device->options,"fbdev"))) if (!fbdevHWInit(pScrn, pci_dev,
xf86FindOptionValue(fPtr->pEnt->device->options,
"fbdev")))
return FALSE; return FALSE;
default_depth = fbdevHWGetDepth(pScrn,&fbbpp); default_depth = fbdevHWGetDepth(pScrn,&fbbpp);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment