diff options
Diffstat (limited to 'xc/programs/Xserver/hw/xfree86/drivers/chips/ct_video.c')
| -rw-r--r-- | xc/programs/Xserver/hw/xfree86/drivers/chips/ct_video.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/xc/programs/Xserver/hw/xfree86/drivers/chips/ct_video.c b/xc/programs/Xserver/hw/xfree86/drivers/chips/ct_video.c index fc0fbffb3..864b7843b 100644 --- a/xc/programs/Xserver/hw/xfree86/drivers/chips/ct_video.c +++ b/xc/programs/Xserver/hw/xfree86/drivers/chips/ct_video.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/chips/ct_video.c,v 1.5 2000/09/22 11:35:48 alanh Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/chips/ct_video.c,v 1.6 2001/02/15 18:36:11 eich Exp $ */ #include "xf86.h" #include "xf86_OSproc.h" @@ -58,8 +58,9 @@ void CHIPSInitVideo(ScreenPtr pScreen) CHIPSPtr cPtr = CHIPSPTR(pScrn); int num_adaptors; - if(!(cPtr->Flags & ChipsOverlay8plus16) && - (cPtr->Flags & ChipsVideoSupport)) { + if (!(cPtr->Flags & ChipsOverlay8plus16) && + (cPtr->Flags & ChipsVideoSupport) + && (cPtr->Flags & ChipsAccelSupport)) { newAdaptor = CHIPSSetupImageVideo(pScreen); CHIPSInitOffscreenImages(pScreen); } @@ -390,12 +391,10 @@ CHIPSStopVideo(ScrnInfoPtr pScrn, pointer data, Bool exit) CHIPSPtr cPtr = CHIPSPTR(pScrn); unsigned char mr3c, tmp; - ErrorF("StopVideo\n"); REGION_EMPTY(pScrn->pScreen, &pPriv->clip); CHIPSHiQVSync(pScrn); if(exit) { if(pPriv->videoStatus & CLIENT_VIDEO_ON) { - ErrorF("StopVideo Exit\n"); mr3c = cPtr->readMR(cPtr, 0x3C); cPtr->writeMR(cPtr, 0x3C, (mr3c & 0xFE)); tmp = cPtr->readXR(cPtr, 0xD0); @@ -610,7 +609,6 @@ CHIPSDisplayVideo( CHIPSHiQVSync(pScrn); - ErrorF("DisplayVideo\n"); tmp = cPtr->readXR(cPtr, 0xD0); cPtr->writeXR(cPtr, 0xD0, (tmp | 0x10)); @@ -629,7 +627,8 @@ CHIPSDisplayVideo( tmp |= 0x08; break; case FOURCC_YV12: /* YV12 */ - tmp |= 0x03; + /* tmp |= 0x03 */ + tmp |= 0x00; break; case FOURCC_YUY2: /* YUY2 */ default: |