From 135a2518ecc14cce8a2d76e9d5081130743c3ac6 Mon Sep 17 00:00:00 2001 From: Matthieu Herrb Date: Tue, 15 May 2012 21:32:58 +0000 Subject: Update xf86-video-openchrome to 0.2.905 --- driver/xf86-video-openchrome/src/via_vt162x.c | 46 +++++++++++++++++---------- 1 file changed, 29 insertions(+), 17 deletions(-) (limited to 'driver/xf86-video-openchrome/src/via_vt162x.c') diff --git a/driver/xf86-video-openchrome/src/via_vt162x.c b/driver/xf86-video-openchrome/src/via_vt162x.c index aa64b336d..963e33d04 100644 --- a/driver/xf86-video-openchrome/src/via_vt162x.c +++ b/driver/xf86-video-openchrome/src/via_vt162x.c @@ -41,30 +41,42 @@ ViaSetTVClockSource(ScrnInfoPtr pScrn) VIABIOSInfoPtr pBIOSInfo = pVia->pBIOSInfo; vgaHWPtr hwp = VGAHWPTR(pScrn); - /* External TV: */ - switch(pVia->Chipset) { - case VIA_CX700: - case VIA_VX800: - if (pBIOSInfo->FirstCRTC->IsActive) { - if(pBIOSInfo->TVDIPort == VIA_DI_PORT_DVP1) - ViaCrtcMask(hwp, 0x6C, 0xB0, 0xF0); - else if(pBIOSInfo->TVDIPort == VIA_DI_PORT_DVP0) - ViaCrtcMask(hwp, 0x6C, 0x90, 0xF0); - } else { - /* IGA2 */ - if(pBIOSInfo->TVDIPort == VIA_DI_PORT_DVP1) - ViaCrtcMask(hwp, 0x6C, 0x0B, 0x0F); - else if(pBIOSInfo->TVDIPort == VIA_DI_PORT_DVP0) - ViaCrtcMask(hwp, 0x6C, 0x09, 0x0F); + switch(pBIOSInfo->TVEncoder) { + case VIA_VT1625: + /* External TV: */ + switch(pVia->Chipset) { + case VIA_CX700: + case VIA_VX800: + case VIA_VX855: + if (pBIOSInfo->FirstCRTC->IsActive) { + if(pBIOSInfo->TVDIPort == VIA_DI_PORT_DVP1) + ViaCrtcMask(hwp, 0x6C, 0xB0, 0xF0); + else if(pBIOSInfo->TVDIPort == VIA_DI_PORT_DVP0) + ViaCrtcMask(hwp, 0x6C, 0x90, 0xF0); + } else { + /* IGA2 */ + if(pBIOSInfo->TVDIPort == VIA_DI_PORT_DVP1) + ViaCrtcMask(hwp, 0x6C, 0x0B, 0x0F); + else if(pBIOSInfo->TVDIPort == VIA_DI_PORT_DVP0) + ViaCrtcMask(hwp, 0x6C, 0x09, 0x0F); + } + break; + default: + if (pBIOSInfo->FirstCRTC->IsActive) + ViaCrtcMask(hwp, 0x6C, 0x21, 0x21); + else + ViaCrtcMask(hwp, 0x6C, 0xA1, 0xA1); + break; } break; default: if (pBIOSInfo->FirstCRTC->IsActive) - ViaCrtcMask(hwp, 0x6C, 0x21, 0x21); + ViaCrtcMask(hwp, 0x6C, 0x50, 0xF0); else - ViaCrtcMask(hwp, 0x6C, 0xA1, 0xA1); + ViaCrtcMask(hwp, 0x6C, 0x05, 0x0F); break; } + } static void -- cgit v1.2.3