diff options
author | Dave Airlie <airlied@linux.ie> | 2009-04-15 18:26:06 +1000 |
---|---|---|
committer | Dave Airlie <airlied@linux.ie> | 2009-04-15 18:39:55 +1000 |
commit | faf7dfa099f5b42a703313fbd1bf8afdad07a179 (patch) | |
tree | b7f3e732359d06027888a268f49482764b9a49a5 | |
parent | efa31092d6703397121a0ada4f7205a8ecad3d3d (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
-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 dacb5d27d..ac066a85f 100644 --- a/hw/xfree86/modes/xf86RandR12.c +++ b/hw/xfree86/modes/xf86RandR12.c | |||
@@ -754,8 +754,8 @@ Bool | |||
754 | xf86RandR12CreateScreenResources (ScreenPtr pScreen) | 754 | xf86RandR12CreateScreenResources (ScreenPtr pScreen) |
755 | { | 755 | { |
756 | ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum]; | 756 | ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum]; |
757 | xf86CrtcConfigPtr config = XF86_CRTC_CONFIG_PTR(pScrn); | 757 | xf86CrtcConfigPtr config; |
758 | XF86RandRInfoPtr randrp = XF86RANDRINFO(pScreen); | 758 | XF86RandRInfoPtr randrp; |
759 | int c; | 759 | int c; |
760 | int width, height; | 760 | int width, height; |
761 | int mmWidth, mmHeight; | 761 | int mmWidth, mmHeight; |
@@ -765,6 +765,8 @@ xf86RandR12CreateScreenResources (ScreenPtr pScreen) | |||
765 | return TRUE; | 765 | return TRUE; |
766 | #endif | 766 | #endif |
767 | 767 | ||
768 | config = XF86_CRTC_CONFIG_PTR(pScrn); | ||
769 | randrp = XF86RANDRINFO(pScreen); | ||
768 | /* | 770 | /* |
769 | * Compute size of screen | 771 | * Compute size of screen |
770 | */ | 772 | */ |