xf86-video-intel: Branch '2.9' - src/drmmode_display.c

[Carl Worth]

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

New commits:
commit f858cbe246c5d3a788ae25551b49142c5cc91f1a
Author: Dave Airlie <airlied at redhat.com>
Date:   Fri Oct 9 14:16:06 2009 +1000

    drmmode: with 1.7 server, set mode major doesn't get gamma setup.
    
    Noticed this on Fedora, where 1.7 server does gamma via the randr
    codepaths however kms doesn't have this call which happens in the
    non set_mode_major path.
    
    probably should be backported to released drivers.
    
    Signed-off-by: Dave Airlie <airlied at redhat.com>
    (cherry picked from commit 8a77877f9c2c6a8a1308bc1a3be9e7ad88bc7f49)

diff --git a/src/drmmode_display.c b/src/drmmode_display.c
index e8a6c01..7845fc5 100644
--- a/src/drmmode_display.c
+++ b/src/drmmode_display.c
@@ -363,6 +363,11 @@ drmmode_set_mode_major(xf86CrtcPtr crtc, DisplayModePtr mode,
 		goto done;
 #endif
 
+#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);