diff options
| author | Dave Airlie <airlied@linux.ie> | 2009-04-15 18:26:06 +1000 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2009-05-08 22:49:55 -0700 |
| commit | 7cd596e0dd6b9c195d7e395c26bfb00ef544c525 (patch) | |
| tree | 932fb446fe89741d9060d268f2e641ba4f54a5e2 | |
| parent | bc95f29441b3daa7b9d91bd3c2b3e502a3a8cc81 (diff) | |
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
(cherry picked from commit faf7dfa099f5b42a703313fbd1bf8afdad07a179)
Signed-off-by: Keith Packard <keithp@keithp.com>
| -rw-r--r-- | hw/xfree86/modes/xf86RandR12.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/hw/xfree86/modes/xf86RandR12.c b/hw/xfree86/modes/xf86RandR12.c index 6f93a0dc3..454649213 100644 --- a/hw/xfree86/modes/xf86RandR12.c +++ b/hw/xfree86/modes/xf86RandR12.c @@ -752,8 +752,8 @@ _X_EXPORT 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; @@ -763,6 +763,8 @@ xf86RandR12CreateScreenResources (ScreenPtr pScreen) return TRUE; #endif + config = XF86_CRTC_CONFIG_PTR(pScrn); + randrp = XF86RANDRINFO(pScreen); /* * Compute size of screen */ |