Module Name: src
Committed By: riz
Date: Wed Feb 13 20:52:07 UTC 2013
Modified Files:
src/external/mit/xorg/server/drivers [netbsd-6]: Makefile
src/external/mit/xorg/server/xorg-server [netbsd-6]: Makefile.common
src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos [netbsd-6]:
Makefile
src/sys/dev/wscons [netbsd-6]: wsdisplay_vconsvar.h
src/sys/dev/wsfb [netbsd-6]: genfb.c
Added Files:
src/distrib/sets/lists/xserver [netbsd-6]: md.evbarm
Log Message:
Pull up following revision(s) (requested by skrll in ticket #818):
xsrc/external/mit/xf86-video-wsfb/dist/src/wsfb_driver.c: revision 1.14
xsrc/external/mit/xf86-video-wsfb/dist/src/wsfb_driver.c: revision 1.15
external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile:
revision 1.32
external/mit/xorg/server/drivers/xf86-input-keyboard/Makefile: revision
1.15
sys/dev/wsfb/genfb.c: revision 1.49
distrib/sets/lists/xserver/md.evbarm: revision 1.1
sys/dev/wscons/wsdisplay_vconsvar.h: revision 1.22
external/mit/xorg/server/xorg-server/Makefile.common: revision 1.24
xsrc/external/mit/xf86-video-wsfb/dist/src/wsfb.h: revision 1.4
external/mit/xorg/server/drivers/Makefile: revision 1.61
sys/dev/wsfb/genfb.c: revision 1.50
enable X11 build for evbarm.
aprint_verbose -> aprint_debug
WSDISPLAY_TYPE_VC4 framebuffer is BGR
for WSDISPLAYIO_SMODE, if the bus ioctl handler returns EPASSTHROUGH, dont
treat it as an error
default to swkbd mode on evbarm as well, now X without config should work
properly on BeagleBoard, RPi and the like
fix a typo in a comment
use WSDISPLAYIO_GET_FBINFO if available
To generate a diff of this commit:
cvs rdiff -u -r0 -r1.5.2.2 src/distrib/sets/lists/xserver/md.evbarm
cvs rdiff -u -r1.60.4.1 -r1.60.4.2 \
src/external/mit/xorg/server/drivers/Makefile
cvs rdiff -u -r1.23.4.1 -r1.23.4.2 \
src/external/mit/xorg/server/xorg-server/Makefile.common
cvs rdiff -u -r1.31.4.1 -r1.31.4.2 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile
cvs rdiff -u -r1.21 -r1.21.2.1 src/sys/dev/wscons/wsdisplay_vconsvar.h
cvs rdiff -u -r1.47 -r1.47.2.1 src/sys/dev/wsfb/genfb.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/server/drivers/Makefile
diff -u src/external/mit/xorg/server/drivers/Makefile:1.60.4.1 src/external/mit/xorg/server/drivers/Makefile:1.60.4.2
--- src/external/mit/xorg/server/drivers/Makefile:1.60.4.1 Mon Jun 11 20:53:40 2012
+++ src/external/mit/xorg/server/drivers/Makefile Wed Feb 13 20:52:07 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.60.4.1 2012/06/11 20:53:40 riz Exp $
+# $NetBSD: Makefile,v 1.60.4.2 2013/02/13 20:52:07 riz Exp $
# xf86-input drivers
@@ -147,6 +147,11 @@ SUBDIR+= \
xf86-video-wsfb
.endif # ${MACHINE} == "dreamcast"
+.if ${MACHINE} == "evbarm"
+SUBDIR+= \
+ xf86-video-wsfb
+.endif # ${MACHINE} == "evbarm"
+
.if ${MACHINE} == "evbmips"
SUBDIR+= \
xf86-video-siliconmotion \
Index: src/external/mit/xorg/server/xorg-server/Makefile.common
diff -u src/external/mit/xorg/server/xorg-server/Makefile.common:1.23.4.1 src/external/mit/xorg/server/xorg-server/Makefile.common:1.23.4.2
--- src/external/mit/xorg/server/xorg-server/Makefile.common:1.23.4.1 Mon Jun 11 20:53:40 2012
+++ src/external/mit/xorg/server/xorg-server/Makefile.common Wed Feb 13 20:52:07 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.23.4.1 2012/06/11 20:53:40 riz Exp $
+# $NetBSD: Makefile.common,v 1.23.4.2 2013/02/13 20:52:07 riz Exp $
# These define parts of the Xserver tree that are to be
# conditionally compiled for different platforms. See
@@ -13,6 +13,7 @@
${MACHINE} == "cats" || \
${MACHINE} == "dreamcast" || \
${MACHINE} == "ews4800mips" || \
+ ${MACHINE} == "evbarm" || \
${MACHINE} == "evbmips" || \
${MACHINE} == "hp300" || \
${MACHINE} == "hpcarm" || \
Index: src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile
diff -u src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile:1.31.4.1 src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile:1.31.4.2
--- src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile:1.31.4.1 Mon Jun 11 20:53:39 2012
+++ src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile Wed Feb 13 20:52:05 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31.4.1 2012/06/11 20:53:39 riz Exp $
+# $NetBSD: Makefile,v 1.31.4.2 2013/02/13 20:52:05 riz Exp $
.include "../../../Makefile.serverlib"
.include "../../../Makefile.servermod"
@@ -69,6 +69,7 @@ CPPFLAGS.${_FN}= -DWSCONS_SUPPORT -DUSES
.endif
.if ${MACHINE} == "cats" || \
+ ${MACHINE} == "evbarm" || \
${MACHINE} == "hpcarm" || \
${MACHINE} == "shark" || \
${MACHINE} == "netwinder" || \
Index: src/sys/dev/wscons/wsdisplay_vconsvar.h
diff -u src/sys/dev/wscons/wsdisplay_vconsvar.h:1.21 src/sys/dev/wscons/wsdisplay_vconsvar.h:1.21.2.1
--- src/sys/dev/wscons/wsdisplay_vconsvar.h:1.21 Wed Jan 4 08:25:03 2012
+++ src/sys/dev/wscons/wsdisplay_vconsvar.h Wed Feb 13 20:52:06 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: wsdisplay_vconsvar.h,v 1.21 2012/01/04 08:25:03 macallan Exp $ */
+/* $NetBSD: wsdisplay_vconsvar.h,v 1.21.2.1 2013/02/13 20:52:06 riz Exp $ */
/*-
* Copyright (c) 2005, 2006 Michael Lorenz
@@ -59,7 +59,7 @@ struct vcons_screen {
* for example, Sun's Creator boards can't accelerate copycols()
*/
#define VCONS_NO_COPYCOLS 0x10 /* use putchar() based copycols() */
-#define VCONS_NO_COPYROWS 0x20 /* use putchar() basec copyrows() */
+#define VCONS_NO_COPYROWS 0x20 /* use putchar() based copyrows() */
#define VCONS_DONT_READ 0x30 /* avoid framebuffer reads */
/* status flags used by vcons */
uint32_t scr_status;
Index: src/sys/dev/wsfb/genfb.c
diff -u src/sys/dev/wsfb/genfb.c:1.47 src/sys/dev/wsfb/genfb.c:1.47.2.1
--- src/sys/dev/wsfb/genfb.c:1.47 Tue Feb 7 18:48:19 2012
+++ src/sys/dev/wsfb/genfb.c Wed Feb 13 20:52:06 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: genfb.c,v 1.47 2012/02/07 18:48:19 phx Exp $ */
+/* $NetBSD: genfb.c,v 1.47.2.1 2013/02/13 20:52:06 riz Exp $ */
/*-
* Copyright (c) 2007 Michael Lorenz
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: genfb.c,v 1.47 2012/02/07 18:48:19 phx Exp $");
+__KERNEL_RCSID(0, "$NetBSD: genfb.c,v 1.47.2.1 2013/02/13 20:52:06 riz Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -61,7 +61,7 @@ __KERNEL_RCSID(0, "$NetBSD: genfb.c,v 1.
#ifdef GENFB_DEBUG
#define GPRINTF panic
#else
-#define GPRINTF aprint_verbose
+#define GPRINTF aprint_debug
#endif
#define GENFB_BRIGHTNESS_STEP 15
@@ -380,7 +380,7 @@ genfb_ioctl(void *v, void *vs, u_long cm
if (sc->sc_ops.genfb_ioctl)
error = sc->sc_ops.genfb_ioctl(sc, vs,
cmd, data, flag, l);
- if (error)
+ if (error && error != EPASSTHROUGH)
return error;
if (new_mode != sc->sc_mode) {
Added files:
Index: src/distrib/sets/lists/xserver/md.evbarm
diff -u /dev/null src/distrib/sets/lists/xserver/md.evbarm:1.5.2.2
--- /dev/null Wed Feb 13 20:52:07 2013
+++ src/distrib/sets/lists/xserver/md.evbarm Wed Feb 13 20:52:06 2013
@@ -0,0 +1,122 @@
+# $NetBSD: md.evbarm,v 1.5.2.2 2013/02/13 20:52:06 riz Exp $
+./usr/X11R7/bin/X -unknown- xorg
+./usr/X11R7/bin/Xorg -unknown- xorg
+./usr/X11R7/bin/cvt -unknown- xorg
+./usr/X11R7/bin/gtf -unknown- xorg
+./usr/X11R7/lib/X11/doc/README.DRI -unknown- obsolete
+./usr/X11R7/lib/X11/doc/README.modes -unknown- xorg
+./usr/X11R7/lib/X11/doc/README.rapidaccess -unknown- obsolete
+./usr/X11R7/lib/modules/drivers/kbd_drv.so -unknown- xorg
+./usr/X11R7/lib/modules/drivers/kbd_drv.so.1 -unknown- xorg
+./usr/X11R7/lib/modules/drivers/mouse_drv.so -unknown- xorg
+./usr/X11R7/lib/modules/drivers/mouse_drv.so.1 -unknown- xorg
+./usr/X11R7/lib/modules/drivers/void_drv.so -unknown- obsolete
+./usr/X11R7/lib/modules/drivers/void_drv.so.1 -unknown- obsolete
+./usr/X11R7/lib/modules/drivers/ws_drv.so -unknown- xorg
+./usr/X11R7/lib/modules/drivers/ws_drv.so.1 -unknown- xorg
+./usr/X11R7/lib/modules/drivers/wsfb_drv.so -unknown- xorg
+./usr/X11R7/lib/modules/drivers/wsfb_drv.so.0 -unknown- xorg
+./usr/X11R7/lib/modules/extensions/libdbe.a -unknown- xorg
+./usr/X11R7/lib/modules/extensions/libdbe.so -unknown- xorg
+./usr/X11R7/lib/modules/extensions/libdbe.so.0 -unknown- xorg
+./usr/X11R7/lib/modules/extensions/libdbe_g.a -unknown- debuglib,xorg
+./usr/X11R7/lib/modules/extensions/libdbe_pic.a -unknown- xorg
+./usr/X11R7/lib/modules/extensions/libdri.a -unknown- xorg
+./usr/X11R7/lib/modules/extensions/libdri.so -unknown- xorg
+./usr/X11R7/lib/modules/extensions/libdri.so.0 -unknown- xorg
+./usr/X11R7/lib/modules/extensions/libdri_g.a -unknown- debuglib,xorg
+./usr/X11R7/lib/modules/extensions/libdri_pic.a -unknown- xorg
+./usr/X11R7/lib/modules/extensions/libdri2.a -unknown- xorg
+./usr/X11R7/lib/modules/extensions/libdri2.so -unknown- xorg
+./usr/X11R7/lib/modules/extensions/libdri2.so.0 -unknown- xorg
+./usr/X11R7/lib/modules/extensions/libdri2_g.a -unknown- debuglib,xorg
+./usr/X11R7/lib/modules/extensions/libdri2_pic.a -unknown- xorg
+./usr/X11R7/lib/modules/extensions/libextmod.a -unknown- xorg
+./usr/X11R7/lib/modules/extensions/libextmod.so -unknown- xorg
+./usr/X11R7/lib/modules/extensions/libextmod.so.0 -unknown- xorg
+./usr/X11R7/lib/modules/extensions/libextmod_g.a -unknown- debuglib,xorg
+./usr/X11R7/lib/modules/extensions/libextmod_pic.a -unknown- xorg
+./usr/X11R7/lib/modules/extensions/libglx.a -unknown- xorg
+./usr/X11R7/lib/modules/extensions/libglx.so -unknown- xorg
+./usr/X11R7/lib/modules/extensions/libglx.so.0 -unknown- xorg
+./usr/X11R7/lib/modules/extensions/libglx_pic.a -unknown- xorg
+./usr/X11R7/lib/modules/extensions/librecord.a -unknown- xorg
+./usr/X11R7/lib/modules/extensions/librecord.so -unknown- xorg
+./usr/X11R7/lib/modules/extensions/librecord.so.0 -unknown- xorg
+./usr/X11R7/lib/modules/extensions/librecord_g.a -unknown- debuglib,xorg
+./usr/X11R7/lib/modules/extensions/librecord_pic.a -unknown- xorg
+./usr/X11R7/lib/modules/extensions/libshadow.a -unknown- xorg
+./usr/X11R7/lib/modules/extensions/libshadow.so -unknown- xorg
+./usr/X11R7/lib/modules/extensions/libshadow.so.0 -unknown- xorg
+./usr/X11R7/lib/modules/extensions/libshadow_g.a -unknown- debuglib,xorg
+./usr/X11R7/lib/modules/extensions/libshadow_pic.a -unknown- xorg
+./usr/X11R7/lib/modules/libexa.a -unknown- xorg
+./usr/X11R7/lib/modules/libexa.so -unknown- xorg
+./usr/X11R7/lib/modules/libexa.so.0 -unknown- xorg
+./usr/X11R7/lib/modules/libexa_pic.a -unknown- xorg
+./usr/X11R7/lib/modules/libfb.a -unknown- xorg
+./usr/X11R7/lib/modules/libfb.so -unknown- xorg
+./usr/X11R7/lib/modules/libfb.so.0 -unknown- xorg
+./usr/X11R7/lib/modules/libfb_g.a -unknown- debuglib,xorg
+./usr/X11R7/lib/modules/libfb_pic.a -unknown- xorg
+./usr/X11R7/lib/modules/libi2c.a -unknown- xorg
+./usr/X11R7/lib/modules/libi2c.so -unknown- xorg
+./usr/X11R7/lib/modules/libi2c.so.0 -unknown- xorg
+./usr/X11R7/lib/modules/libi2c_g.a -unknown- debuglib,xorg
+./usr/X11R7/lib/modules/libi2c_pic.a -unknown- xorg
+./usr/X11R7/lib/modules/libshadowfb.a -unknown- xorg
+./usr/X11R7/lib/modules/libshadowfb.so -unknown- xorg
+./usr/X11R7/lib/modules/libshadowfb.so.0 -unknown- xorg
+./usr/X11R7/lib/modules/libshadowfb_g.a -unknown- debuglib,xorg
+./usr/X11R7/lib/modules/libshadowfb_pic.a -unknown- xorg
+./usr/X11R7/lib/modules/libvbe.a -unknown- xorg
+./usr/X11R7/lib/modules/libvbe.so -unknown- xorg
+./usr/X11R7/lib/modules/libvbe.so.0 -unknown- xorg
+./usr/X11R7/lib/modules/libvbe_g.a -unknown- debuglib,xorg
+./usr/X11R7/lib/modules/libvbe_pic.a -unknown- xorg
+./usr/X11R7/lib/modules/libvgahw.a -unknown- xorg
+./usr/X11R7/lib/modules/libvgahw.so -unknown- xorg
+./usr/X11R7/lib/modules/libvgahw.so.0 -unknown- xorg
+./usr/X11R7/lib/modules/libvgahw_g.a -unknown- debuglib,xorg
+./usr/X11R7/lib/modules/libvgahw_pic.a -unknown- xorg
+./usr/X11R7/lib/modules/libxaa.a -unknown- xorg
+./usr/X11R7/lib/modules/libxaa.so -unknown- xorg
+./usr/X11R7/lib/modules/libxaa.so.0 -unknown- xorg
+./usr/X11R7/lib/modules/libxaa_g.a -unknown- debuglib,xorg
+./usr/X11R7/lib/modules/libxaa_pic.a -unknown- xorg
+./usr/X11R7/lib/modules/libxf8_16bpp.a -unknown- obsolete
+./usr/X11R7/lib/modules/libxf8_16bpp.so -unknown- obsolete
+./usr/X11R7/lib/modules/libxf8_16bpp.so.0 -unknown- obsolete
+./usr/X11R7/lib/modules/libxf8_16bpp_g.a -unknown- obsolete
+./usr/X11R7/lib/modules/libxf8_16bpp_pic.a -unknown- obsolete
+./usr/X11R7/man/cat1/Xorg.0 -unknown- .cat,xorg
+./usr/X11R7/man/cat1/cvt.0 -unknown- .cat,xorg
+./usr/X11R7/man/cat1/gtf.0 -unknown- .cat,xorg
+./usr/X11R7/man/cat4/exa.0 -unknown- .cat,xorg
+./usr/X11R7/man/cat4/kbd.0 -unknown- .cat,xorg
+./usr/X11R7/man/cat4/mousedrv.0 -unknown- .cat,xorg
+./usr/X11R7/man/cat4/void.0 -unknown- obsolete
+./usr/X11R7/man/cat4/ws.0 -unknown- .cat,xorg
+./usr/X11R7/man/cat4/wsfb.0 -unknown- .cat,xorg
+./usr/X11R7/man/cat5/xorg.conf.0 -unknown- .cat,xorg
+./usr/X11R7/man/html1/Xorg.html -unknown- html,xorg
+./usr/X11R7/man/html1/cvt.html -unknown- html,xorg
+./usr/X11R7/man/html1/gtf.html -unknown- html,xorg
+./usr/X11R7/man/html4/exa.html -unknown- html,xorg
+./usr/X11R7/man/html4/kbd.html -unknown- html,xorg
+./usr/X11R7/man/html4/mousedrv.html -unknown- html,xorg
+./usr/X11R7/man/html4/void.html -unknown- obsolete
+./usr/X11R7/man/html4/ws.html -unknown- html,xorg
+./usr/X11R7/man/html4/wsfb.html -unknown- html,xorg
+./usr/X11R7/man/html5/xorg.conf.html -unknown- html,xorg
+./usr/X11R7/man/man1/Xorg.1 -unknown- .man,xorg
+./usr/X11R7/man/man1/cvt.1 -unknown- .man,xorg
+./usr/X11R7/man/man1/gtf.1 -unknown- .man,xorg
+./usr/X11R7/man/man4/exa.4 -unknown- .man,xorg
+./usr/X11R7/man/man4/kbd.4 -unknown- .man,xorg
+./usr/X11R7/man/man4/mousedrv.4 -unknown- .man,xorg
+./usr/X11R7/man/man4/void.4 -unknown- obsolete
+./usr/X11R7/man/man4/ws.4 -unknown- .man,xorg
+./usr/X11R7/man/man4/wsfb.4 -unknown- .man,xorg
+./usr/X11R7/man/man5/xorg.conf.5 -unknown- .man,xorg
+./usr/X11R7/share/aclocal/xorg-server.m4 -unknown- xorg
