Lines 167-172
Link Here
|
167 |
{ 0x10DE032C, "0x032C" }, |
167 |
{ 0x10DE032C, "0x032C" }, |
168 |
{ 0x10DE032D, "0x032D" }, |
168 |
{ 0x10DE032D, "0x032D" }, |
169 |
{ 0x10DE032F, "0x032F" }, |
169 |
{ 0x10DE032F, "0x032F" }, |
|
|
170 |
{ 0x10DE02A0,"Geforce3 XBox"}, |
170 |
{-1, NULL} |
171 |
{-1, NULL} |
171 |
}; |
172 |
}; |
172 |
|
173 |
|
Lines 1272-1277
Link Here
|
1272 |
case 0x0200: |
1273 |
case 0x0200: |
1273 |
case 0x0250: |
1274 |
case 0x0250: |
1274 |
case 0x0280: |
1275 |
case 0x0280: |
|
|
1276 |
case 0x02A0: |
1275 |
case 0x0300: |
1277 |
case 0x0300: |
1276 |
case 0x0310: |
1278 |
case 0x0310: |
1277 |
case 0x0320: |
1279 |
case 0x0320: |
Lines 1345-1351
Link Here
|
1345 |
clockRanges->maxClock = pNv->MaxClock; |
1347 |
clockRanges->maxClock = pNv->MaxClock; |
1346 |
clockRanges->clockIndex = -1; /* programmable */ |
1348 |
clockRanges->clockIndex = -1; /* programmable */ |
1347 |
if(((pNv->Chipset & 0x0ff0) <= 0x0100) || |
1349 |
if(((pNv->Chipset & 0x0ff0) <= 0x0100) || |
1348 |
((pNv->Chipset & 0x0ff0) == 0x0150)) |
1350 |
((pNv->Chipset & 0x0ff0) == 0x0150) || |
|
|
1351 |
((pNv->Chipset & 0x0ff0) == 0x02A0)) |
1349 |
{ |
1352 |
{ |
1350 |
clockRanges->interlaceAllowed = TRUE; |
1353 |
clockRanges->interlaceAllowed = TRUE; |
1351 |
} else /* Chips after NV15 (including NV11) do not support interlaced */ |
1354 |
} else /* Chips after NV15 (including NV11) do not support interlaced */ |
Lines 1584-1590
Link Here
|
1584 |
/* Program the registers */ |
1587 |
/* Program the registers */ |
1585 |
vgaHWProtect(pScrn, TRUE); |
1588 |
vgaHWProtect(pScrn, TRUE); |
1586 |
|
1589 |
|
1587 |
(*pNv->Restore)(pScrn, vgaReg, nvReg, FALSE); |
1590 |
if ((pNv->Chipset & 0x0ff0) != 0x02A0) |
|
|
1591 |
(*pNv->Restore)(pScrn, vgaReg, nvReg, FALSE); |
1588 |
|
1592 |
|
1589 |
#if X_BYTE_ORDER == X_BIG_ENDIAN |
1593 |
#if X_BYTE_ORDER == X_BIG_ENDIAN |
1590 |
/* turn on LFB swapping */ |
1594 |
/* turn on LFB swapping */ |
Lines 1628-1634
Link Here
|
1628 |
|
1632 |
|
1629 |
/* Only restore text mode fonts/text for the primary card */ |
1633 |
/* Only restore text mode fonts/text for the primary card */ |
1630 |
vgaHWProtect(pScrn, TRUE); |
1634 |
vgaHWProtect(pScrn, TRUE); |
1631 |
(*pNv->Restore)(pScrn, vgaReg, nvReg, pNv->Primary); |
1635 |
if ((pNv->Chipset & 0x0ff0) != 0x02A0) { |
|
|
1636 |
(*pNv->Restore)(pScrn, vgaReg, nvReg, pNv->Primary); |
1637 |
} |
1632 |
vgaHWProtect(pScrn, FALSE); |
1638 |
vgaHWProtect(pScrn, FALSE); |
1633 |
} |
1639 |
} |
1634 |
|
1640 |
|
Lines 1700-1705
Link Here
|
1700 |
if (!NVMapMem(pScrn)) |
1706 |
if (!NVMapMem(pScrn)) |
1701 |
return FALSE; |
1707 |
return FALSE; |
1702 |
} |
1708 |
} |
|
|
1709 |
if ((pNv->Chipset & 0x0ff0) == 0x02A0) |
1710 |
{ |
1711 |
pNv->riva.CURSOR = (U032 *)(pNv->FbStart + pNv->FbUsableSize); |
1712 |
DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO, "- CURSOR %x\n", pNv->riva.CURSOR)); |
1713 |
} |
1703 |
DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO, "- Mem Mapped\n")); |
1714 |
DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO, "- Mem Mapped\n")); |
1704 |
|
1715 |
|
1705 |
/* Map the VGA memory when the primary video */ |
1716 |
/* Map the VGA memory when the primary video */ |