diff options
| author | Kevin Brace <kevinbrace@bracecomputerlab.com> | 2019-11-26 09:31:22 -0800 |
|---|---|---|
| committer | Kevin Brace <kevinbrace@gmx.com> | 2019-11-26 09:31:22 -0800 |
| commit | 5d816e15d8bbafa59b072e5fd561e1897a0ea04b (patch) | |
| tree | e09ea7cf303f403bd54801d7392a3305ec7ee91f | |
| parent | dfe2ce49b5e9664787f5677507eba7ea0446fb7e (diff) | |
Do not call xf86DisableRandR() for X Server 1.20
This is needed for X Server 1.20 support.
Signed-off-by: Kevin Brace <kevinbrace@bracecomputerlab.com>
| -rw-r--r-- | src/sis_driver.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/sis_driver.c b/src/sis_driver.c index 8a62572..51c9660 100644 --- a/src/sis_driver.c +++ b/src/sis_driver.c @@ -8985,7 +8985,7 @@ SISScreenInit(SCREEN_INIT_ARGS_DECL) case 24: refreshArea = SISRefreshArea24; break; case 32: refreshArea = SISRefreshArea32; break; } -#if XF86_VERSION_CURRENT >= XF86_VERSION_NUMERIC(4,3,0,0,0) +#if (XF86_VERSION_CURRENT >= XF86_VERSION_NUMERIC(4,3,0,0,0)) && (GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 24) xf86DisableRandR(); xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Driver rotation enabled, disabling RandR\n"); @@ -8998,7 +8998,7 @@ SISScreenInit(SCREEN_INIT_ARGS_DECL) if(!pSiS->PointerMoved) pSiS->PointerMoved = pScrn->PointerMoved; pScrn->PointerMoved = SISPointerMovedReflect; refreshArea = SISRefreshAreaReflect; -#if XF86_VERSION_CURRENT >= XF86_VERSION_NUMERIC(4,3,0,0,0) +#if (XF86_VERSION_CURRENT >= XF86_VERSION_NUMERIC(4,3,0,0,0)) && (GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 24) xf86DisableRandR(); xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Driver reflection enabled, disabling RandR\n"); @@ -9109,7 +9109,7 @@ SISScreenInit(SCREEN_INIT_ARGS_DECL) pSiS->Rotate = 0; pSiS->Reflect = 0; pSiS->ShadowFB = FALSE; -#if XF86_VERSION_CURRENT >= XF86_VERSION_NUMERIC(4,3,0,0,0) +#if (XF86_VERSION_CURRENT >= XF86_VERSION_NUMERIC(4,3,0,0,0)) && (GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 24) if(pSiS->CRT1XOffs || pSiS->CRT1YOffs || pSiS->CRT2XOffs || pSiS->CRT2YOffs) { xf86DisableRandR(); xf86DrvMsg(pScrn->scrnIndex, X_INFO, |