diff options
| author | Eric Anholt <anholt@FreeBSD.org> | 2006-04-03 15:32:41 -0700 |
|---|---|---|
| committer | Eric Anholt <anholt@leguin.anholt.net> | 2006-04-06 16:00:32 -0700 |
| commit | ceb08d28f4a4e9f42c9417938b8541bf1b4e8245 (patch) | |
| tree | 95a1454b31498fa554d5943cbd061449c54a4428 | |
| parent | 1f0ba458d02f7d4777c1669aae02138f3a6628c1 (diff) | |
Remove the hacky-looking Set640x480. I'll be removing things it depends on
(setpipe), and I suspect we'll end up with different hacks for resume, anyway.
| -rw-r--r-- | src/i830_driver.c | 23 |
1 files changed, 1 insertions, 22 deletions
diff --git a/src/i830_driver.c b/src/i830_driver.c index 99a4c29b..20541e0f 100644 --- a/src/i830_driver.c +++ b/src/i830_driver.c @@ -658,27 +658,6 @@ SetPipeAccess(ScrnInfoPtr pScrn) } static Bool -I830Set640x480(ScrnInfoPtr pScrn) -{ - I830Ptr pI830 = I830PTR(pScrn); - int m = 0x30; /* 640x480 8bpp */ - - switch (pScrn->depth) { - case 15: - m = 0x40; - break; - case 16: - m = 0x41; - break; - case 24: - m = 0x50; - break; - } - m |= (1 << 15) | (1 << 14); - return VBESetVBEMode(pI830->pVbe, m, NULL); -} - -static Bool GetBIOSVersion(ScrnInfoPtr pScrn, unsigned int *version) { vbeInfoPtr pVbe = I830PTR(pScrn)->pVbe; @@ -4542,7 +4521,7 @@ I830BIOSEnterVT(int scrnIndex, int flags) */ /* Check Pipe conf registers or possibly HTOTAL/VTOTAL for 0x00000000)*/ CARD32 temp = pI830->pipe ? INREG(PIPEBCONF) : INREG(PIPEACONF); - if (!I830Set640x480(pScrn) || !(temp & 0x80000000)) { + if (temp & 0x80000000) { xf86Int10InfoPtr pInt; xf86DrvMsg(pScrn->scrnIndex, X_INFO, |