diff options
| author | Ian Romanick <idr@umwelt.(none)> | 2006-07-26 11:46:52 -0700 |
|---|---|---|
| committer | Ian Romanick <idr@umwelt.(none)> | 2006-07-26 11:46:52 -0700 |
| commit | 95e0722ff2e8878cdd6bb0e349eecab042b879db (patch) | |
| tree | 03b801974e76f5feb3df4755f434952cb1faf6a8 /src/mga_dac3026.c | |
| parent | 78c12368fa1c1985f41ce856ff453a967429870a (diff) | |
Current state of MGA driver modified to work with the xserver
pci-rework branch.
Diffstat (limited to 'src/mga_dac3026.c')
| -rw-r--r-- | src/mga_dac3026.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/mga_dac3026.c b/src/mga_dac3026.c index 1eddefd..5f879fd 100644 --- a/src/mga_dac3026.c +++ b/src/mga_dac3026.c @@ -746,8 +746,8 @@ MGA3026Restore(ScrnInfoPtr pScrn, vgaRegPtr vgaReg, MGARegPtr mgaReg, for (i = 0; i < 6; i++) OUTREG16(0x1FDE, (mgaReg->ExtVga[i] << 8) | i); - pciSetBitsLong(pMga->PciTag, PCI_OPTION_REG, OPTION_MASK, - mgaReg->Option); + pci_device_cfg_write_bits(pMga, OPTION_MASK, mgaReg->Option, + PCI_OPTION_REG); MGA_NOT_HAL( /* select pixel clock PLL as clock source */ @@ -866,7 +866,8 @@ MGA3026Save(ScrnInfoPtr pScrn, vgaRegPtr vgaReg, MGARegPtr mgaReg, for (i = 0; i < DACREGSIZE; i++) mgaReg->DacRegs[i] = inTi3026(MGADACregs[i]); - mgaReg->Option = pciReadLong(pMga->PciTag, PCI_OPTION_REG); + pci_device_cfg_read_u32(pMga->PciInfo, & mgaReg->Option, + PCI_OPTION_REG); #ifdef DEBUG ErrorF("read: %02X %02X %02X %02X %02X %02X %08lX\n", |