summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDave Airlie <airlied@redhat.com>2009-07-28 10:06:20 +1000
committerDave Airlie <airlied@redhat.com>2009-07-28 10:06:20 +1000
commit810dd8f15c40271b75bb8a124709eadb5e4c36a8 (patch)
treeb228c185c0a609387bf6aa4999ef815795c959a9
parent9fd00d01cacae9724649699bf8e0af1e16dbe356 (diff)
geode: switch to using correct pci config interface
-rw-r--r--src/geode_driver.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/geode_driver.c b/src/geode_driver.c
index 9c0611b..4c7239e 100644
--- a/src/geode_driver.c
+++ b/src/geode_driver.c
@@ -476,11 +476,12 @@ AmdProbe(DriverPtr drv, int flags)
/* so take the first one */
for (i = 0; i < numUsed; i++) {
/* Allocate a ScrnInfoRec */
- ScrnInfoPtr pScrni = xf86AllocateScreen(drv, 0);
-
+ ScrnInfoPtr pScrni = NULL;
EntityInfoPtr pEnt = xf86GetEntityInfo(usedChips[i]);
PciChipsets *p_id;
+ pScrni = xf86ConfigPciEntity(pScrni, 0, usedChips[i],
+ GeodePCIchipsets, NULL, NULL, NULL, NULL, NULL);
for (p_id = GeodePCIchipsets; p_id->numChipset != -1;
p_id++) {
if (pEnt->chipset == p_id->numChipset) {
@@ -517,8 +518,7 @@ AmdProbe(DriverPtr drv, int flags)
drvr_setup(pScrni);
foundScreen = TRUE;
- xf86ConfigActivePciEntity(pScrni, usedChips[i],
- GeodePCIchipsets, NULL, NULL, NULL, NULL, NULL);
+
}
}
}