diff options
| author | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2010-08-22 12:24:55 +0000 |
|---|---|---|
| committer | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2010-08-22 12:24:55 +0000 |
| commit | f23300683699bc2ce1fa9f0f17cdde28c221d92e (patch) | |
| tree | 1b182d22eadc536c2e1472f32a5c56b9c16b1e82 /driver/xf86-video-mga/src/mga_driver.c | |
| parent | 03c00c180c5a4f6a52f30cb5a45d251b750a8051 (diff) | |
Update to xf86-video-mga 1.4.13.
Diffstat (limited to 'driver/xf86-video-mga/src/mga_driver.c')
| -rw-r--r-- | driver/xf86-video-mga/src/mga_driver.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/driver/xf86-video-mga/src/mga_driver.c b/driver/xf86-video-mga/src/mga_driver.c index de86791ce..94c645435 100644 --- a/driver/xf86-video-mga/src/mga_driver.c +++ b/driver/xf86-video-mga/src/mga_driver.c @@ -2433,7 +2433,7 @@ MGAPreInit(ScrnInfoPtr pScrn, int flags) break; case PCI_CHIP_MGAG200_SE_A_PCI: if (pScrn->videoRam < 2048){ - maxPitch = 1024; + maxPitch = 1280; } break; case PCI_CHIP_MGAG200: @@ -2462,11 +2462,6 @@ MGAPreInit(ScrnInfoPtr pScrn, int flags) xfree(linePitches); } - /* Some X compute displayWidth from inferred virtual without - checking pitch limit. */ - if(pMga->Chipset == PCI_CHIP_MGAG200_SE_A_PCI && pScrn->videoRam < 2048) - pScrn->displayWidth = 1024; - if (i < 1 && pMga->FBDev) { fbdevHWUseBuildinMode(pScrn); pScrn->displayWidth = pScrn->virtualX; /* FIXME: might be wrong */ @@ -4332,7 +4327,7 @@ MGAValidMode(int scrnIndex, DisplayModePtr mode, Bool verbose, int flags) if (mode->VDisplay > 1200) return MODE_VIRTUAL_Y; if (pMga->reg_1e24 == 0x01 && - xf86ModeBandwidth(mode, pScrn->bitsPerPixel) > 256) + xf86ModeBandwidth(mode, pScrn->bitsPerPixel) > 244) return MODE_BANDWIDTH; } else if (pMga->is_G200WB){ if (mode->Flags & V_DBLSCAN) |