summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYannick Heneault <yheneaul@matrox.com>2010-07-22 10:51:15 -0400
committerYannick Heneault <yheneaul@matrox.com>2010-07-22 10:51:15 -0400
commit42d54a84a810c156c50b8f6643e4c8f315ed5f3e (patch)
tree6caa04b3f6186488ed319376f36371c70805a560
parent306c46f6a627e51b051c55ce3d7ffc9a87d2e452 (diff)
adjusted max bandwith and max pitch values for G200SE
-rw-r--r--src/mga_driver.c9
1 files changed, 2 insertions, 7 deletions
diff --git a/src/mga_driver.c b/src/mga_driver.c
index 6ee4271..5a1e9b4 100644
--- a/src/mga_driver.c
+++ b/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)