diff options
| author | Alan Coopersmith <alan.coopersmith@oracle.com> | 2023-12-07 18:36:00 -0800 |
|---|---|---|
| committer | Alan Coopersmith <alan.coopersmith@oracle.com> | 2023-12-07 18:36:00 -0800 |
| commit | de5aa430a225ccc526cb55ca72c899bc2a199653 (patch) | |
| tree | 0079d77bb9ff47c7f753b385baeff926a2aae3ef | |
| parent | 64c525938c3a338625f36dab6a8543216a1cfb48 (diff) | |
Don't call xf86DisableRandR in ABI_VIDEODRV_VERSION 24 & later
The API was removed by Xserver commit dd00e5466a0e4ea313d1860824da4123692827ed
in xorg-server-1.20.0 and later.
Found by gcc -Werror=implicit:
savage_driver.c: In function ‘SavagePreInit’:
savage_driver.c:1237:13: error: implicit declaration of function
‘xf86DisableRandR’; did you mean ‘xf86DisableIO’?
[-Werror=implicit-function-declaration]
1237 | xf86DisableRandR();
| ^~~~~~~~~~~~~~~~
| xf86DisableIO
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
| -rw-r--r-- | src/savage_driver.c | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/src/savage_driver.c b/src/savage_driver.c index c473275..d97c23c 100644 --- a/src/savage_driver.c +++ b/src/savage_driver.c @@ -1234,17 +1234,29 @@ static Bool SavagePreInit(ScrnInfoPtr pScrn, int flags) psav->shadowFB = TRUE; psav->rotate = 1; +#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 24 xf86DisableRandR(); xf86DrvMsg(pScrn->scrnIndex, X_CONFIG, "Rotating screen clockwise" "- acceleration and RandR disabled\n"); +#else + xf86DrvMsg(pScrn->scrnIndex, X_CONFIG, + "Rotating screen clockwise" + "- acceleration disabled\n"); +#endif } else if(!xf86NameCmp(s, "CCW")) { psav->shadowFB = TRUE; psav->rotate = -1; +#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 24 xf86DisableRandR(); xf86DrvMsg(pScrn->scrnIndex, X_CONFIG, "Rotating screen counter clockwise" " - acceleration and RandR disabled\n"); +#else + xf86DrvMsg(pScrn->scrnIndex, X_CONFIG, + "Rotating screen counter clockwise" + " - acceleration disabled\n"); +#endif } else { xf86DrvMsg(pScrn->scrnIndex, X_CONFIG, "\"%s\" is not a valid" |