drop ifdef on SISGAMMARAMP

It's always enabled, so no nede for the extra ifdef's.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/driver/xf86-video-sis/-/merge_requests/17>

4 files changed, 0 insertions, 18 deletions

diff --git a/src/sis.h b/src/sis.h
index 56ac854..06b9d8a 100644
--- a/src/sis.h
+++ b/src/sis.h
@@ -190,8 +190,6 @@
 #define SISCHECKOSSSE		/* Automatic check OS for SSE; requires SigIll facility */
 #endif
 
-#define SISGAMMARAMP		/* Driver can set gamma ramp; requires additional symbols in xf86sym.h */
-
 #ifdef TWDEBUG
 #define SISVERBLEVEL 3
 #else
diff --git a/src/sis_driver.c b/src/sis_driver.c
index af77f36..7e638e5 100644
--- a/src/sis_driver.c
+++ b/src/sis_driver.c
@@ -611,7 +611,6 @@ calcgammaval(int j, int nramp, float invgamma, float bri, float c)
     return (unsigned short)v;
 }
 
-#ifdef SISGAMMARAMP
 void
 SISCalculateGammaRamp(ScreenPtr pScreen, ScrnInfoPtr pScrn)
 {
@@ -700,7 +699,6 @@ SISCalculateGammaRamp(ScreenPtr pScreen, ScrnInfoPtr pScrn)
    free(ramp[2]);
    ramp[0] = ramp[1] = ramp[2] = NULL;
 }
-#endif
 
 void
 SISCalculateGammaRampCRT2(ScrnInfoPtr pScrn)
@@ -8664,7 +8662,6 @@ SISScreenInit(SCREEN_INIT_ARGS_DECL)
     }
 
     /* Recalculate our gamma ramp for brightness feature */
-#ifdef SISGAMMARAMP
     if((pSiS->GammaBriR != 1000) ||
        (pSiS->GammaBriB != 1000) ||
        (pSiS->GammaBriG != 1000) ||
@@ -8676,7 +8673,6 @@ SISScreenInit(SCREEN_INIT_ARGS_DECL)
        (pSiS->NewGammaConB != 0.0)) {
        SISCalculateGammaRamp(pScreen, pScrn);
     }
-#endif
 
     /* Initialize Shadow framebuffer and screen rotation/reflection */
     if(pSiS->ShadowFB) {
@@ -8908,11 +8904,7 @@ SISScreenInit(SCREEN_INIT_ARGS_DECL)
        pSiS->SiS_SD_Flags &= ~SiS_SD_SUPPORTSGRCRT2;
     }
 
-#ifdef SISGAMMARAMP
     pSiS->SiS_SD_Flags |= SiS_SD_CANSETGAMMA;
-#else
-    pSiS->SiS_SD_Flags &= ~SiS_SD_CANSETGAMMA;
-#endif
 
     SiSCtrlExtInit(pScrn);
 
diff --git a/src/sis_driver.h b/src/sis_driver.h
index 16ccae9..e43d880 100644
--- a/src/sis_driver.h
+++ b/src/sis_driver.h
@@ -1620,9 +1620,7 @@ static void    SiSDumpModeInfo(ScrnInfoPtr pScrn, DisplayModePtr mode);
 #endif
 Bool           SISDetermineLCDACap(ScrnInfoPtr pScrn);
 void           SISSaveDetectedDevices(ScrnInfoPtr pScrn);
-#ifdef SISGAMMARAMP
 void	       SISCalculateGammaRamp(ScreenPtr pScreen, ScrnInfoPtr pScrn);
-#endif
 
 /* Our very own vgaHW functions (sis_vga.c) */
 extern void 	SiSVGASave(ScrnInfoPtr pScrn, SISRegPtr save, int flags);
diff --git a/src/sis_utility.c b/src/sis_utility.c
index 2e3073b..6d545d8 100644
--- a/src/sis_utility.c
+++ b/src/sis_utility.c
@@ -269,9 +269,7 @@ extern UShort	SiS_CheckModeCRT2(ScrnInfoPtr pScrn, DisplayModePtr mode,
 extern void	SISAdjustFrame(ADJUST_FRAME_ARGS_DECL);
 extern float	SiSCalcVRate(DisplayModePtr mode);
 extern void	SiS_UpdateGammaCRT2(ScrnInfoPtr pScrn);
-#ifdef SISGAMMARAMP
 extern void	SISCalculateGammaRamp(ScreenPtr pScreen, ScrnInfoPtr pScrn);
-#endif
 
 extern void	SISSetPortDefaults(ScrnInfoPtr pScrn, SISPortPrivPtr pPriv);
 extern void	SISUpdateVideoParms(SISPtr pSiS, SISPortPrivPtr pPriv);
@@ -1238,11 +1236,9 @@ SiSHandleSiSDirectCommand(xSiSCtrlCommandReply *sdcbuf)
 	       if(pSiS->CRT2SepGamma) {
 		  SiS_UpdateGammaCRT2(pScrn);
 	       }
-#ifdef SISGAMMARAMP
 	       else {
 		  SISCalculateGammaRamp(pScrn->pScreen, pScrn);
 	       }
-#endif
 	      /* ATTN: When disabling CRT2 sep gamma,
 	       * as long as SISGAMMARAMP is not defined,
 	       * application needs to reset palette using
@@ -2232,11 +2228,9 @@ SISSetPortUtilAttribute(ScrnInfoPtr pScrn, Atom attribute,
 	      if(pSiS->CRT2SepGamma) {
 		 SiS_UpdateGammaCRT2(pScrn);
 	      }
-#ifdef SISGAMMARAMP
 	      else {
 		 SISCalculateGammaRamp(pScrn->pScreen, pScrn);
 	      }
-#endif
 	      /* ATTN: When disabling CRT2 sep gamma,
 	       * as long as SISGAMMARAMP is not defined,
 	       * application needs to reset palette using