XLibre/xf86-video-nv
1
0
Fork 0
mirror of https://github.com/X11Libre/xf86-video-nv.git synced 2026-03-24 01:24:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Don't call xf86DisableRandR in ABI_VIDEODRV_VERSION 24 & later

Browse Source 
The API was removed by Xserver commit dd00e5466a0e4ea313d1860824da4123692827ed
in xorg-server-1.20.0 and later.

Found by gcc -Werror=implicit:

riva_driver.c: In function ‘RivaScreenInit’:
riva_driver.c:1213:12: error: implicit declaration of function
 ‘xf86DisableRandR’; did you mean ‘xf86DisableIO’?
 [-Werror=implicit-function-declaration]
 1213 |            xf86DisableRandR();
      |            ^~~~~~~~~~~~~~~~
      |            xf86DisableIO
nv_driver.c: In function ‘NVScreenInit’:
nv_driver.c:2635:16: error: implicit declaration of function
 ‘xf86DisableRandR’; did you mean ‘xf86DisableIO’?
 [-Werror=implicit-function-declaration]
 2635 |                xf86DisableRandR();
      |                ^~~~~~~~~~~~~~~~
      |                xf86DisableIO

Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
This commit is contained in:
Alan Coopersmith
2023-12-07 18:23:53 -08:00
parent b536401064
commit e64b5ac6db
2 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/nv_driver.c
View File

@@ -2632,9 +2632,14 @@ NVScreenInit(SCREEN_INIT_ARGS_DECL)
case 32: refreshArea = NVRefreshArea32; break;
}
if(!pNv->RandRRotation) {
#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 24
xf86DisableRandR();
xf86DrvMsg(pScrn->scrnIndex, X_INFO,
"Driver rotation enabled, RandR disabled\n");
#else
xf86DrvMsg(pScrn->scrnIndex, X_INFO,
"Driver rotation enabled\n");
#endif
}
}
pNv->refreshArea = refreshArea;

5
src/riva_driver.c
View File

@@ -1210,9 +1210,14 @@ RivaScreenInit(SCREEN_INIT_ARGS_DECL)
case 16: refreshArea = RivaRefreshArea16; break;
case 32: refreshArea = RivaRefreshArea32; break;
}
#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 24
xf86DisableRandR();
xf86DrvMsg(pScrn->scrnIndex, X_INFO,
"Driver rotation enabled, RandR disabled\n");
#else
xf86DrvMsg(pScrn->scrnIndex, X_INFO,
"Driver rotation enabled\n");
#endif
}
ShadowFBInit(pScreen, refreshArea);