Module Name: src
Committed By: mrg
Date: Mon Sep 26 22:37:32 UTC 2016
Modified Files:
src/distrib/sets/lists/xdebug: md.amd64 md.i386
src/distrib/sets/lists/xserver: md.amd64 md.i386
src/external/mit/xorg/server/drivers: Makefile Makefile.xf86-driver
src/external/mit/xorg/server/xorg-server/hw/xfree86: Makefile
Added Files:
src/external/mit/xorg/server/xorg-server/hw/xfree86/drivers: Makefile
src/external/mit/xorg/server/xorg-server/hw/xfree86/drivers/modesetting:
Makefile
Log Message:
build the modesetting driver on x86.
build the modesetting driver for xorg-server 1.18.4. it has moved
into the xorg-server tree itself, and changed significantly.
To generate a diff of this commit:
cvs rdiff -u -r1.36 -r1.37 src/distrib/sets/lists/xdebug/md.amd64
cvs rdiff -u -r1.33 -r1.34 src/distrib/sets/lists/xdebug/md.i386
cvs rdiff -u -r1.97 -r1.98 src/distrib/sets/lists/xserver/md.amd64
cvs rdiff -u -r1.114 -r1.115 src/distrib/sets/lists/xserver/md.i386
cvs rdiff -u -r1.87 -r1.88 src/external/mit/xorg/server/drivers/Makefile
cvs rdiff -u -r1.22 -r1.23 \
src/external/mit/xorg/server/drivers/Makefile.xf86-driver
cvs rdiff -u -r1.34 -r1.35 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/Makefile
cvs rdiff -u -r0 -r1.1 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/drivers/Makefile
cvs rdiff -u -r0 -r1.1 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/drivers/modesetting/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/sets/lists/xdebug/md.amd64
diff -u src/distrib/sets/lists/xdebug/md.amd64:1.36 src/distrib/sets/lists/xdebug/md.amd64:1.37
--- src/distrib/sets/lists/xdebug/md.amd64:1.36 Sat Sep 24 21:57:38 2016
+++ src/distrib/sets/lists/xdebug/md.amd64 Mon Sep 26 22:37:31 2016
@@ -1,4 +1,4 @@
-# $NetBSD: md.amd64,v 1.36 2016/09/24 21:57:38 mrg Exp $
+# $NetBSD: md.amd64,v 1.37 2016/09/26 22:37:31 mrg Exp $
./usr/X11R7/lib/libI810XvMC_g.a -unknown- debuglib,xorg,compatx11file
./usr/X11R7/lib/libIntelXvMC_g.a -unknown- debuglib,xorg,compatx11file
./usr/X11R7/lib/libchromeXvMCPro_g.a -unknown- debuglib,xorg,compatx11file
@@ -145,6 +145,7 @@
./usr/libdata/debug/usr/X11R7/lib/modules/drivers/libxgi_drv.so.1.debug obsolete xorg,obsolete
./usr/libdata/debug/usr/X11R7/lib/modules/drivers/mach64_drv.so.6.debug -unknown- xorg,debug
./usr/libdata/debug/usr/X11R7/lib/modules/drivers/mga_drv.so.1.debug -unknown- xorg,debug
+./usr/libdata/debug/usr/X11R7/lib/modules/drivers/modesetting_drv.so.0.debug -unknown- xorg,debug
./usr/libdata/debug/usr/X11R7/lib/modules/drivers/mouse_drv.so.1.debug -unknown- xorg,debug
./usr/libdata/debug/usr/X11R7/lib/modules/drivers/neomagic_drv.so.1.debug -unknown- xorg,debug
./usr/libdata/debug/usr/X11R7/lib/modules/drivers/nouveau_drv.so.1.debug -unknown- xorg,debug
Index: src/distrib/sets/lists/xdebug/md.i386
diff -u src/distrib/sets/lists/xdebug/md.i386:1.33 src/distrib/sets/lists/xdebug/md.i386:1.34
--- src/distrib/sets/lists/xdebug/md.i386:1.33 Sat Sep 24 21:57:38 2016
+++ src/distrib/sets/lists/xdebug/md.i386 Mon Sep 26 22:37:31 2016
@@ -1,4 +1,4 @@
-# $NetBSD: md.i386,v 1.33 2016/09/24 21:57:38 mrg Exp $
+# $NetBSD: md.i386,v 1.34 2016/09/26 22:37:31 mrg Exp $
./usr/X11R7/lib/libI810XvMC_g.a -unknown- debuglib,xorg
./usr/X11R7/lib/libIntelXvMC_g.a -unknown- debuglib,xorg
./usr/X11R7/lib/libchromeXvMCPro_g.a -unknown- debuglib,xorg
@@ -159,6 +159,7 @@
./usr/libdata/debug/usr/X11R7/lib/modules/drivers/libxgi_drv.so.1.debug obsolete xorg,obsolete
./usr/libdata/debug/usr/X11R7/lib/modules/drivers/mach64_drv.so.6.debug -unknown- xorg,debug
./usr/libdata/debug/usr/X11R7/lib/modules/drivers/mga_drv.so.1.debug -unknown- xorg,debug
+./usr/libdata/debug/usr/X11R7/lib/modules/drivers/modesetting_drv.so.0.debug -unknown- xorg,debug
./usr/libdata/debug/usr/X11R7/lib/modules/drivers/mouse_drv.so.1.debug -unknown- xorg,debug
./usr/libdata/debug/usr/X11R7/lib/modules/drivers/neomagic_drv.so.1.debug -unknown- xorg,debug
./usr/libdata/debug/usr/X11R7/lib/modules/drivers/nouveau_drv.so.1.debug -unknown- xorg,debug
Index: src/distrib/sets/lists/xserver/md.amd64
diff -u src/distrib/sets/lists/xserver/md.amd64:1.97 src/distrib/sets/lists/xserver/md.amd64:1.98
--- src/distrib/sets/lists/xserver/md.amd64:1.97 Sat Sep 24 21:57:38 2016
+++ src/distrib/sets/lists/xserver/md.amd64 Mon Sep 26 22:37:31 2016
@@ -1,4 +1,4 @@
-# $NetBSD: md.amd64,v 1.97 2016/09/24 21:57:38 mrg Exp $
+# $NetBSD: md.amd64,v 1.98 2016/09/26 22:37:31 mrg Exp $
./usr/X11R7/bin/X -unknown- xorg
./usr/X11R7/bin/Xorg -unknown- xorg
./usr/X11R7/bin/cvt -unknown- xorg
@@ -109,6 +109,8 @@
./usr/X11R7/lib/modules/drivers/mach64_drv.so.6 -unknown- xorg
./usr/X11R7/lib/modules/drivers/mga_drv.so -unknown- xorg
./usr/X11R7/lib/modules/drivers/mga_drv.so.1 -unknown- xorg
+./usr/X11R7/lib/modules/drivers/modesetting_drv.so -unknown- xorg
+./usr/X11R7/lib/modules/drivers/modesetting_drv.so.0 -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/neomagic_drv.so -unknown- xorg
@@ -321,6 +323,7 @@
./usr/X11R7/man/cat4/intel_old.0 -unknown- .cat,xorg,xorg_server_ver=118,obsolete
./usr/X11R7/man/cat4/kbd.0 -unknown- .cat,xorg
./usr/X11R7/man/cat4/mga.0 -unknown- .cat,xorg
+./usr/X11R7/man/cat4/modesetting.0 -unknown- .cat,xorg
./usr/X11R7/man/cat4/mousedrv.0 -unknown- .cat,xorg
./usr/X11R7/man/cat4/neomagic.0 -unknown- .cat,xorg
./usr/X11R7/man/cat4/nouveau.0 -unknown- .cat,xorg
@@ -374,6 +377,7 @@
./usr/X11R7/man/html4/intel_old.html -unknown- html,xorg,xorg_server_ver=118,obsolete
./usr/X11R7/man/html4/kbd.html -unknown- html,xorg
./usr/X11R7/man/html4/mga.html -unknown- html,xorg
+./usr/X11R7/man/html4/modesetting.html -unknown- html,xorg
./usr/X11R7/man/html4/mousedrv.html -unknown- html,xorg
./usr/X11R7/man/html4/neomagic.html -unknown- html,xorg
./usr/X11R7/man/html4/nouveau.html -unknown- html,xorg
@@ -426,6 +430,7 @@
./usr/X11R7/man/man4/intel_old.4 -unknown- .man,xorg,xorg_server_ver=110
./usr/X11R7/man/man4/kbd.4 -unknown- .man,xorg
./usr/X11R7/man/man4/mga.4 -unknown- .man,xorg
+./usr/X11R7/man/man4/modesetting.4 -unknown- .man,xorg
./usr/X11R7/man/man4/mousedrv.4 -unknown- .man,xorg
./usr/X11R7/man/man4/neomagic.4 -unknown- .man,xorg
./usr/X11R7/man/man4/nouveau.4 -unknown- .man,xorg
Index: src/distrib/sets/lists/xserver/md.i386
diff -u src/distrib/sets/lists/xserver/md.i386:1.114 src/distrib/sets/lists/xserver/md.i386:1.115
--- src/distrib/sets/lists/xserver/md.i386:1.114 Sat Sep 24 21:57:38 2016
+++ src/distrib/sets/lists/xserver/md.i386 Mon Sep 26 22:37:31 2016
@@ -1,4 +1,4 @@
-# $NetBSD: md.i386,v 1.114 2016/09/24 21:57:38 mrg Exp $
+# $NetBSD: md.i386,v 1.115 2016/09/26 22:37:31 mrg Exp $
./usr/X11R7/bin/X -unknown- xorg
./usr/X11R7/bin/Xorg -unknown- xorg
./usr/X11R7/bin/cvt -unknown- xorg
@@ -120,6 +120,8 @@
./usr/X11R7/lib/modules/drivers/mach64_drv.so.6 -unknown- xorg
./usr/X11R7/lib/modules/drivers/mga_drv.so -unknown- xorg
./usr/X11R7/lib/modules/drivers/mga_drv.so.1 -unknown- xorg
+./usr/X11R7/lib/modules/drivers/modesetting_drv.so -unknown- xorg
+./usr/X11R7/lib/modules/drivers/modesetting_drv.so.0 -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/neomagic_drv.so -unknown- xorg
@@ -333,6 +335,7 @@
./usr/X11R7/man/cat4/intel_old.0 -unknown- .cat,xorg,xorg_server_ver=118,obsolete
./usr/X11R7/man/cat4/kbd.0 -unknown- .cat,xorg
./usr/X11R7/man/cat4/mga.0 -unknown- .cat
+./usr/X11R7/man/cat4/modesetting.0 -unknown- .cat,xorg
./usr/X11R7/man/cat4/mousedrv.0 -unknown- .cat,xorg
./usr/X11R7/man/cat4/neomagic.0 -unknown- .cat,xorg
./usr/X11R7/man/cat4/nouveau.0 -unknown- .cat,xorg
@@ -387,6 +390,7 @@
./usr/X11R7/man/html4/intel_old.html -unknown- html,xorg,xorg_server_ver=118,obsolete
./usr/X11R7/man/html4/kbd.html -unknown- html,xorg
./usr/X11R7/man/html4/mga.html -unknown- html,xorg
+./usr/X11R7/man/html4/modesetting.html -unknown- html,xorg
./usr/X11R7/man/html4/mousedrv.html -unknown- html,xorg
./usr/X11R7/man/html4/neomagic.html -unknown- html,xorg
./usr/X11R7/man/html4/nouveau.html -unknown- html,xorg
@@ -441,6 +445,7 @@
./usr/X11R7/man/man4/intel_old.4 -unknown- .man,xorg,xorg_server_ver=118,obsolete
./usr/X11R7/man/man4/kbd.4 -unknown- .man,xorg
./usr/X11R7/man/man4/mga.4 -unknown- .man,xorg
+./usr/X11R7/man/man4/modesetting.4 -unknown- .man,xorg
./usr/X11R7/man/man4/mousedrv.4 -unknown- .man,xorg
./usr/X11R7/man/man4/neomagic.4 -unknown- .man,xorg
./usr/X11R7/man/man4/nouveau.4 -unknown- .man,xorg
Index: src/external/mit/xorg/server/drivers/Makefile
diff -u src/external/mit/xorg/server/drivers/Makefile:1.87 src/external/mit/xorg/server/drivers/Makefile:1.88
--- src/external/mit/xorg/server/drivers/Makefile:1.87 Mon Aug 22 08:58:57 2016
+++ src/external/mit/xorg/server/drivers/Makefile Mon Sep 26 22:37:31 2016
@@ -1,4 +1,13 @@
-# $NetBSD: Makefile,v 1.87 2016/08/22 08:58:57 mrg Exp $
+# $NetBSD: Makefile,v 1.88 2016/09/26 22:37:31 mrg Exp $
+
+.include <bsd.own.mk>
+
+# modesetting is builtin to xorg-server 1.18 tree
+.if ${XORG_SERVER_SUBDIR} == "xorg-server.old"
+MODE_SETTING= xf86-video-modesetting
+.else
+MODE_SETTING=
+.endif
# xf86-input drivers
@@ -21,8 +30,6 @@ SUBDIR+= \
# xf86-video drivers
-.include <bsd.own.mk>
-
.if ${MACHINE_ARCH} == "i386" || \
${MACHINE_ARCH} == "x86_64"
SUBDIR+= \
@@ -37,6 +44,7 @@ SUBDIR+= \
xf86-video-intel \
xf86-video-mach64 \
xf86-video-mga \
+ ${MODE_SETTING} \
xf86-video-neomagic \
xf86-video-nv \
xf86-video-nouveau \
@@ -164,7 +172,7 @@ SUBDIR+= \
.if ${MACHINE} == "evbarm"
SUBDIR+= \
- xf86-video-modesetting \
+ ${MODE_SETTING} \
xf86-video-wsfb
.endif # ${MACHINE} == "evbarm"
Index: src/external/mit/xorg/server/drivers/Makefile.xf86-driver
diff -u src/external/mit/xorg/server/drivers/Makefile.xf86-driver:1.22 src/external/mit/xorg/server/drivers/Makefile.xf86-driver:1.23
--- src/external/mit/xorg/server/drivers/Makefile.xf86-driver:1.22 Sat Aug 20 03:44:19 2016
+++ src/external/mit/xorg/server/drivers/Makefile.xf86-driver Mon Sep 26 22:37:31 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.xf86-driver,v 1.22 2016/08/20 03:44:19 mrg Exp $
+# $NetBSD: Makefile.xf86-driver,v 1.23 2016/09/26 22:37:31 mrg Exp $
LIBISMODULE= yes
SHLIB_MAJOR= ${PACKAGE_MAJOR}
@@ -50,9 +50,10 @@ CPPFLAGS+= -DXORG_VERSION_CURRENT=${XORG
.PATH: ${X11SRCDIR.${DRIVER}}/src
.PATH: ${X11SRCDIR.${DRIVER}}/man
+.PATH: ${X11SRCDIR.${DRIVER}}
DRIVER_TOPDIR:=${.PARSEDIR}
-.if !exists(${X11SRCDIR.${DRIVER}}/../include)
+.if !exists(${X11SRCDIR.${DRIVER}}/../include) && !defined(DRIVER_NO_FAKE_INCLUDE)
CPPFLAGS+= -DHAVE_CONFIG_H -I${DRIVER_TOPDIR}/fake-include
.endif
Index: src/external/mit/xorg/server/xorg-server/hw/xfree86/Makefile
diff -u src/external/mit/xorg/server/xorg-server/hw/xfree86/Makefile:1.34 src/external/mit/xorg/server/xorg-server/hw/xfree86/Makefile:1.35
--- src/external/mit/xorg/server/xorg-server/hw/xfree86/Makefile:1.34 Thu Aug 11 08:32:42 2016
+++ src/external/mit/xorg/server/xorg-server/hw/xfree86/Makefile Mon Sep 26 22:37:31 2016
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.34 2016/08/11 08:32:42 mrg Exp $
+# $NetBSD: Makefile,v 1.35 2016/09/26 22:37:31 mrg Exp $
SUBDIR= common init ddc dixmods doc dri dri2 i2c loader \
xf86modes exa \
xorgos ramdac shadowfb vbe vgahw \
- x86emu xf86config
+ x86emu xf86config \
+ drivers
.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64" || ${MACHINE_ARCH} == "powerpc"
SUBDIR+= int10
Added files:
Index: src/external/mit/xorg/server/xorg-server/hw/xfree86/drivers/Makefile
diff -u /dev/null src/external/mit/xorg/server/xorg-server/hw/xfree86/drivers/Makefile:1.1
--- /dev/null Mon Sep 26 22:37:32 2016
+++ src/external/mit/xorg/server/xorg-server/hw/xfree86/drivers/Makefile Mon Sep 26 22:37:32 2016
@@ -0,0 +1,9 @@
+# $NetBSD: Makefile,v 1.1 2016/09/26 22:37:32 mrg Exp $
+
+.if ${MACHINE} == "i386" || \
+ ${MACHINE} == "amd64" || \
+ ${MACHINE} == "evbarm"
+SUBDIR= modesetting
+.endif
+
+.include <bsd.subdir.mk>
Index: src/external/mit/xorg/server/xorg-server/hw/xfree86/drivers/modesetting/Makefile
diff -u /dev/null src/external/mit/xorg/server/xorg-server/hw/xfree86/drivers/modesetting/Makefile:1.1
--- /dev/null Mon Sep 26 22:37:32 2016
+++ src/external/mit/xorg/server/xorg-server/hw/xfree86/drivers/modesetting/Makefile Mon Sep 26 22:37:32 2016
@@ -0,0 +1,31 @@
+# $NetBSD: Makefile,v 1.1 2016/09/26 22:37:32 mrg Exp $
+
+DRIVER= xf86-video-modesetting
+DRIVER_NAME= modesetting_drv
+
+SRCS= dri2.c \
+ driver.c \
+ drmmode_display.c \
+ dumb_bo.c \
+ present.c \
+ sh3224.c \
+ vblank.c
+MAN= modesetting.4
+
+CPPFLAGS+= ${X11FLAGS.DIX} \
+ -I${DESTDIR}${X11INCDIR}/libdrm \
+ -I${X11SRCDIR.xorg-server}/glamor \
+ -I${X11SRCDIR.xorg-server}/ddc \
+ -I${X11SRCDIR.xorg-server}/dri2 \
+ -I${X11SRCDIR.xorg-server}/i2c \
+ -I${X11SRCDIR.xorg-server}/modes \
+ -I${X11SRCDIR.xorg-server}/parser \
+ -I${X11SRCDIR.xorg-server}/ramdac \
+
+# Set some overrides so Makefile.xf86-driver works for this
+# built-in driver.
+
+DRIVER_VERSION= 0
+DRIVER_NO_FAKE_INCLUDE= # defined
+
+.include "../../../../../drivers/Makefile.xf86-driver"
