Module Name: src
Committed By: mlelstv
Date: Sun Jul 19 13:22:42 UTC 2015
Modified Files:
src/sys/dev/wscons: wsconsio.h wsdisplay_vcons.c
Log Message:
use optimized refresh with VCONS_DRAW_INTR even when in polling mode.
To generate a diff of this commit:
cvs rdiff -u -r1.113 -r1.114 src/sys/dev/wscons/wsconsio.h
cvs rdiff -u -r1.33 -r1.34 src/sys/dev/wscons/wsdisplay_vcons.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/wscons/wsconsio.h
diff -u src/sys/dev/wscons/wsconsio.h:1.113 src/sys/dev/wscons/wsconsio.h:1.114
--- src/sys/dev/wscons/wsconsio.h:1.113 Mon May 18 14:27:49 2015
+++ src/sys/dev/wscons/wsconsio.h Sun Jul 19 13:22:42 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: wsconsio.h,v 1.113 2015/05/18 14:27:49 jmcneill Exp $ */
+/* $NetBSD: wsconsio.h,v 1.114 2015/07/19 13:22:42 mlelstv Exp $ */
/*
* Copyright (c) 1996, 1997 Christopher G. Demetriou. All rights reserved.
@@ -657,4 +657,24 @@ struct wsdisplayio_fbinfo {
#define WSDISPLAYIO_GET_FBINFO _IOWR('W', 104, struct wsdisplayio_fbinfo)
+struct wsdisplayio_blit {
+ uint32_t serial;
+ uint32_t op;
+ uint32_t srcx;
+ uint32_t srcy;
+ uint32_t dstx;
+ uint32_t dsty;
+ uint32_t width;
+ uint32_t height;
+ uint32_t pen;
+};
+
+/* blit ops */
+#define WSFB_BLIT_FILL 1 /* fill rectangle */
+#define WSFB_BLIT_COPY 2 /* copy rectangle */
+#define WSFB_BLIT_TRANS 3 /* copy rectangle with color key */
+
+#define WSDISPLAYIO_DOBLIT _IOWR('W', 105, struct wsdisplayio_blit)
+#define WSDISPLAYIO_WAITBLIT _IOWR('W', 106, struct wsdisplayio_blit)
+
#endif /* _DEV_WSCONS_WSCONSIO_H_ */
Index: src/sys/dev/wscons/wsdisplay_vcons.c
diff -u src/sys/dev/wscons/wsdisplay_vcons.c:1.33 src/sys/dev/wscons/wsdisplay_vcons.c:1.34
--- src/sys/dev/wscons/wsdisplay_vcons.c:1.33 Mon Nov 10 20:52:47 2014
+++ src/sys/dev/wscons/wsdisplay_vcons.c Sun Jul 19 13:22:42 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: wsdisplay_vcons.c,v 1.33 2014/11/10 20:52:47 jmcneill Exp $ */
+/* $NetBSD: wsdisplay_vcons.c,v 1.34 2015/07/19 13:22:42 mlelstv Exp $ */
/*-
* Copyright (c) 2005, 2006 Michael Lorenz
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wsdisplay_vcons.c,v 1.33 2014/11/10 20:52:47 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wsdisplay_vcons.c,v 1.34 2015/07/19 13:22:42 mlelstv Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -736,9 +736,10 @@ vcons_copycols(void *cookie, int row, in
vcons_lock(scr);
if (SCREEN_IS_VISIBLE(scr) && SCREEN_CAN_DRAW(scr)) {
- scr->scr_vd->copycols(cookie, row, srccol, dstcol, ncols);
#if defined(VCONS_DRAW_INTR)
- vcons_invalidate_cache(scr->scr_vd);
+ vcons_update_screen(scr);
+#else
+ scr->scr_vd->copycols(cookie, row, srccol, dstcol, ncols);
#endif
}
vcons_unlock(scr);
@@ -907,9 +908,10 @@ vcons_copyrows(void *cookie, int srcrow,
vcons_lock(scr);
if (SCREEN_IS_VISIBLE(scr) && SCREEN_CAN_DRAW(scr)) {
- scr->scr_vd->copyrows(cookie, srcrow, dstrow, nrows);
#if defined(VCONS_DRAW_INTR)
- vcons_invalidate_cache(scr->scr_vd);
+ vcons_update_screen(scr);
+#else
+ scr->scr_vd->copyrows(cookie, srcrow, dstrow, nrows);
#endif
}
vcons_unlock(scr);
