xf86-video-ati: Branch 'master'

[Dave Airlie]

 src/drmmode_display.c |    2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 9d596562496863d65850306d2126d8df98464de4
Author: Dave Airlie <airlied at linux.ie>
Date:   Mon Oct 5 18:35:20 2009 +1000

    kms: only touch gamma stuff on 1.7
    
    for correct colormap operation you probably want 1.7

diff --git a/src/drmmode_display.c b/src/drmmode_display.c
index 6f3f6df..f82dec8 100644
--- a/src/drmmode_display.c
+++ b/src/drmmode_display.c
@@ -297,8 +297,10 @@ drmmode_set_mode_major(xf86CrtcPtr crtc, DisplayModePtr mode,
 		if (!xf86CrtcRotate(crtc)) {
 			goto done;
 		}
+#if XORG_VERSION_CURRENT >= XORG_VERSION_NUMERIC(1,7,0,0,0)
 		crtc->funcs->gamma_set(crtc, crtc->gamma_red, crtc->gamma_green,
 				       crtc->gamma_blue, crtc->gamma_size);
+#endif
 		
 		drmmode_ConvertToKMode(crtc->scrn, &kmode, mode);