diff options
| author | Dave Airlie <airlied@redhat.com> | 2010-10-27 16:31:48 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2010-10-27 16:31:48 +1000 |
| commit | f5e1475a942d5474b04f400729411378da893980 (patch) | |
| tree | d339e14f7a4dae91b452094e9e09ba269e1e514c | |
| parent | e4d84d8f8a4e83556d407ffd66ea699395652091 (diff) | |
randr/xinerama: remove checks blocking protocols from operating together
| -rw-r--r-- | hw/xfree86/common/xf86RandR.c | 4 | ||||
| -rw-r--r-- | hw/xfree86/modes/xf86RandR12.c | 6 | ||||
| -rw-r--r-- | randr/rrxinerama.c | 4 |
3 files changed, 8 insertions, 6 deletions
diff --git a/hw/xfree86/common/xf86RandR.c b/hw/xfree86/common/xf86RandR.c index d7ffff4ca..a0669a0d1 100644 --- a/hw/xfree86/common/xf86RandR.c +++ b/hw/xfree86/common/xf86RandR.c @@ -420,8 +420,8 @@ xf86RandRInit (ScreenPtr pScreen) #ifdef PANORAMIX /* XXX disable RandR when using Xinerama */ - if (!noPanoramiXExtension) - return TRUE; + // if (!noPanoramiXExtension) + // return TRUE; #endif xf86RandRKey = &xf86RandRKeyRec; diff --git a/hw/xfree86/modes/xf86RandR12.c b/hw/xfree86/modes/xf86RandR12.c index ba0862a6c..e6c781dd6 100644 --- a/hw/xfree86/modes/xf86RandR12.c +++ b/hw/xfree86/modes/xf86RandR12.c @@ -743,8 +743,8 @@ xf86RandR12CreateScreenResources (ScreenPtr pScreen) int mmWidth, mmHeight; #ifdef PANORAMIX /* XXX disable RandR when using Xinerama */ - if (!noPanoramiXExtension) - return TRUE; + // if (!noPanoramiXExtension) + // return TRUE; #endif config = XF86_CRTC_CONFIG_PTR(pScrn); @@ -846,6 +846,7 @@ xf86RandR12Init (ScreenPtr pScreen) XF86RandRInfoPtr randrp; #ifdef PANORAMIX +#if 0 /* XXX disable RandR when using Xinerama */ if (!noPanoramiXExtension) { @@ -855,6 +856,7 @@ xf86RandR12Init (ScreenPtr pScreen) return TRUE; } #endif +#endif if (xf86RandR12Generation != serverGeneration) xf86RandR12Generation = serverGeneration; diff --git a/randr/rrxinerama.c b/randr/rrxinerama.c index 32a712852..3f32dd773 100644 --- a/randr/rrxinerama.c +++ b/randr/rrxinerama.c @@ -78,8 +78,8 @@ void RRXineramaExtensionInit(void) { #ifdef PANORAMIX - if(!noPanoramiXExtension) - return; + // if(!noPanoramiXExtension) + // return; #endif /* |