rendered paste bodyIndex: src/via_swov.c
===================================================================
--- src/via_swov.c (revision 425)
+++ src/via_swov.c (working copy)
@@ -899,12 +899,12 @@
case PCI_CHIP_VT3205:
case PCI_CHIP_VT3204:
case PCI_CHIP_VT3259:
- case PCI_CHIP_VT3314:
VIDOutD(V3_ColorSpaceReg_1, col1);
VIDOutD(V3_ColorSpaceReg_2, col2);
DBG_DD(ErrorF("000002C4 %08lx\n", col1));
DBG_DD(ErrorF("000002C8 %08lx\n", col2));
break;
+ case PCI_CHIP_VT3314:
case PCI_CHIP_VT3327:
case PCI_CHIP_VT3336:
case PCI_CHIP_VT3324:
@@ -931,8 +931,8 @@
case PCI_CHIP_VT3205:
case PCI_CHIP_VT3204:
case PCI_CHIP_VT3259:
- case PCI_CHIP_VT3314:
return VIDEO_HQV_INUSE | SW_USE_HQV | VIDEO_3_INUSE;
+ case PCI_CHIP_VT3314:
case PCI_CHIP_VT3327:
case PCI_CHIP_VT3336:
case PCI_CHIP_VT3324:
@@ -968,8 +968,8 @@
case PCI_CHIP_VT3205:
case PCI_CHIP_VT3204:
case PCI_CHIP_VT3259:
- case PCI_CHIP_VT3314:
return V3_ENABLE | V3_EXPIRE_NUM_3205;
+ case PCI_CHIP_VT3314:
case PCI_CHIP_VT3327:
case PCI_CHIP_VT3336:
case PCI_CHIP_VT3324:
@@ -1723,13 +1723,10 @@
* FIXME:
* Enable video on secondary
*/
- if (pVia->Chipset == VIA_P4M900 &&
- pVia->pBIOSInfo->PanelActive) {
/* V1_ON_SND_DISPLAY */
vidCtl |= 0x80000000;
/* SECOND_DISPLAY_COLOR_KEY_ENABLE */
compose |= 0x00010000 | 0x1 ;
- }
viaOverlayGetV1V3Format(pVia, (videoFlag & VIDEO_1_INUSE) ? 1 : 3,
videoFlag, &vidCtl, &hqvCtl);