From 49187eddb5ac57baa0297f28f5b32cedc0cb77e5 Mon Sep 17 00:00:00 2001 From: "Enrico Weigelt, metux IT consult" Date: Wed, 22 May 2024 20:17:02 +0200 Subject: [PATCH] drop unused SISDEINT code path This never had been enabled since it's incarnation back two decades ago. Fixes: b41edc0ad1ecd95fc6c0a52d4ab0edb55ae4d323 Part-of: --- src/sis.h | 3 --- src/sis_video.c | 57 +--------------------------------------------- src/sis_video.h | 11 +-------- src/sis_videostr.h | 3 --- 4 files changed, 2 insertions(+), 72 deletions(-) diff --git a/src/sis.h b/src/sis.h index f0621e6..b37d800 100644 --- a/src/sis.h +++ b/src/sis.h @@ -1159,9 +1159,6 @@ typedef struct { Atom xvDisableGfx, xvDisableGfxLR, xvTVXPosition, xvTVYPosition; Atom xvDisableColorkey, xvUseChromakey, xvChromaMin, xvChromaMax; Atom xvInsideChromakey, xvYUVChromakey, xvVSync; -#ifdef SISDEINT - Atom xvdeintmeth; -#endif Atom xvGammaRed, xvGammaGreen, xvGammaBlue; int xv_sisdirectunlocked; int SiS76xLFBSize; diff --git a/src/sis_video.c b/src/sis_video.c index ff57178..8529d61 100644 --- a/src/sis_video.c +++ b/src/sis_video.c @@ -955,9 +955,6 @@ SISSetupImageVideo(ScreenPtr pScreen) pSiS->xvYUVChromakey = MAKE_ATOM(sisxvyuvchromakey); pSiS->xvChromaMin = MAKE_ATOM(sisxvchromamin); pSiS->xvChromaMax = MAKE_ATOM(sisxvchromamax); -#ifdef SISDEINT - pSiS->xvdeintmeth = MAKE_ATOM(sisxvdeinterlace); -#endif pSiS->xv_sisdirectunlocked = 0; @@ -1137,12 +1134,6 @@ SISSetPortAttribute(ScrnInfoPtr pScrn, Atom attribute, pPriv->chromamin = value; } else if(attribute == pSiS->xvChromaMax) { pPriv->chromamax = value; -#ifdef SISDEINT - } else if(attribute == pSiS->xvdeintmeth) { - if(value < 0) value = 0; - if(value > 4) value = 4; - pPriv->deinterlacemethod = value; -#endif } else if(attribute == pSiS->xvHue) { if(pSiS->VGAEngine == SIS_315_VGA) { if((value < -8) || (value > 7)) return BadValue; @@ -1230,10 +1221,6 @@ SISGetPortAttribute(ScrnInfoPtr pScrn, Atom attribute, *value = pPriv->chromamin; } else if(attribute == pSiS->xvChromaMax) { *value = pPriv->chromamax; -#ifdef SISDEINT - } else if(attribute == pSiS->xvdeintmeth) { - *value = pPriv->deinterlacemethod; -#endif } else if(attribute == pSiS->xvHue) { if(pSiS->VGAEngine == SIS_315_VGA) { *value = pPriv->hue; @@ -2581,26 +2568,7 @@ SISDisplayVideo(ScrnInfoPtr pScrn, SISPortPrivPtr pPriv) overlay.keyOP = VI_ROP_DestKey; } -#ifdef SISDEINT - switch(pPriv->deinterlacemethod) { - case 1: - overlay.bobEnable = 0x02; - /* overlay.bobEnable |= (pPriv->currentBuf) ? 0x00 : 0x10; */ - break; - case 2: - overlay.bobEnable = 0x08; - /* overlay.bobEnable |= (pPriv->currentBuf) ? 0x00 : 0x10; */ - break; - case 3: - overlay.bobEnable = 0x0a; - /* overlay.bobEnable |= (pPriv->currentBuf) ? 0x00 : 0x10; */ - break; - default: -#endif - overlay.bobEnable = 0x00; /* Disable BOB de-interlacer */ -#ifdef SISDEINT - } -#endif + overlay.bobEnable = 0x00; /* Disable BOB de-interlacer */ #ifdef SISMERGED if(pSiS->MergedFB) { @@ -3376,9 +3344,6 @@ SISPutImage( int myreds[] = { 0x000000ff, 0x0000f800, 0, 0x00ff0000 }; #endif int totalSize = 0; -#ifdef SISDEINT - Bool deintfm = (pPriv->deinterlacemethod > 1) ? TRUE : FALSE; -#endif #if 0 xf86DrvMsg(0, X_INFO, "PutImage: src %dx%d-%dx%d, drw %dx%d-%dx%d, id %x, w %d h %d, buf %p\n", @@ -3460,23 +3425,6 @@ SISPutImage( if(!(pPriv->bufAddr[0] = SISAllocateFBMemory(pScrn, &pPriv->handle, totalSize << 1))) return BadAlloc; -#ifdef SISDEINT - if(deintfm) { - pPriv->bufAddr[1] = pPriv->bufAddr[0] + pPriv->srcPitch; - - { - CARD8 *src = (CARD8 *)buf; - CARD8 *dest = (CARD8 *)(pSiS->FbBase + pPriv->bufAddr[pPriv->currentBuf]); - int i = height; - while(i--) { - SiSMemCopyToVideoRam(pSiS, dest, src, pPriv->srcPitch); - src += pPriv->srcPitch; - dest += (pPriv->srcPitch << 1); - } - } - - } else { -#endif pPriv->bufAddr[1] = pPriv->bufAddr[0] + totalSize; /* copy data */ @@ -3493,9 +3441,6 @@ SISPutImage( *dest++ = *src++; } } -#ifdef SISDEINT - } -#endif SISDisplayVideo(pScrn, pPriv); diff --git a/src/sis_video.h b/src/sis_video.h index 9291bf3..686ec09 100644 --- a/src/sis_video.h +++ b/src/sis_video.h @@ -205,10 +205,6 @@ static char sisxvinsidechromakey[] = "XV_INSIDE_CHROMAKEY"; static char sisxvyuvchromakey[] = "XV_YUV_CHROMAKEY"; static char sisxvchromamin[] = "XV_CHROMAMIN"; static char sisxvchromamax[] = "XV_CHROMAMAX"; -#ifdef SISDEINT -static char sisxvdeinterlace[] = "XV_OVERLAY_DEINTERLACING_METHOD"; -#endif - static char sisxvvsync[] = "XV_SYNC_TO_VBLANK"; /***********************************************/ @@ -241,9 +237,6 @@ static XF86AttributeRec SISAttributes_300[] = {XvSettable | XvGettable, 0, 1, sisxvyuvchromakey}, {XvSettable | XvGettable, 0, (1 << 24) - 1, sisxvchromamin}, {XvSettable | XvGettable, 0, (1 << 24) - 1, sisxvchromamax}, -#ifdef SISDEINT - {XvSettable | XvGettable, 0, 4, sisxvdeinterlace}, -#endif {0 , 0, 0, NULL} }; @@ -268,9 +261,6 @@ static XF86AttributeRec SISAttributes_315[] = {XvSettable | XvGettable, 0, 1, sisxvinsidechromakey}, {XvSettable | XvGettable, 0, (1 << 24) - 1, sisxvchromamin}, {XvSettable | XvGettable, 0, (1 << 24) - 1, sisxvchromamax}, -#ifdef SISDEINT - {XvSettable | XvGettable, 0, 4, sisxvdeinterlace}, -#endif {XvSettable | XvGettable, 0, 1, sisxvswitchcrt}, {0 , 0, 0, NULL} }; @@ -283,6 +273,7 @@ static XF86AttributeRec SISAttributes_315[] = #define PIXEL_FMT_UYVY FOURCC_UYVY /* 0x59565955 */ #define PIXEL_FMT_YUY2 FOURCC_YUY2 /* 0x32595559 */ #define PIXEL_FMT_I420 FOURCC_I420 /* 0x30323449 */ + #define PIXEL_FMT_RGB5 0x35315652 #define PIXEL_FMT_RGB6 0x36315652 #define PIXEL_FMT_YVYU 0x55595659 /* 315/330+ only */ diff --git a/src/sis_videostr.h b/src/sis_videostr.h index a5b556d..3827c4e 100644 --- a/src/sis_videostr.h +++ b/src/sis_videostr.h @@ -63,9 +63,6 @@ typedef struct { Bool usechromakey; Bool insidechromakey, yuvchromakey; CARD32 chromamin, chromamax; -#ifdef SISDEINT - int deinterlacemethod; -#endif CARD32 videoStatus; Bool overlayStatus;