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

Adjust newPipe code for BIOS's starting at 1200

This commit is contained in:
Alan Hourihane 2005-08-02 16:22:42 +00:00
parent da7b85176f
commit fd6d7d7f7e
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/i830_driver.c
View File

@ -2697,16 +2697,22 @@ I830BIOSPreInit(ScrnInfoPtr pScrn, int flags)
xf86DrvMsg(pScrn->scrnIndex, X_INFO, "BIOS Build: %d\n",pI830->bios_version);
if (IS_I915G(pI830) || IS_I915GM(pI830) || IS_I945G(pI830))
/* Great..
* Intel changed the BIOS version codes and started at 1200.
* We know that bios codes for 830M started around 2400.
* So we test those conditions to make this judgement. Ugh.
*/
if (pI830->availablePipes == 2 && pI830->bios_version < 2000)
pI830->newPipeSwitch = TRUE;
else
if (pI830->availablePipes == 2 && pI830->bios_version >= 3062) {
else if (pI830->availablePipes == 2 && pI830->bios_version >= 3062)
/* BIOS build 3062 changed the pipe switching functionality */
pI830->newPipeSwitch = TRUE;
xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Using new Pipe switch code\n");
} else
else
pI830->newPipeSwitch = FALSE;
if (pI830->newPipeSwitch)
xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Using new Pipe switch code\n");
pI830->devicePresence = FALSE;
from = X_DEFAULT;
if (xf86ReturnOptValBool(pI830->Options, OPTION_DEVICE_PRESENCE, FALSE)) {
@ -3467,7 +3473,7 @@ SetFenceRegs(ScrnInfoPtr pScrn)
for (i = 0; i < 8; i++) {
OUTREG(FENCE + i * 4, pI830->ModeReg.Fence[i]);
if (I810_DEBUG & DEBUG_VERBOSE_VGA)
ErrorF("Fence Register : %lx\n", pI830->ModeReg.Fence[i]);
ErrorF("Fence Register : %x\n", pI830->ModeReg.Fence[i]);
}
}