Module Name: src
Committed By: snj
Date: Wed Jul 13 19:34:24 UTC 2016
Modified Files:
src/distrib/sets/lists/xbase [netbsd-6]: shl.mi
src/distrib/sets/lists/xcomp [netbsd-6]: mi shl.mi
src/external/mit/xorg/lib/libdrm [netbsd-6]: Makefile shlib_version
src/external/mit/xorg/lib/libdrm/drm [netbsd-6]: Makefile
src/external/mit/xorg/lib/libdrm_intel [netbsd-6]: Makefile
src/external/mit/xorg/lib/libdrm_radeon [netbsd-6]: Makefile
shlib_version
src/external/mit/xorg/server/drivers/xf86-video-ati [netbsd-6]:
Makefile
src/external/mit/xorg/server/drivers/xf86-video-radeon [netbsd-6]:
Makefile
Added Files:
src/external/mit/xorg/lib/libdrm [netbsd-6]: Makefile.defines
Log Message:
Pull up following revision(s) (requested by mrg in ticket #1326):
distrib/sets/lists/xbase/shl.mi: patch
distrib/sets/lists/xcomp/mi: patch
distrib/sets/lists/xcomp/shl.mi: patch
external/mit/xorg/lib/libdrm/Makefile: patch
external/mit/xorg/lib/libdrm/Makefile.defines: patch
external/mit/xorg/lib/libdrm/shlib_version: patch
external/mit/xorg/lib/libdrm/drm/Makefile: patch
external/mit/xorg/lib/libdrm_intel/Makefile: patch
external/mit/xorg/lib/libdrm_radeon/Makefile: patch
external/mit/xorg/lib/libdrm_radeon/shlib_version: patch
external/mit/xorg/server/drivers/xf86-video-radeon/Makefile: revision
1.15
external/mit/xorg/server/drivers/xf86-video-ati/Makefile: patch
xsrc/external/mit/libdrm/dist/Makefile.am: patch
xsrc/external/mit/libdrm/dist/Makefile.in: patch
xsrc/external/mit/libdrm/dist/aclocal.m4: patch
xsrc/external/mit/libdrm/dist/config.guess: patch
xsrc/external/mit/libdrm/dist/config.h.in: patch
xsrc/external/mit/libdrm/dist/config.sub: patch
xsrc/external/mit/libdrm/dist/configure: patch
xsrc/external/mit/libdrm/dist/configure.ac: patch
xsrc/external/mit/libdrm/dist/depcomp: patch
xsrc/external/mit/libdrm/dist/install-sh: patch
xsrc/external/mit/libdrm/dist/libdrm_lists.h: patch
xsrc/external/mit/libdrm/dist/ltmain.sh: patch
xsrc/external/mit/libdrm/dist/missing: patch
xsrc/external/mit/libdrm/dist/xf86drm.c: patch
xsrc/external/mit/libdrm/dist/xf86drm.h: patch
xsrc/external/mit/libdrm/dist/xf86drmMode.c: patch
xsrc/external/mit/libdrm/dist/xf86drmMode.h: patch
xsrc/external/mit/libdrm/dist/build-aux/config.guess: patch
xsrc/external/mit/libdrm/dist/build-aux/config.sub: patch
xsrc/external/mit/libdrm/dist/build-aux/depcomp: patch
xsrc/external/mit/libdrm/dist/build-aux/install-sh: patch
xsrc/external/mit/libdrm/dist/build-aux/ltmain.sh: patch
xsrc/external/mit/libdrm/dist/build-aux/missing: patch
xsrc/external/mit/libdrm/dist/exynos/Makefile.am: patch
xsrc/external/mit/libdrm/dist/exynos/Makefile.in: patch
xsrc/external/mit/libdrm/dist/exynos/exynos_drm.c: patch
xsrc/external/mit/libdrm/dist/exynos/exynos_drm.h: patch
xsrc/external/mit/libdrm/dist/exynos/exynos_drmif.h: patch
xsrc/external/mit/libdrm/dist/exynos/libdrm_exynos.pc.in: patch
xsrc/external/mit/libdrm/dist/include/Makefile.in: patch
xsrc/external/mit/libdrm/dist/include/drm/Makefile: patch
xsrc/external/mit/libdrm/dist/include/drm/Makefile.am: patch
xsrc/external/mit/libdrm/dist/include/drm/Makefile.in: patch
xsrc/external/mit/libdrm/dist/include/drm/drm.h: patch
xsrc/external/mit/libdrm/dist/include/drm/drm_fourcc.h: patch
xsrc/external/mit/libdrm/dist/include/drm/drm_mode.h: patch
xsrc/external/mit/libdrm/dist/include/drm/i915_drm.h: patch
xsrc/external/mit/libdrm/dist/include/drm/radeon_drm.h: patch
xsrc/external/mit/libdrm/dist/intel/Makefile.am: patch
xsrc/external/mit/libdrm/dist/intel/Makefile.in: patch
xsrc/external/mit/libdrm/dist/intel/intel_aub.h:patch
xsrc/external/mit/libdrm/dist/intel/intel_bufmgr.c: patch
xsrc/external/mit/libdrm/dist/intel/intel_bufmgr.h: patch
xsrc/external/mit/libdrm/dist/intel/intel_bufmgr_gem.c: patch
xsrc/external/mit/libdrm/dist/intel/intel_bufmgr_priv.h: patch
xsrc/external/mit/libdrm/dist/intel/intel_chipset.h: patch
xsrc/external/mit/libdrm/dist/intel/intel_debug.h: patch
xsrc/external/mit/libdrm/dist/intel/intel_decode.c: patch
xsrc/external/mit/libdrm/dist/intel/test_decode.c: patch
xsrc/external/mit/libdrm/dist/intel/tests/gen4-3d.batch-ref.txt: patch
xsrc/external/mit/libdrm/dist/intel/tests/gen4-3d.batch.sh: patch
xsrc/external/mit/libdrm/dist/intel/tests/gen5-3d.batch-ref.txt: patch
xsrc/external/mit/libdrm/dist/intel/tests/gen5-3d.batch.sh: patch
xsrc/external/mit/libdrm/dist/intel/tests/gen6-3d.batch-ref.txt: patch
xsrc/external/mit/libdrm/dist/intel/tests/gen6-3d.batch.sh: patch
xsrc/external/mit/libdrm/dist/intel/tests/gen7-2d-copy.batch-ref.txt:
patch
xsrc/external/mit/libdrm/dist/intel/tests/gen7-2d-copy.batch.sh: patch
xsrc/external/mit/libdrm/dist/intel/tests/gen7-3d.batch-ref.txt: patch
xsrc/external/mit/libdrm/dist/intel/tests/gen7-3d.batch.sh: patch
xsrc/external/mit/libdrm/dist/intel/tests/gm45-3d.batch-ref.txt: patch
xsrc/external/mit/libdrm/dist/intel/tests/gm45-3d.batch.sh: patch
xsrc/external/mit/libdrm/dist/intel/tests/test-batch.sh: patch
xsrc/external/mit/libdrm/dist/libkms/Makefile.am: patch
xsrc/external/mit/libdrm/dist/libkms/Makefile.in: patch
xsrc/external/mit/libdrm/dist/libkms/dumb.c: patch
xsrc/external/mit/libdrm/dist/libkms/internal.h: patch
xsrc/external/mit/libdrm/dist/libkms/linux.c: patch
xsrc/external/mit/libdrm/dist/libkms/radeon.c: patch
xsrc/external/mit/libdrm/dist/m4/libtool.m4: patch
xsrc/external/mit/libdrm/dist/m4/ltoptions.m4: patch
xsrc/external/mit/libdrm/dist/m4/ltsugar.m4: patch
xsrc/external/mit/libdrm/dist/m4/ltversion.m4: patch
xsrc/external/mit/libdrm/dist/m4/lt~obsolete.m4: patch
xsrc/external/mit/libdrm/dist/nouveau/Makefile.am: patch
xsrc/external/mit/libdrm/dist/nouveau/Makefile.in: patch
xsrc/external/mit/libdrm/dist/nouveau/abi16.c: patch
xsrc/external/mit/libdrm/dist/nouveau/bufctx.c: patch
xsrc/external/mit/libdrm/dist/nouveau/libdrm_nouveau.pc.in: patch
xsrc/external/mit/libdrm/dist/nouveau/nouveau.c: patch
xsrc/external/mit/libdrm/dist/nouveau/nouveau.h: patch
xsrc/external/mit/libdrm/dist/nouveau/nouveau_bo.c: patch
xsrc/external/mit/libdrm/dist/nouveau/nouveau_bo.h: patch
xsrc/external/mit/libdrm/dist/nouveau/nouveau_channel.c: patch
xsrc/external/mit/libdrm/dist/nouveau/nouveau_channel.h: patch
xsrc/external/mit/libdrm/dist/nouveau/nouveau_device.c: patch
xsrc/external/mit/libdrm/dist/nouveau/nouveau_device.h: patch
xsrc/external/mit/libdrm/dist/nouveau/nouveau_drmif.h: patch
xsrc/external/mit/libdrm/dist/nouveau/nouveau_grobj.c: patch
xsrc/external/mit/libdrm/dist/nouveau/nouveau_grobj.h: patch
xsrc/external/mit/libdrm/dist/nouveau/nouveau_notifier.c: patch
xsrc/external/mit/libdrm/dist/nouveau/nouveau_notifier.h: patch
xsrc/external/mit/libdrm/dist/nouveau/nouveau_private.h: patch
xsrc/external/mit/libdrm/dist/nouveau/nouveau_pushbuf.c: patch
xsrc/external/mit/libdrm/dist/nouveau/nouveau_pushbuf.h: patch
xsrc/external/mit/libdrm/dist/nouveau/nouveau_reloc.c: patch
xsrc/external/mit/libdrm/dist/nouveau/nouveau_reloc.h: patch
xsrc/external/mit/libdrm/dist/nouveau/nouveau_resource.c: patch
xsrc/external/mit/libdrm/dist/nouveau/nouveau_resource.h: patch
xsrc/external/mit/libdrm/dist/nouveau/private.h: patch
xsrc/external/mit/libdrm/dist/nouveau/pushbuf.c: patch
xsrc/external/mit/libdrm/dist/omap/Makefile.am: patch
xsrc/external/mit/libdrm/dist/omap/Makefile.in: patch
xsrc/external/mit/libdrm/dist/omap/libdrm_omap.pc.in: patch
xsrc/external/mit/libdrm/dist/omap/omap_drm.c: patch
xsrc/external/mit/libdrm/dist/omap/omap_drm.h: patch
xsrc/external/mit/libdrm/dist/omap/omap_drmif.h: patch
xsrc/external/mit/libdrm/dist/radeon/Makefile.am: patch
xsrc/external/mit/libdrm/dist/radeon/Makefile.in: patch
xsrc/external/mit/libdrm/dist/radeon/r600_pci_ids.h: patch
xsrc/external/mit/libdrm/dist/radeon/radeon_cs_space.c: patch
xsrc/external/mit/libdrm/dist/radeon/radeon_surface.c: patch
xsrc/external/mit/libdrm/dist/radeon/radeon_surface.h: patch
xsrc/external/mit/libdrm/dist/tests/Makefile.am: patch
xsrc/external/mit/libdrm/dist/tests/Makefile.in: patch
xsrc/external/mit/libdrm/dist/tests/drmtest.c: patch
xsrc/external/mit/libdrm/dist/tests/gem_flink.c: patch
xsrc/external/mit/libdrm/dist/tests/kmstest/Makefile.in: patch
xsrc/external/mit/libdrm/dist/tests/modeprint/Makefile.am: patch
xsrc/external/mit/libdrm/dist/tests/modeprint/Makefile.in: patch
xsrc/external/mit/libdrm/dist/tests/modeprint/modeprint.c: patch
xsrc/external/mit/libdrm/dist/tests/modetest/Makefile.am: patch
xsrc/external/mit/libdrm/dist/tests/modetest/Makefile.in: patch
xsrc/external/mit/libdrm/dist/tests/modetest/modetest.c: patch
xsrc/external/mit/libdrm/dist/tests/radeon/Makefile.am: patch
xsrc/external/mit/libdrm/dist/tests/radeon/Makefile.in: patch
xsrc/external/mit/libdrm/dist/tests/radeon/list.h: patch
xsrc/external/mit/libdrm/dist/tests/radeon/radeon_ttm.c: patch
xsrc/external/mit/libdrm/dist/tests/radeon/rbo.c: patch
xsrc/external/mit/libdrm/dist/tests/radeon/rbo.h: patch
xsrc/external/mit/libdrm/dist/tests/vbltest/Makefile.in: patch
xsrc/external/mit/libdrm/dist/tests/vbltest/vbltest.c: patch
xsrc/external/mit/xf86-video-ati/dist/src/r600_exa.c: revision 1.6
xsrc/external/mit/xf86-video-ati/dist/src/r600_textured_videofuncs.c:
revision 1.2
xsrc/external/mit/xf86-video-ati/dist/src/r6xx_accel.c: revision 1.7
xsrc/external/mit/xf86-video-ati/dist/src/radeon_exa.c: revision 1.2
xsrc/external/mit/xf86-video-ati/dist/src/radeon_exa_funcs.c: revision
1.10
xsrc/external/mit/xf86-video-ati/dist/src/radeon_textured_video.c:
revision 1.5
Update libdrm to 2.4.36.
--
make sure all the KMS code is only ever run when in KMS mode. fixes
problems with the UMS (aka existing) driver type when KMS is enabled.
--
enable KMS on x86.
To generate a diff of this commit:
cvs rdiff -u -r1.44.4.2 -r1.44.4.3 src/distrib/sets/lists/xbase/shl.mi
cvs rdiff -u -r1.133.4.2 -r1.133.4.3 src/distrib/sets/lists/xcomp/mi
cvs rdiff -u -r1.30.4.2 -r1.30.4.3 src/distrib/sets/lists/xcomp/shl.mi
cvs rdiff -u -r1.8 -r1.8.4.1 src/external/mit/xorg/lib/libdrm/Makefile
cvs rdiff -u -r0 -r1.1.12.2 src/external/mit/xorg/lib/libdrm/Makefile.defines
cvs rdiff -u -r1.4 -r1.4.8.1 src/external/mit/xorg/lib/libdrm/shlib_version
cvs rdiff -u -r1.5 -r1.5.8.1 src/external/mit/xorg/lib/libdrm/drm/Makefile
cvs rdiff -u -r1.7 -r1.7.4.1 src/external/mit/xorg/lib/libdrm_intel/Makefile
cvs rdiff -u -r1.4 -r1.4.8.1 src/external/mit/xorg/lib/libdrm_radeon/Makefile
cvs rdiff -u -r1.1 -r1.1.8.1 \
src/external/mit/xorg/lib/libdrm_radeon/shlib_version
cvs rdiff -u -r1.4 -r1.4.24.1 \
src/external/mit/xorg/server/drivers/xf86-video-ati/Makefile
cvs rdiff -u -r1.13.4.1 -r1.13.4.2 \
src/external/mit/xorg/server/drivers/xf86-video-radeon/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/xbase/shl.mi
diff -u src/distrib/sets/lists/xbase/shl.mi:1.44.4.2 src/distrib/sets/lists/xbase/shl.mi:1.44.4.3
--- src/distrib/sets/lists/xbase/shl.mi:1.44.4.2 Mon Dec 22 08:24:54 2014
+++ src/distrib/sets/lists/xbase/shl.mi Wed Jul 13 19:34:23 2016
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.44.4.2 2014/12/22 08:24:54 msaitoh Exp $
+# $NetBSD: shl.mi,v 1.44.4.3 2016/07/13 19:34:23 snj Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -302,10 +302,10 @@
./usr/X11R7/lib/libXxf86vm.so.2.0 -unknown- xorg
./usr/X11R7/lib/libdrm.so -unknown- xorg
./usr/X11R7/lib/libdrm.so.3 -unknown- xorg
-./usr/X11R7/lib/libdrm.so.3.2 -unknown- xorg
+./usr/X11R7/lib/libdrm.so.3.3 -unknown- xorg
./usr/X11R7/lib/libdrm_radeon.so -unknown- xorg
./usr/X11R7/lib/libdrm_radeon.so.0 -unknown- xorg
-./usr/X11R7/lib/libdrm_radeon.so.0.0 -unknown- xorg
+./usr/X11R7/lib/libdrm_radeon.so.0.1 -unknown- xorg
./usr/X11R7/lib/libexpat.so -obsolete- obsolete
./usr/X11R7/lib/libexpat.so.2 -obsolete- obsolete
./usr/X11R7/lib/libexpat.so.2.0 -obsolete- obsolete
Index: src/distrib/sets/lists/xcomp/mi
diff -u src/distrib/sets/lists/xcomp/mi:1.133.4.2 src/distrib/sets/lists/xcomp/mi:1.133.4.3
--- src/distrib/sets/lists/xcomp/mi:1.133.4.2 Mon Dec 22 08:24:54 2014
+++ src/distrib/sets/lists/xcomp/mi Wed Jul 13 19:34:23 2016
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.133.4.2 2014/12/22 08:24:54 msaitoh Exp $
+# $NetBSD: mi,v 1.133.4.3 2016/07/13 19:34:23 snj Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -5780,13 +5780,17 @@
./usr/X11R7/include/ft2build.h -unknown- xorg
./usr/X11R7/include/libdrm/drm.h -unknown- xorg
./usr/X11R7/include/libdrm/drm_mode.h -unknown- xorg
+./usr/X11R7/include/libdrm/drm_fourcc.h -unknown- xorg
./usr/X11R7/include/libdrm/drm_sarea.h -unknown- xorg
./usr/X11R7/include/libdrm/i915_drm.h -unknown- xorg
./usr/X11R7/include/libdrm/intel_bufmgr.h -unknown- xorg
+./usr/X11R7/include/libdrm/intel_aub.h -unknown- xorg
+./usr/X11R7/include/libdrm/intel_debug.h -unknown- xorg
./usr/X11R7/include/libdrm/mach64_drm.h -unknown- xorg
./usr/X11R7/include/libdrm/mga_drm.h -unknown- xorg
./usr/X11R7/include/libdrm/nouveau_drm.h -unknown- xorg
./usr/X11R7/include/libdrm/r128_drm.h -unknown- xorg
+./usr/X11R7/include/libdrm/r600_pci_ids.h -unknown- xorg
./usr/X11R7/include/libdrm/radeon_bo.h -unknown- xorg
./usr/X11R7/include/libdrm/radeon_bo_gem.h -unknown- xorg
./usr/X11R7/include/libdrm/radeon_bo_int.h -unknown- xorg
@@ -5794,6 +5798,7 @@
./usr/X11R7/include/libdrm/radeon_cs_gem.h -unknown- xorg
./usr/X11R7/include/libdrm/radeon_cs_int.h -unknown- xorg
./usr/X11R7/include/libdrm/radeon_drm.h -unknown- xorg
+./usr/X11R7/include/libdrm/radeon_surface.h -unknown- xorg
./usr/X11R7/include/libdrm/savage_drm.h -unknown- xorg
./usr/X11R7/include/libdrm/sis_drm.h -unknown- xorg
./usr/X11R7/include/libdrm/via_drm.h -unknown- xorg
Index: src/distrib/sets/lists/xcomp/shl.mi
diff -u src/distrib/sets/lists/xcomp/shl.mi:1.30.4.2 src/distrib/sets/lists/xcomp/shl.mi:1.30.4.3
--- src/distrib/sets/lists/xcomp/shl.mi:1.30.4.2 Mon Dec 22 08:24:54 2014
+++ src/distrib/sets/lists/xcomp/shl.mi Wed Jul 13 19:34:23 2016
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.30.4.2 2014/12/22 08:24:54 msaitoh Exp $
+# $NetBSD: shl.mi,v 1.30.4.3 2016/07/13 19:34:23 snj Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -229,8 +229,8 @@
./usr/libdata/debug/usr/X11R7/lib/libXxf86dga.so.2.0.debug -unknown- xorg,debug
./usr/libdata/debug/usr/X11R7/lib/libXxf86misc.so.2.0.debug -unknown- xorg,debug
./usr/libdata/debug/usr/X11R7/lib/libXxf86vm.so.2.0.debug -unknown- xorg,debug
-./usr/libdata/debug/usr/X11R7/lib/libdrm.so.3.2.debug -unknown- xorg,debug
-./usr/libdata/debug/usr/X11R7/lib/libdrm_radeon.so.0.0.debug -unknown- xorg,debug
+./usr/libdata/debug/usr/X11R7/lib/libdrm.so.3.3.debug -unknown- xorg,debug
+./usr/libdata/debug/usr/X11R7/lib/libdrm_radeon.so.0.1.debug -unknown- xorg,debug
./usr/libdata/debug/usr/X11R7/lib/libexpat.so.2.0.debug -obsolete- obsolete
./usr/libdata/debug/usr/X11R7/lib/libfontconfig.so.2.2.debug -unknown- xorg,debug
./usr/libdata/debug/usr/X11R7/lib/libfontenc.so.2.0.debug -unknown- xorg,debug
Index: src/external/mit/xorg/lib/libdrm/Makefile
diff -u src/external/mit/xorg/lib/libdrm/Makefile:1.8 src/external/mit/xorg/lib/libdrm/Makefile:1.8.4.1
--- src/external/mit/xorg/lib/libdrm/Makefile:1.8 Thu Aug 11 23:15:39 2011
+++ src/external/mit/xorg/lib/libdrm/Makefile Wed Jul 13 19:34:23 2016
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.8 2011/08/11 23:15:39 joerg Exp $
+# $NetBSD: Makefile,v 1.8.4.1 2016/07/13 19:34:23 snj Exp $
.include <bsd.own.mk>
LIB= drm
.PATH: ${X11SRCDIR.${LIB}}
-SRCS= xf86drm.c xf86drmHash.c xf86drmRandom.c xf86drmSL.c
+SRCS= xf86drm.c xf86drmHash.c xf86drmMode.c xf86drmRandom.c xf86drmSL.c
INCS= xf86drm.h xf86drmMode.h
INCSDIR=${X11INCDIR}
@@ -19,6 +19,8 @@ PKGDIST= ${LIB}
CWARNFLAGS.clang+= -Wno-conversion -Wno-tautological-compare
+.include "Makefile.defines"
+
.include <bsd.x11.mk>
.include <bsd.lib.mk>
.include <bsd.subdir.mk>
Index: src/external/mit/xorg/lib/libdrm/shlib_version
diff -u src/external/mit/xorg/lib/libdrm/shlib_version:1.4 src/external/mit/xorg/lib/libdrm/shlib_version:1.4.8.1
--- src/external/mit/xorg/lib/libdrm/shlib_version:1.4 Sat May 22 22:43:57 2010
+++ src/external/mit/xorg/lib/libdrm/shlib_version Wed Jul 13 19:34:23 2016
@@ -1,4 +1,4 @@
-# $NetBSD: shlib_version,v 1.4 2010/05/22 22:43:57 mrg Exp $
+# $NetBSD: shlib_version,v 1.4.8.1 2016/07/13 19:34:23 snj Exp $
#
major=3
-minor=2
+minor=3
Index: src/external/mit/xorg/lib/libdrm/drm/Makefile
diff -u src/external/mit/xorg/lib/libdrm/drm/Makefile:1.5 src/external/mit/xorg/lib/libdrm/drm/Makefile:1.5.8.1
--- src/external/mit/xorg/lib/libdrm/drm/Makefile:1.5 Sat May 22 23:19:24 2010
+++ src/external/mit/xorg/lib/libdrm/drm/Makefile Wed Jul 13 19:34:23 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2010/05/22 23:19:24 mrg Exp $
+# $NetBSD: Makefile,v 1.5.8.1 2016/07/13 19:34:23 snj Exp $
# install include/libdrm files
@@ -9,14 +9,18 @@
.PATH: ${X11SRCDIR.drm}/radeon
INCS= drm.h \
+ drm_fourcc.h \
drm_mode.h \
drm_sarea.h \
i915_drm.h \
+ intel_aub.h \
intel_bufmgr.h \
+ intel_debug.h \
mach64_drm.h \
mga_drm.h \
nouveau_drm.h \
r128_drm.h \
+ r600_pci_ids.h \
radeon_bo.h \
radeon_bo_gem.h \
radeon_bo_int.h \
@@ -24,6 +28,7 @@ INCS= drm.h \
radeon_cs_gem.h \
radeon_cs_int.h \
radeon_drm.h \
+ radeon_surface.h \
savage_drm.h \
sis_drm.h \
via_drm.h
Index: src/external/mit/xorg/lib/libdrm_intel/Makefile
diff -u src/external/mit/xorg/lib/libdrm_intel/Makefile:1.7 src/external/mit/xorg/lib/libdrm_intel/Makefile:1.7.4.1
--- src/external/mit/xorg/lib/libdrm_intel/Makefile:1.7 Thu Aug 11 23:15:39 2011
+++ src/external/mit/xorg/lib/libdrm_intel/Makefile Wed Jul 13 19:34:23 2016
@@ -1,11 +1,12 @@
-# $NetBSD: Makefile,v 1.7 2011/08/11 23:15:39 joerg Exp $
+# $NetBSD: Makefile,v 1.7.4.1 2016/07/13 19:34:23 snj Exp $
.include <bsd.own.mk>
LIB= drm_intel
.PATH: ${X11SRCDIR.drm}/intel
-SRCS= intel_bufmgr.c intel_bufmgr_fake.c intel_bufmgr_gem.c mm.c
+SRCS= intel_bufmgr.c intel_bufmgr_fake.c intel_bufmgr_gem.c \
+ intel_decode.c mm.c
CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/libdrm
CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/X11 -I${X11SRCDIR.drm}
Index: src/external/mit/xorg/lib/libdrm_radeon/Makefile
diff -u src/external/mit/xorg/lib/libdrm_radeon/Makefile:1.4 src/external/mit/xorg/lib/libdrm_radeon/Makefile:1.4.8.1
--- src/external/mit/xorg/lib/libdrm_radeon/Makefile:1.4 Sat Aug 14 10:29:43 2010
+++ src/external/mit/xorg/lib/libdrm_radeon/Makefile Wed Jul 13 19:34:23 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2010/08/14 10:29:43 mrg Exp $
+# $NetBSD: Makefile,v 1.4.8.1 2016/07/13 19:34:23 snj Exp $
.include <bsd.own.mk>
@@ -11,6 +11,7 @@ SRCS= radeon_bo.c \
radeon_cs.c \
radeon_cs_gem.c \
radeon_cs_space.c \
+ radeon_surface.c \
bof.c
CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/libdrm
@@ -23,5 +24,7 @@ LIBDPLIBS= drm ${.CURDIR}/../libdrm
PKGCONFIG= libdrm_radeon
PKGDIST= drm
+.include "../libdrm/Makefile.defines"
+
.include <bsd.x11.mk>
.include <bsd.lib.mk>
Index: src/external/mit/xorg/lib/libdrm_radeon/shlib_version
diff -u src/external/mit/xorg/lib/libdrm_radeon/shlib_version:1.1 src/external/mit/xorg/lib/libdrm_radeon/shlib_version:1.1.8.1
--- src/external/mit/xorg/lib/libdrm_radeon/shlib_version:1.1 Sat May 22 22:48:19 2010
+++ src/external/mit/xorg/lib/libdrm_radeon/shlib_version Wed Jul 13 19:34:23 2016
@@ -1,4 +1,4 @@
-# $NetBSD: shlib_version,v 1.1 2010/05/22 22:48:19 mrg Exp $
+# $NetBSD: shlib_version,v 1.1.8.1 2016/07/13 19:34:23 snj Exp $
#
major=0
-minor=0
+minor=1
Index: src/external/mit/xorg/server/drivers/xf86-video-ati/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-video-ati/Makefile:1.4 src/external/mit/xorg/server/drivers/xf86-video-ati/Makefile:1.4.24.1
--- src/external/mit/xorg/server/drivers/xf86-video-ati/Makefile:1.4 Sun Aug 3 14:47:26 2008
+++ src/external/mit/xorg/server/drivers/xf86-video-ati/Makefile Wed Jul 13 19:34:23 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2008/08/03 14:47:26 rtr Exp $
+# $NetBSD: Makefile,v 1.4.24.1 2016/07/13 19:34:23 snj Exp $
DRIVER= xf86-video-ati
DRIVER_NAME= ati_drv
@@ -6,4 +6,6 @@ DRIVER_NAME= ati_drv
SRCS= ati.c atimodule.c
MAN= ati.4
+LIBDPLIBS+= drm_radeon ${.CURDIR}/../../../lib/libdrm_radeon
+
.include "../Makefile.xf86-driver"
Index: src/external/mit/xorg/server/drivers/xf86-video-radeon/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-video-radeon/Makefile:1.13.4.1 src/external/mit/xorg/server/drivers/xf86-video-radeon/Makefile:1.13.4.2
--- src/external/mit/xorg/server/drivers/xf86-video-radeon/Makefile:1.13.4.1 Mon Feb 11 21:04:46 2013
+++ src/external/mit/xorg/server/drivers/xf86-video-radeon/Makefile Wed Jul 13 19:34:23 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13.4.1 2013/02/11 21:04:46 riz Exp $
+# $NetBSD: Makefile,v 1.13.4.2 2016/07/13 19:34:23 snj Exp $
.include <bsd.own.mk>
@@ -16,7 +16,12 @@ SRCS.DRI= radeon_dri.c
CPPFLAGS+= ${X11FLAGS.DRI}
.endif
-#RADEON_KMS_SRCS=radeon_dri2.c radeon_kms.c drmmode_display.c radeon_vbo.c
+# XXX
+.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64"
+SRCS.KMS= radeon_dri2.c radeon_kms.c drmmode_display.c radeon_vbo.c
+CPPFLAGS+= -DXF86DRM_MODE
+LIBDPLIBS+= drm_radeon ${.CURDIR}/../../../lib/libdrm_radeon
+.endif
SRCS.EXA= radeon_exa.c r600_exa.c r6xx_accel.c \
r600_textured_videofuncs.c r600_shader.c \
@@ -32,7 +37,8 @@ SRCS= radeon_accel.c radeon_cursor.c \
radeon_crtc.c radeon_output.c radeon_modes.c radeon_tv.c \
radeon_legacy_memory.c radeon_pm.c radeon_xvmc.c \
$(SRCS.ATOMBIOS) radeon_atombios.c radeon_atomwrapper.c \
- $(SRCS.DRI) $(SRCS.EXA) atombios_output.c atombios_crtc.c
+ $(SRCS.DRI) $(SRCS.EXA) atombios_output.c atombios_crtc.c \
+ $(SRCS.KMS)
MAN= radeon.4
CPPFLAGS+= -DDISABLE_EASF -DENABLE_ALL_SERVICE_FUNCTIONS \
Added files:
Index: src/external/mit/xorg/lib/libdrm/Makefile.defines
diff -u /dev/null src/external/mit/xorg/lib/libdrm/Makefile.defines:1.1.12.2
--- /dev/null Wed Jul 13 19:34:24 2016
+++ src/external/mit/xorg/lib/libdrm/Makefile.defines Wed Jul 13 19:34:23 2016
@@ -0,0 +1,16 @@
+# $NetBSD: Makefile.defines,v 1.1.12.2 2016/07/13 19:34:23 snj Exp $
+
+# common defiles for libdrm components
+
+CPPFLAGS+= -DHAVE_INTTYPES_H \
+ -DHAVE_RADEON \
+ -DHAVE_SETENV \
+ -DHAVE_STDINT_H \
+ -DHAVE_STRINGS_H \
+ -DHAVE_STRING_H \
+ -DHAVE_SYS_STAT_H \
+ -DHAVE_SYS_TYPES_H \
+ -DHAVE_UNISTD_H
+
+# -DHAVE_NOUVEAU
+
