Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src Build both xf86-video-radeon drivers for amd64 and i386, jus...
details: https://anonhg.NetBSD.org/src/rev/1739d039cdc6
branches: trunk
changeset: 808657:1739d039cdc6
user: rjs <rjs%NetBSD.org@localhost>
date: Thu May 28 14:36:44 2015 +0000
description:
Build both xf86-video-radeon drivers for amd64 and i386, just build the
old one for other ports.
diffstat:
distrib/sets/lists/xdebug/md.amd64 | 6 +-
distrib/sets/lists/xdebug/md.i386 | 6 +-
distrib/sets/lists/xserver/md.amd64 | 7 ++-
distrib/sets/lists/xserver/md.i386 | 7 ++-
distrib/sets/mkvars.mk | 3 +-
distrib/sets/sets.subr | 5 +-
external/mit/xorg/server/drivers/Makefile | 22 ++++--------
external/mit/xorg/server/drivers/xf86-video-radeon/Makefile | 6 ++-
share/mk/bsd.README | 7 +---
share/mk/bsd.own.mk | 8 +----
10 files changed, 32 insertions(+), 45 deletions(-)
diffs (266 lines):
diff -r 925ae36a4fa8 -r 1739d039cdc6 distrib/sets/lists/xdebug/md.amd64
--- a/distrib/sets/lists/xdebug/md.amd64 Thu May 28 10:19:17 2015 +0000
+++ b/distrib/sets/lists/xdebug/md.amd64 Thu May 28 14:36:44 2015 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: md.amd64,v 1.12 2015/05/21 18:03:09 htodd Exp $
+# $NetBSD: md.amd64,v 1.13 2015/05/28 14:36:45 rjs 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
@@ -147,8 +147,8 @@
./usr/libdata/debug/usr/X11R7/lib/modules/drivers/nv_drv.so.2.debug -unknown- xorg,debug
./usr/libdata/debug/usr/X11R7/lib/modules/drivers/openchrome_drv.so.0.debug -unknown- xorg,debug
./usr/libdata/debug/usr/X11R7/lib/modules/drivers/r128_drv.so.6.debug -unknown- xorg,debug
-./usr/libdata/debug/usr/X11R7/lib/modules/drivers/radeon_drv.so.6.debug -unknown- xorg,debug,!x11radeonkms
-./usr/libdata/debug/usr/X11R7/lib/modules/drivers/radeon_drv.so.7.debug -unknown- xorg,debug,x11radeonkms
+./usr/libdata/debug/usr/X11R7/lib/modules/drivers/radeon_drv.so.6.debug -unknown- xorg,debug
+./usr/libdata/debug/usr/X11R7/lib/modules/drivers/radeon_drv.so.7.debug -unknown- xorg,debug
./usr/libdata/debug/usr/X11R7/lib/modules/drivers/radeonhd_drv.so.1.debug -unknown- xorg,debug
./usr/libdata/debug/usr/X11R7/lib/modules/drivers/s3_drv.so.0.debug -unknown- xorg,debug
./usr/libdata/debug/usr/X11R7/lib/modules/drivers/s3virge_drv.so.1.debug -unknown- xorg,debug
diff -r 925ae36a4fa8 -r 1739d039cdc6 distrib/sets/lists/xdebug/md.i386
--- a/distrib/sets/lists/xdebug/md.i386 Thu May 28 10:19:17 2015 +0000
+++ b/distrib/sets/lists/xdebug/md.i386 Thu May 28 14:36:44 2015 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: md.i386,v 1.13 2015/05/21 19:53:11 htodd Exp $
+# $NetBSD: md.i386,v 1.14 2015/05/28 14:36:45 rjs Exp $
./usr/X11R6/lib/modules/extensions/libGLcore_g.a -unknown- debuglib,x11
./usr/X11R6/lib/modules/extensions/libdbe_g.a -unknown- debuglib,x11
./usr/X11R6/lib/modules/extensions/libextmod_g.a -unknown- debuglib,x11
@@ -197,8 +197,8 @@
./usr/libdata/debug/usr/X11R7/lib/modules/drivers/nv_drv.so.2.debug -unknown- xorg,debug
./usr/libdata/debug/usr/X11R7/lib/modules/drivers/openchrome_drv.so.0.debug -unknown- xorg,debug
./usr/libdata/debug/usr/X11R7/lib/modules/drivers/r128_drv.so.6.debug -unknown- xorg,debug
-./usr/libdata/debug/usr/X11R7/lib/modules/drivers/radeon_drv.so.6.debug -unknown- xorg,debug,!x11radeonkms
-./usr/libdata/debug/usr/X11R7/lib/modules/drivers/radeon_drv.so.7.debug -unknown- xorg,debug,x11radeonkms
+./usr/libdata/debug/usr/X11R7/lib/modules/drivers/radeon_drv.so.6.debug -unknown- xorg,debug
+./usr/libdata/debug/usr/X11R7/lib/modules/drivers/radeon_drv.so.7.debug -unknown- xorg,debug
./usr/libdata/debug/usr/X11R7/lib/modules/drivers/radeonhd_drv.so.1.debug -unknown- xorg,debug
./usr/libdata/debug/usr/X11R7/lib/modules/drivers/s3_drv.so.0.debug -unknown- xorg,debug
./usr/libdata/debug/usr/X11R7/lib/modules/drivers/s3virge_drv.so.1.debug -unknown- xorg,debug
diff -r 925ae36a4fa8 -r 1739d039cdc6 distrib/sets/lists/xserver/md.amd64
--- a/distrib/sets/lists/xserver/md.amd64 Thu May 28 10:19:17 2015 +0000
+++ b/distrib/sets/lists/xserver/md.amd64 Thu May 28 14:36:44 2015 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: md.amd64,v 1.77 2015/05/21 00:12:10 rjs Exp $
+# $NetBSD: md.amd64,v 1.78 2015/05/28 14:36:44 rjs Exp $
./usr/X11R6/bin/X -unknown- x11
./usr/X11R6/bin/XFree86 -unknown- x11
./usr/X11R6/bin/gtf -unknown- x11
@@ -447,9 +447,10 @@
./usr/X11R7/lib/modules/drivers/openchrome_drv.so.0 -unknown- xorg
./usr/X11R7/lib/modules/drivers/r128_drv.so -unknown- xorg
./usr/X11R7/lib/modules/drivers/r128_drv.so.6 -unknown- xorg
+./usr/X11R7/lib/modules/drivers/radeon_drv_old.so -unknown- xorg
+./usr/X11R7/lib/modules/drivers/radeon_drv_old.so.6 -unknown- xorg
./usr/X11R7/lib/modules/drivers/radeon_drv.so -unknown- xorg
-./usr/X11R7/lib/modules/drivers/radeon_drv.so.6 -unknown- xorg,!x11radeonkms
-./usr/X11R7/lib/modules/drivers/radeon_drv.so.7 -unknown- xorg,x11radeonkms
+./usr/X11R7/lib/modules/drivers/radeon_drv.so.7 -unknown- xorg
./usr/X11R7/lib/modules/drivers/radeonhd_drv.so -unknown- xorg
./usr/X11R7/lib/modules/drivers/radeonhd_drv.so.1 -unknown- xorg
./usr/X11R7/lib/modules/drivers/s3_drv.so -unknown- xorg
diff -r 925ae36a4fa8 -r 1739d039cdc6 distrib/sets/lists/xserver/md.i386
--- a/distrib/sets/lists/xserver/md.i386 Thu May 28 10:19:17 2015 +0000
+++ b/distrib/sets/lists/xserver/md.i386 Thu May 28 14:36:44 2015 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: md.i386,v 1.96 2015/05/21 00:12:10 rjs Exp $
+# $NetBSD: md.i386,v 1.97 2015/05/28 14:36:44 rjs Exp $
./usr/X11R6/bin/X -unknown- x11
./usr/X11R6/bin/XFree86 -unknown- x11
./usr/X11R6/bin/gtf -unknown- x11
@@ -487,9 +487,10 @@
./usr/X11R7/lib/modules/drivers/openchrome_drv.so.0 -unknown- xorg
./usr/X11R7/lib/modules/drivers/r128_drv.so -unknown- xorg
./usr/X11R7/lib/modules/drivers/r128_drv.so.6 -unknown- xorg
+./usr/X11R7/lib/modules/drivers/radeon_drv_old.so -unknown- xorg
+./usr/X11R7/lib/modules/drivers/radeon_drv_old.so.6 -unknown- xorg
./usr/X11R7/lib/modules/drivers/radeon_drv.so -unknown- xorg
-./usr/X11R7/lib/modules/drivers/radeon_drv.so.6 -unknown- xorg,!x11radeonkms
-./usr/X11R7/lib/modules/drivers/radeon_drv.so.7 -unknown- xorg,x11radeonkms
+./usr/X11R7/lib/modules/drivers/radeon_drv.so.7 -unknown- xorg
./usr/X11R7/lib/modules/drivers/radeonhd_drv.so -unknown- xorg
./usr/X11R7/lib/modules/drivers/radeonhd_drv.so.1 -unknown- xorg
./usr/X11R7/lib/modules/drivers/s3_drv.so -unknown- xorg
diff -r 925ae36a4fa8 -r 1739d039cdc6 distrib/sets/mkvars.mk
--- a/distrib/sets/mkvars.mk Thu May 28 10:19:17 2015 +0000
+++ b/distrib/sets/mkvars.mk Thu May 28 14:36:44 2015 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: mkvars.mk,v 1.17 2015/04/26 21:37:22 mrg Exp $
+# $NetBSD: mkvars.mk,v 1.18 2015/05/28 14:36:44 rjs Exp $
MKEXTRAVARS= \
MACHINE \
@@ -21,7 +21,6 @@
MKSOFTFLOAT \
MKXORG \
MKXORG_SERVER \
- MKX11RADEONKMS \
MKRADEONFIRMWARE \
X11FLAVOR \
USE_INET6 \
diff -r 925ae36a4fa8 -r 1739d039cdc6 distrib/sets/sets.subr
--- a/distrib/sets/sets.subr Thu May 28 10:19:17 2015 +0000
+++ b/distrib/sets/sets.subr Thu May 28 14:36:44 2015 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: sets.subr,v 1.163 2015/03/01 07:46:04 mrg Exp $
+# $NetBSD: sets.subr,v 1.164 2015/05/28 14:36:44 rjs Exp $
#
#
@@ -179,7 +179,7 @@
# In each file, a record consists of a path and a System Package name,
# separated by whitespace. E.g.,
#
-# # $NetBSD: sets.subr,v 1.163 2015/03/01 07:46:04 mrg Exp $
+# # $NetBSD: sets.subr,v 1.164 2015/05/28 14:36:44 rjs Exp $
# . base-sys-root [keyword[,...]]
# ./altroot base-sys-root
# ./bin base-sys-root
@@ -261,7 +261,6 @@
# ssp ${HAVE_SSP} != no
# tpm ${MKTPM} != no
# x11 ${MKX11} != no && ${X11FLAVOUR} != "Xorg"
-# x11radeonkms ${MKX11} != no && ${MKX11RADEONKMS} != no
# xorg ${MKX11} != no && ${X11FLAVOUR} == "Xorg"
# xorg_server ${MKXORG_SERVER} != no
# yp ${MKYP} != no
diff -r 925ae36a4fa8 -r 1739d039cdc6 external/mit/xorg/server/drivers/Makefile
--- a/external/mit/xorg/server/drivers/Makefile Thu May 28 10:19:17 2015 +0000
+++ b/external/mit/xorg/server/drivers/Makefile Thu May 28 14:36:44 2015 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.66 2015/05/21 00:12:10 rjs Exp $
+# $NetBSD: Makefile,v 1.67 2015/05/28 14:36:45 rjs Exp $
# xf86-input drivers
@@ -23,13 +23,6 @@
.include <bsd.own.mk>
-# Set this to "no" to build the UMS-happy 6.x driver, vs KMS 7.x
-.if ${MKX11RADEONKMS} != "no"
-RADEON_SUBDIR=radeon-kms
-.else
-RADEON_SUBDIR=radeon
-.endif
-
.if ${MACHINE_ARCH} == "i386" || \
${MACHINE_ARCH} == "x86_64"
SUBDIR+= \
@@ -57,7 +50,8 @@
xf86-video-nv \
xf86-video-openchrome \
xf86-video-r128 \
- xf86-video-${RADEON_SUBDIR} \
+ xf86-video-radeon \
+ xf86-video-radeon-kms \
xf86-video-radeonhd \
xf86-video-s3 \
xf86-video-s3virge \
@@ -98,7 +92,7 @@
xf86-video-mga \
xf86-video-nv \
xf86-video-r128 \
- xf86-video-${RADEON_SUBDIR} \
+ xf86-video-radeon \
xf86-video-radeonhd \
xf86-video-s3 \
xf86-video-s3virge \
@@ -138,7 +132,7 @@
xf86-video-mga \
xf86-video-neomagic \
xf86-video-nv \
- xf86-video-${RADEON_SUBDIR} \
+ xf86-video-radeon \
xf86-video-radeonhd \
xf86-video-s3 \
xf86-video-s3virge \
@@ -198,7 +192,7 @@
xf86-video-mach64 \
xf86-video-mga \
xf86-video-nv \
- xf86-video-${RADEON_SUBDIR} \
+ xf86-video-radeon \
xf86-video-r128 \
xf86-video-tdfx \
xf86-video-wsfb
@@ -223,7 +217,7 @@
xf86-video-mach64 \
xf86-video-mga \
xf86-video-nv \
- xf86-video-${RADEON_SUBDIR} \
+ xf86-video-radeon \
xf86-video-r128 \
xf86-video-tdfx \
xf86-video-wsfb
@@ -260,7 +254,7 @@
xf86-video-mach64 \
xf86-video-mga \
xf86-video-r128 \
- xf86-video-${RADEON_SUBDIR} \
+ xf86-video-radeon \
xf86-video-suncg6 \
xf86-video-sunffb \
xf86-video-sunleo \
diff -r 925ae36a4fa8 -r 1739d039cdc6 external/mit/xorg/server/drivers/xf86-video-radeon/Makefile
--- a/external/mit/xorg/server/drivers/xf86-video-radeon/Makefile Thu May 28 10:19:17 2015 +0000
+++ b/external/mit/xorg/server/drivers/xf86-video-radeon/Makefile Thu May 28 14:36:44 2015 +0000
@@ -1,9 +1,13 @@
-# $NetBSD: Makefile,v 1.18 2014/08/11 08:25:58 mrg Exp $
+# $NetBSD: Makefile,v 1.19 2015/05/28 14:36:45 rjs Exp $
.include <bsd.own.mk>
DRIVER= xf86-video-ati
+.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64"
+DRIVER_NAME= radeon_drv_old
+.else
DRIVER_NAME= radeon_drv
+.endif
.PATH: ${X11SRCDIR.${DRIVER}}/src/AtomBios
SRCS.ATOMBIOS= \
diff -r 925ae36a4fa8 -r 1739d039cdc6 share/mk/bsd.README
--- a/share/mk/bsd.README Thu May 28 10:19:17 2015 +0000
+++ b/share/mk/bsd.README Thu May 28 14:36:44 2015 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.README,v 1.341 2015/04/26 21:37:22 mrg Exp $
+# $NetBSD: bsd.README,v 1.342 2015/05/28 14:36:45 rjs Exp $
# @(#)bsd.README 8.2 (Berkeley) 4/2/94
This is the README file for the make "include" files for the NetBSD
@@ -412,11 +412,6 @@
using the X11MOTIFPATH variable.
Default: no
-MKX11RADEONKMS If "no", build the xf86-video-ati 6.x driver (the last one
- with user-mode switching support), otherwise build the
- kernek-mode switching (KMS) requiring driver.
- Default: yes on i386 and amd64, no elsewhere.
-
MKRADEONFIRMWARE If "no", install the /libdata/firmware/radeon directory,
which is necessary for the radeon DRM driver.
Default: yes on i386 and amd64, no elsewhere.
diff -r 925ae36a4fa8 -r 1739d039cdc6 share/mk/bsd.own.mk
--- a/share/mk/bsd.own.mk Thu May 28 10:19:17 2015 +0000
+++ b/share/mk/bsd.own.mk Thu May 28 14:36:44 2015 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.own.mk,v 1.850 2015/05/28 04:08:48 matt Exp $
+# $NetBSD: bsd.own.mk,v 1.851 2015/05/28 14:36:45 rjs Exp $
# This needs to be before bsd.init.mk
.if defined(BSD_MK_COMPAT_FILE)
@@ -1308,12 +1308,6 @@
X11SRCDIR.xf86-video-${_v}?= ${X11SRCDIRMIT}/xf86-video-${_v}/dist
.endfor
-# Build the ati 6.x (UMS supported) or 7.x (KMS demanded) drivers
-.if ${MACHINE_ARCH} == "x86_64" || ${MACHINE_ARCH} == "i386"
-MKX11RADEONKMS?= yes
-.endif
-MKX11RADEONKMS?= no
-
# Only install the radeon firmware on DRM-happy systems.
.if ${MACHINE_ARCH} == "x86_64" || ${MACHINE_ARCH} == "i386"
MKRADEONFIRMWARE?= yes
Home |
Main Index |
Thread Index |
Old Index