Module Name: xsrc
Committed By: macallan
Date: Sun Oct 27 11:09:37 UTC 2024
Modified Files:
xsrc/external/mit/xf86-video-ngle/dist/src: ngle_cursor.c ngle_driver.c
Log Message:
due to the strange way colour maps and cursor bitmaps are accessed on at least
some cards, make sure we do not skip the PrepareAccess() dance after those.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 \
xsrc/external/mit/xf86-video-ngle/dist/src/ngle_cursor.c
cvs rdiff -u -r1.5 -r1.6 \
xsrc/external/mit/xf86-video-ngle/dist/src/ngle_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-ngle/dist/src/ngle_cursor.c
diff -u xsrc/external/mit/xf86-video-ngle/dist/src/ngle_cursor.c:1.1 xsrc/external/mit/xf86-video-ngle/dist/src/ngle_cursor.c:1.2
--- xsrc/external/mit/xf86-video-ngle/dist/src/ngle_cursor.c:1.1 Wed Oct 16 11:00:36 2024
+++ xsrc/external/mit/xf86-video-ngle/dist/src/ngle_cursor.c Sun Oct 27 11:09:37 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: ngle_cursor.c,v 1.1 2024/10/16 11:00:36 macallan Exp $ */
+/* $NetBSD: ngle_cursor.c,v 1.2 2024/10/27 11:09:37 macallan Exp $ */
/*
* Copyright (c) 2005 Michael Lorenz
* All rights reserved.
@@ -65,6 +65,7 @@ NGLELoadCursorImage(ScrnInfoPtr pScrn, u
pNGLE->cursor.mask = src + pNGLE->maskoffset;
if(ioctl(pNGLE->fd, WSDISPLAYIO_SCURSOR, &pNGLE->cursor) == -1)
xf86Msg(X_ERROR, "NGLELoadCursorImage: %d\n", errno);
+ pNGLE->hwmode = -1;
}
void
@@ -135,6 +136,7 @@ NGLESetCursorColors(ScrnInfoPtr pScrn, i
pNGLE->cursor.cmap.count = 2;
if(ioctl(pNGLE->fd, WSDISPLAYIO_SCURSOR, &pNGLE->cursor) == -1)
xf86Msg(X_ERROR, "NGLESetCursorColors: %d\n", errno);
+ pNGLE->hwmode = -1;
}
Bool
Index: xsrc/external/mit/xf86-video-ngle/dist/src/ngle_driver.c
diff -u xsrc/external/mit/xf86-video-ngle/dist/src/ngle_driver.c:1.5 xsrc/external/mit/xf86-video-ngle/dist/src/ngle_driver.c:1.6
--- xsrc/external/mit/xf86-video-ngle/dist/src/ngle_driver.c:1.5 Fri Oct 25 09:02:25 2024
+++ xsrc/external/mit/xf86-video-ngle/dist/src/ngle_driver.c Sun Oct 27 11:09:37 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: ngle_driver.c,v 1.5 2024/10/25 09:02:25 macallan Exp $ */
+/* $NetBSD: ngle_driver.c,v 1.6 2024/10/27 11:09:37 macallan Exp $ */
/*
* Copyright (c) 2024 Michael Lorenz
* All rights reserved.
@@ -746,6 +746,7 @@ NGLELoadPalette(ScrnInfoPtr pScrn, int n
if (ioctl(fPtr->fd,WSDISPLAYIO_PUTCMAP, &cmap) == -1)
ErrorF("ioctl FBIOPUTCMAP: %s\n", strerror(errno));
}
+ fPtr->hwmode = -1;
}
static Bool
