Module Name: src
Committed By: mrg
Date: Wed Mar 14 07:23:00 UTC 2018
Modified Files:
src/external/mit/xorg/lib/libdrm: Makefile.defines
src/external/mit/xorg/lib/libdrm_amdgpu: Makefile
Log Message:
update for libdrm 2.4.91.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/mit/xorg/lib/libdrm/Makefile.defines
cvs rdiff -u -r1.3 -r1.4 src/external/mit/xorg/lib/libdrm_amdgpu/Makefile
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/lib/libdrm/Makefile.defines
diff -u src/external/mit/xorg/lib/libdrm/Makefile.defines:1.2 src/external/mit/xorg/lib/libdrm/Makefile.defines:1.3
--- src/external/mit/xorg/lib/libdrm/Makefile.defines:1.2 Mon Mar 6 13:50:40 2017
+++ src/external/mit/xorg/lib/libdrm/Makefile.defines Wed Mar 14 07:23:00 2018
@@ -1,15 +1,19 @@
-# $NetBSD: Makefile.defines,v 1.2 2017/03/06 13:50:40 maya Exp $
+# $NetBSD: Makefile.defines,v 1.3 2018/03/14 07:23:00 mrg Exp $
# common defiles for libdrm components
CPPFLAGS+= -DHAVE_INTTYPES_H \
- -DHAVE_NOUVEAU \
- -DHAVE_RADEON \
- -DHAVE_SETENV \
-DHAVE_STDINT_H \
-DHAVE_STRINGS_H \
-DHAVE_STRING_H \
-DHAVE_SYS_STAT_H \
+ -DHAVE_SYS_SYSCTL_H \
-DHAVE_SYS_TYPES_H \
-DHAVE_UNISTD_H
+CPPFLAGS+= -DHAVE_SETENV
+# NetBSD has __sync_*().
+CPPFLAGS+= -DHAVE_LIBDRM_ATOMIC_PRIMITIVES \
+
+CPPFLAGS+= -DHAVE_NOUVEAU \
+ -DHAVE_RADEON
Index: src/external/mit/xorg/lib/libdrm_amdgpu/Makefile
diff -u src/external/mit/xorg/lib/libdrm_amdgpu/Makefile:1.3 src/external/mit/xorg/lib/libdrm_amdgpu/Makefile:1.4
--- src/external/mit/xorg/lib/libdrm_amdgpu/Makefile:1.3 Tue Aug 29 07:12:13 2017
+++ src/external/mit/xorg/lib/libdrm_amdgpu/Makefile Wed Mar 14 07:23:00 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2017/08/29 07:12:13 mrg Exp $
+# $NetBSD: Makefile,v 1.4 2018/03/14 07:23:00 mrg Exp $
.include <bsd.own.mk>
@@ -13,15 +13,16 @@ SRCS= \
amdgpu_device.c \
amdgpu_gpu_info.c \
amdgpu_vamgr.c \
+ amdgpu_vm.c \
util_hash.c \
util_hash_table.c
LIBDRMDATADIR= ${X11ROOTDIR}/share/libdrm
+# XXX goes away in new libdrm.
IDS_NENT!= egrep -ci '^[0-9a-f]{4},.*[0-9a-f]+,' ${X11SRCDIR.drm}/data/amdgpu.ids
CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/libdrm
-CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/X11 -I${X11SRCDIR.drm} \
- -DHAVE_SYS_SYSCTL_H
+CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/X11 -I${X11SRCDIR.drm}
CPPFLAGS+= -DAMDGPU_ASIC_ID_TABLE=\"${LIBDRMDATADIR}/amdgpu.ids\" \
-DAMDGPU_ASIC_ID_TABLE_NUM_ENTRIES=$(IDS_NENT)
