diff options
| author | James Cloos <cloos@jhcloos.com> | 2007-09-03 06:07:32 -0400 |
|---|---|---|
| committer | James Cloos <cloos@jhcloos.com> | 2007-09-03 06:07:32 -0400 |
| commit | 6fde3fd6d34e7252ee16422b19896d71b1622039 (patch) | |
| tree | f14ab2b9dd93d9097d5f2c8a4085ee2b81a6f7fc /src/mga_dac3026.c | |
| parent | 4bfc1e1ea11604e3af150a4228663cb1cb1bf9f3 (diff) | |
| parent | 923176f5aad777b4023003a457bb77da21373389 (diff) | |
Merge branch 'master' of ssh://git.freedesktop.org/git/xorg/driver/xf86-video-mga
Diffstat (limited to 'src/mga_dac3026.c')
| -rw-r--r-- | src/mga_dac3026.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/src/mga_dac3026.c b/src/mga_dac3026.c index 1eddefd..e33f914 100644 --- a/src/mga_dac3026.c +++ b/src/mga_dac3026.c @@ -746,8 +746,13 @@ MGA3026Restore(ScrnInfoPtr pScrn, vgaRegPtr vgaReg, MGARegPtr mgaReg, for (i = 0; i < 6; i++) OUTREG16(0x1FDE, (mgaReg->ExtVga[i] << 8) | i); +#ifdef XSERVER_LIBPCIACCESS + pci_device_cfg_write_bits(pMga->PciInfo, OPTION_MASK, mgaReg->Option, + PCI_OPTION_REG); +#else pciSetBitsLong(pMga->PciTag, PCI_OPTION_REG, OPTION_MASK, mgaReg->Option); +#endif MGA_NOT_HAL( /* select pixel clock PLL as clock source */ @@ -866,7 +871,12 @@ MGA3026Save(ScrnInfoPtr pScrn, vgaRegPtr vgaReg, MGARegPtr mgaReg, for (i = 0; i < DACREGSIZE; i++) mgaReg->DacRegs[i] = inTi3026(MGADACregs[i]); +#ifdef XSERVER_LIBPCIACCESS + pci_device_cfg_read_u32(pMga->PciInfo, & mgaReg->Option, + PCI_OPTION_REG); +#else mgaReg->Option = pciReadLong(pMga->PciTag, PCI_OPTION_REG); +#endif #ifdef DEBUG ErrorF("read: %02X %02X %02X %02X %02X %02X %08lX\n", |