xserver: Branch 'master'

[Dave Airlie]

 hw/xfree86/modes/xf86RandR12.c |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

New commits:
commit faf7dfa099f5b42a703313fbd1bf8afdad07a179
Author: Dave Airlie <airlied at linux.ie>
Date:   Wed Apr 15 18:26:06 2009 +1000

    randr12: looking up these bits if randr isn't initialised is bad.
    
    When xinerama is enabled we don't get randr protocol, but the
    driver might still want randr internals

diff --git a/hw/xfree86/modes/xf86RandR12.c b/hw/xfree86/modes/xf86RandR12.c
index dacb5d2..ac066a8 100644
--- a/hw/xfree86/modes/xf86RandR12.c
+++ b/hw/xfree86/modes/xf86RandR12.c
@@ -754,8 +754,8 @@ Bool
 xf86RandR12CreateScreenResources (ScreenPtr pScreen)
 {
     ScrnInfoPtr		pScrn = xf86Screens[pScreen->myNum];
-    xf86CrtcConfigPtr   config = XF86_CRTC_CONFIG_PTR(pScrn);
-    XF86RandRInfoPtr	randrp = XF86RANDRINFO(pScreen);
+    xf86CrtcConfigPtr   config;
+    XF86RandRInfoPtr	randrp;
     int			c;
     int			width, height;
     int			mmWidth, mmHeight;
@@ -765,6 +765,8 @@ xf86RandR12CreateScreenResources (ScreenPtr pScreen)
 	return TRUE;
 #endif
 
+    config = XF86_CRTC_CONFIG_PTR(pScrn);
+    randrp = XF86RANDRINFO(pScreen);
     /*
      * Compute size of screen
      */