Module Name: xsrc
Committed By: mrg
Date: Thu Jul 4 06:47:13 UTC 2024
Modified Files:
xsrc/external/mit/xf86-video-nv/dist/src: nv_driver.c riva_driver.c
xsrc/external/mit/xf86-video-savage/dist/src: savage_driver.c
Log Message:
fix merge botch.
To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 \
xsrc/external/mit/xf86-video-nv/dist/src/nv_driver.c
cvs rdiff -u -r1.4 -r1.5 \
xsrc/external/mit/xf86-video-nv/dist/src/riva_driver.c
cvs rdiff -u -r1.6 -r1.7 \
xsrc/external/mit/xf86-video-savage/dist/src/savage_driver.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/xf86-video-nv/dist/src/nv_driver.c
diff -u xsrc/external/mit/xf86-video-nv/dist/src/nv_driver.c:1.14 xsrc/external/mit/xf86-video-nv/dist/src/nv_driver.c:1.15
--- xsrc/external/mit/xf86-video-nv/dist/src/nv_driver.c:1.14 Thu Jul 4 06:40:39 2024
+++ xsrc/external/mit/xf86-video-nv/dist/src/nv_driver.c Thu Jul 4 06:47:13 2024
@@ -2663,7 +2663,6 @@ NVScreenInit(SCREEN_INIT_ARGS_DECL)
if(!pNv->RandRRotation) {
#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 24
xf86DisableRandR();
-#endif
xf86DrvMsg(pScrn->scrnIndex, X_INFO,
"Driver rotation enabled, RandR disabled\n");
#else
Index: xsrc/external/mit/xf86-video-nv/dist/src/riva_driver.c
diff -u xsrc/external/mit/xf86-video-nv/dist/src/riva_driver.c:1.4 xsrc/external/mit/xf86-video-nv/dist/src/riva_driver.c:1.5
--- xsrc/external/mit/xf86-video-nv/dist/src/riva_driver.c:1.4 Thu Jul 4 06:40:39 2024
+++ xsrc/external/mit/xf86-video-nv/dist/src/riva_driver.c Thu Jul 4 06:47:13 2024
@@ -1212,7 +1212,6 @@ RivaScreenInit(SCREEN_INIT_ARGS_DECL)
}
#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 24
xf86DisableRandR();
-#endif
xf86DrvMsg(pScrn->scrnIndex, X_INFO,
"Driver rotation enabled, RandR disabled\n");
#else
Index: xsrc/external/mit/xf86-video-savage/dist/src/savage_driver.c
diff -u xsrc/external/mit/xf86-video-savage/dist/src/savage_driver.c:1.6 xsrc/external/mit/xf86-video-savage/dist/src/savage_driver.c:1.7
--- xsrc/external/mit/xf86-video-savage/dist/src/savage_driver.c:1.6 Thu Jul 4 06:40:39 2024
+++ xsrc/external/mit/xf86-video-savage/dist/src/savage_driver.c Thu Jul 4 06:47:13 2024
@@ -1238,7 +1238,6 @@ static Bool SavagePreInit(ScrnInfoPtr pS
psav->rotate = 1;
#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 24
xf86DisableRandR();
-#endif
xf86DrvMsg(pScrn->scrnIndex, X_CONFIG,
"Rotating screen clockwise"
"- acceleration and RandR disabled\n");
@@ -1252,7 +1251,6 @@ static Bool SavagePreInit(ScrnInfoPtr pS
psav->rotate = -1;
#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 24
xf86DisableRandR();
-#endif
xf86DrvMsg(pScrn->scrnIndex, X_CONFIG,
"Rotating screen counter clockwise"
" - acceleration and RandR disabled\n");
