summaryrefslogtreecommitdiff
authorDave Airlie <airlied@linux.ie>2009-04-15 08:26:06 (GMT)
committer Dave Airlie <airlied@linux.ie>2009-04-15 08:39:55 (GMT)
commitfaf7dfa099f5b42a703313fbd1bf8afdad07a179 (patch) (side-by-side diff)
treeb7f3e732359d06027888a268f49482764b9a49a5
parentefa31092d6703397121a0ada4f7205a8ecad3d3d (diff)
downloadxserver-faf7dfa099f5b42a703313fbd1bf8afdad07a179.zip
xserver-faf7dfa099f5b42a703313fbd1bf8afdad07a179.tar.gz
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
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--hw/xfree86/modes/xf86RandR12.c6
1 files changed, 4 insertions, 2 deletions
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
*/