diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/via_driver.c | 22 | ||||
| -rw-r--r-- | src/via_xvmc.c | 3 |
2 files changed, 12 insertions, 13 deletions
diff --git a/src/via_driver.c b/src/via_driver.c index 789c7d4..2aec99c 100644 --- a/src/via_driver.c +++ b/src/via_driver.c @@ -2102,7 +2102,6 @@ static Bool viaWriteModeV4L(ScrnInfoPtr pScrn, DisplayModePtr mode) { VIAPtr pVia = VIAPTR(pScrn); - vgaHWPtr hwp = VGAHWPTR(pScrn); DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO, "viaWriteModeV4L\n")); @@ -2117,16 +2116,8 @@ viaWriteModeV4L(ScrnInfoPtr pScrn, DisplayModePtr mode) pVia->V4Lfd = -1; return FALSE; } - - /* Save MCLK value*/ - pVia->swov.Save_3C4_16 = hwp->readSeq(hwp, 0x16); - pVia->swov.Save_3C4_17 = hwp->readSeq(hwp, 0x17); - pVia->swov.Save_3C4_18 = hwp->readSeq(hwp, 0x18); - - DBG_DD(ErrorF("Store 3c4.16 : %08x \n", pVia->swov.Save_3C4_16)); - DBG_DD(ErrorF(" 3c4.17 : %08x \n", pVia->swov.Save_3C4_17)); - DBG_DD(ErrorF(" 3c4.18 : %08x \n", pVia->swov.Save_3C4_18)); return TRUE; + } /* @@ -2454,6 +2445,8 @@ VIAWriteMode(ScrnInfoPtr pScrn, DisplayModePtr mode) { VIAPtr pVia = VIAPTR(pScrn); VIABIOSInfoPtr pBIOSInfo = pVia->pBIOSInfo; + vgaHWPtr hwp = VGAHWPTR(pScrn); + DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO, "VIAWriteMode\n")); @@ -2499,6 +2492,15 @@ VIAWriteMode(ScrnInfoPtr pScrn, DisplayModePtr mode) viaWriteModeV4L(pScrn, mode); #endif + /* Save MCLK value*/ + pVia->swov.Save_3C4_16 = hwp->readSeq(hwp, 0x16); + pVia->swov.Save_3C4_17 = hwp->readSeq(hwp, 0x17); + pVia->swov.Save_3C4_18 = hwp->readSeq(hwp, 0x18); + + DBG_DD(ErrorF("Store 3c4.16 : %08x \n", pVia->swov.Save_3C4_16)); + DBG_DD(ErrorF(" 3c4.17 : %08x \n", pVia->swov.Save_3C4_17)); + DBG_DD(ErrorF(" 3c4.18 : %08x \n", pVia->swov.Save_3C4_18)); + VIAAdjustFrame(pScrn->scrnIndex, pScrn->frameX0, pScrn->frameY0, 0); return TRUE; } diff --git a/src/via_xvmc.c b/src/via_xvmc.c index 32504d0..e283f2c 100644 --- a/src/via_xvmc.c +++ b/src/via_xvmc.c @@ -947,9 +947,6 @@ int viaXvMCInterceptPutImage( ScrnInfoPtr pScrn,short src_x, short src_y, clipBoxes, data); } - - - unsigned long viaXvMCPutImageSize(ScrnInfoPtr pScrn) { return sizeof(ViaXvMCCommandBuffer); |