Aurelien
/
xf86-video-intel
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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.
This commit is contained in:
Eric Anholt 2006-04-03 15:32:41 -07:00 committed by Eric Anholt
parent 1f0ba458d0
commit ceb08d28f4
1 changed files with 1 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/i830_driver.c
View File

@ -657,27 +657,6 @@ SetPipeAccess(ScrnInfoPtr pScrn)
return TRUE;
}
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)
{
@ -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,