xf86-video-nv: src/g80_display.c src/g80_sor.c

[Aaron Plattner]

 src/g80_display.c |    4 ----
 src/g80_sor.c     |    6 ------
 2 files changed, 10 deletions(-)

New commits:
commit 470c5c662f25d4e27b7d8d25974498aaaae1bf2c
Author: Gaetan Nadon <memsize at videotron.ca>
Date:   Mon Jul 19 17:01:59 2010 -0700

    Remove RANDR_12_INTERFACE checking, always defined.
    
    RANDR_12_INTERFACE is defined in xserver/randr/randstr.h since version 1.2.
    This driver only configures against xserver 1.3 or higher.
    
    Reported-by: Aaron Plattner <aplattner at nvidia.com>
    Signed-off-by: Gaetan Nadon <memsize at videotron.ca>
    Signed-off-by: Aaron Plattner <aplattner at nvidia.com>

diff --git a/src/g80_display.c b/src/g80_display.c
index 8c8e5bd..ae946a8 100644
--- a/src/g80_display.c
+++ b/src/g80_display.c
@@ -734,11 +734,7 @@ G80LoadPalette(ScrnInfoPtr pScrn, int numColors, int *indices, LOCO *colors,
         }
 
         /* Make the change through RandR */
-#ifdef RANDR_12_INTERFACE
         RRCrtcGammaSet(crtc->randr_crtc, lut_r, lut_g, lut_b);
-#else
-        crtc->funcs->gamma_set(crtc, lut_r, lut_g, lut_b, 256);
-#endif
     }
 }
 
diff --git a/src/g80_sor.c b/src/g80_sor.c
index 314be96..0c3279f 100644
--- a/src/g80_sor.c
+++ b/src/g80_sor.c
@@ -265,7 +265,6 @@ G80SorGetLVDSModes(xf86OutputPtr output)
     return xf86DuplicateMode(pPriv->nativeMode);
 }
 
-#ifdef RANDR_12_INTERFACE
 #define MAKE_ATOM(a) MakeAtom((a), sizeof(a) - 1, TRUE);
 
 struct property {
@@ -407,7 +406,6 @@ G80SorSetProperty(xf86OutputPtr output, Atom prop, RRPropertyValuePtr val)
 
     return TRUE;
 }
-#endif // RANDR_12_INTERFACE
 
 static const xf86OutputFuncsRec G80SorTMDSOutputFuncs = {
     .dpms = G80SorDPMSSet,
@@ -420,10 +418,8 @@ static const xf86OutputFuncsRec G80SorTMDSOutputFuncs = {
     .mode_set = G80SorModeSet,
     .detect = G80SorDetect,
     .get_modes = G80OutputGetDDCModes,
-#ifdef RANDR_12_INTERFACE
     .create_resources = G80SorCreateResources,
     .set_property = G80SorSetProperty,
-#endif
     .destroy = G80SorDestroy,
 };
 
@@ -438,10 +434,8 @@ static const xf86OutputFuncsRec G80SorLVDSOutputFuncs = {
     .mode_set = G80SorModeSet,
     .detect = G80SorLVDSDetect,
     .get_modes = G80SorGetLVDSModes,
-#ifdef RANDR_12_INTERFACE
     .create_resources = G80SorCreateResources,
     .set_property = G80SorSetProperty,
-#endif
     .destroy = G80SorDestroy,
 };