Module Name: xsrc
Committed By: rjs
Date: Mon Jul 16 09:55:14 UTC 2018
Modified Files:
xsrc/external/mit/xf86-video-nv/dist/src: nv_exa.c
Log Message:
Fix cats build.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 xsrc/external/mit/xf86-video-nv/dist/src/nv_exa.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_exa.c
diff -u xsrc/external/mit/xf86-video-nv/dist/src/nv_exa.c:1.1 xsrc/external/mit/xf86-video-nv/dist/src/nv_exa.c:1.2
--- xsrc/external/mit/xf86-video-nv/dist/src/nv_exa.c:1.1 Thu Jul 12 21:19:54 2018
+++ xsrc/external/mit/xf86-video-nv/dist/src/nv_exa.c Mon Jul 16 09:55:13 2018
@@ -21,7 +21,7 @@
* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
-/* $NetBSD: nv_exa.c,v 1.1 2018/07/12 21:19:54 macallan Exp $ */
+/* $NetBSD: nv_exa.c,v 1.2 2018/07/16 09:55:13 rjs Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -238,23 +238,6 @@ NvDownloadFromScreen(PixmapPtr pSrc, int
return TRUE;
}
-#ifdef __arm__
-static Bool
-NvPrepareAccess(PixmapPtr pPix, int index)
-{
- ScrnInfoPtr pScrn = xf86Screens[pPix->drawable.pScreen->myNum];
- NVPtr pNv = NVPTR(pScrn);
-
- IgsWaitReady(fPtr);
- return TRUE;
-}
-
-static void
-NvFinishAccess(PixmapPtr pPix, int index)
-{
-}
-#endif
-
Bool
NvInitExa(ScreenPtr pScreen)
{
@@ -326,9 +309,5 @@ NvInitExa(ScreenPtr pScreen)
*/
pExa->UploadToScreen = NvUploadToScreen;
pExa->DownloadFromScreen = NvDownloadFromScreen;
-#ifdef __arm__
- pExa->PrepareAccess = IgsPrepareAccess;
- pExa->FinishAccess = IgsFinishAccess;
-#endif
return exaDriverInit(pScreen, pExa);
}
