xserver: Branch 'master'

[Eric Anholt]

 hw/xfree86/modes/xf86Crtc.c |   20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

New commits:
commit f716e3f3445d443cbc6507d27f806e9ad387120a
Author: Eric Anholt <eric at anholt.net>
Date:   Fri Jan 30 20:10:21 2009 -0800

    modes: Protect xf86_crtc_supports_gamma() from non-RandR 1.2 drivers.

diff --git a/hw/xfree86/modes/xf86Crtc.c b/hw/xfree86/modes/xf86Crtc.c
index 217e01c..30308ad 100644
--- a/hw/xfree86/modes/xf86Crtc.c
+++ b/hw/xfree86/modes/xf86Crtc.c
@@ -3155,15 +3155,19 @@ xf86_crtc_notify(ScreenPtr screen)
 Bool
 xf86_crtc_supports_gamma(ScrnInfoPtr pScrn)
 {
-    xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(pScrn);
-    xf86CrtcPtr crtc;
+    if (xf86CrtcConfigPrivateIndex != -1) {
+	xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(pScrn);
+	xf86CrtcPtr crtc;
 
-    if ((xf86CrtcConfigPrivateIndex == -1) || !xf86_config)
-	return FALSE;
+	if (!xf86_config)
+	    return FALSE;
 
-    if (xf86_config->num_crtc == 0)
-	return FALSE;
-    crtc = xf86_config->crtc[0];
+	if (xf86_config->num_crtc == 0)
+	    return FALSE;
+	crtc = xf86_config->crtc[0];
 
-    return (crtc->funcs->gamma_set != NULL);
+	return (crtc->funcs->gamma_set != NULL);
+    }
+
+    return FALSE;
 }