xf86-video-nv: src/g80_display.c

[Adam Jackson]

 src/g80_display.c |    8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

New commits:
commit 85638b2f0acc418aa77241dd123f7de76ea3ce8f
Author: Adam Jackson <ajax at redhat.com>
Date:   Tue Dec 15 16:42:15 2009 -0500

    g80: Add a no-op gamma hook so we don't crash on 1.7 servers
    
    Signed-off-by: Adam Jackson <ajax at redhat.com>

diff --git a/src/g80_display.c b/src/g80_display.c
index 3cbaac3..0cb9860 100644
--- a/src/g80_display.c
+++ b/src/g80_display.c
@@ -645,6 +645,12 @@ G80CrtcCommit(xf86CrtcPtr crtc)
     C(0x00000080, 0);
 }
 
+static void
+G80DispGammaSet(xf86CrtcPtr crtc, CARD16 *red, CARD16 *green, CARD16 *blue,
+		int size)
+{
+}
+
 static const xf86CrtcFuncsRec g80_crtc_funcs = {
     .dpms = G80CrtcDPMSSet,
     .save = NULL,
@@ -654,7 +660,7 @@ static const xf86CrtcFuncsRec g80_crtc_funcs = {
     .mode_fixup = G80CrtcModeFixup,
     .prepare = G80CrtcPrepare,
     .mode_set = G80CrtcModeSet,
-    // .gamma_set = G80DispGammaSet,
+    .gamma_set = G80DispGammaSet,
     .commit = G80CrtcCommit,
     .shadow_create = NULL,
     .shadow_destroy = NULL,