diff options
| author | Dave Airlie <airlied@redhat.com> | 2009-07-28 10:03:14 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2009-07-28 10:03:14 +1000 |
| commit | c5c69f9de5d11fd2cadc4ccf00bcf2e8cf65f2eb (patch) | |
| tree | 7ca5b8d7d06d433d4e1e0399d54d639f2efabb01 | |
| parent | c41a1188ce53b8975e6d5c34c54a77a3f3c291bc (diff) | |
s3: switch to using config pci entity instead of active
| -rw-r--r-- | src/s3_driver.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/s3_driver.c b/src/s3_driver.c index d5b01bf..a751cee 100644 --- a/src/s3_driver.c +++ b/src/s3_driver.c @@ -277,7 +277,9 @@ static Bool S3Probe(DriverPtr drv, int flags) if (flags & PROBE_DETECT) foundScreen = TRUE; else for (i=0; i<numUsed; i++) { - ScrnInfoPtr pScrn = xf86AllocateScreen(drv, 0); + ScrnInfoPtr pScrn = NULL; + pScrn = xf86ConfigPciEntity(pScrn, 0, usedChips[i], S3PciChipsets, + NULL, NULL, NULL, NULL, NULL); pScrn->driverVersion = VERSION_MAJOR; pScrn->driverName = DRIVER_NAME; @@ -292,9 +294,6 @@ static Bool S3Probe(DriverPtr drv, int flags) pScrn->FreeScreen = S3FreeScreen; foundScreen = TRUE; - - xf86ConfigActivePciEntity(pScrn, usedChips[i], S3PciChipsets, - NULL, NULL, NULL, NULL, NULL); } xfree(usedChips); |