Module Name: src
Committed By: mrg
Date: Tue Aug 29 07:12:13 UTC 2017
Modified Files:
src/external/mit/xorg/lib/libdrm_amdgpu: Makefile
Log Message:
update for libdrm 2.4.83. the amdgpu.ids file isn't installed yet
(some odd FILES issue?) but this isn't a used driver yet anyway.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 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_amdgpu/Makefile
diff -u src/external/mit/xorg/lib/libdrm_amdgpu/Makefile:1.2 src/external/mit/xorg/lib/libdrm_amdgpu/Makefile:1.3
--- src/external/mit/xorg/lib/libdrm_amdgpu/Makefile:1.2 Thu Aug 18 13:46:58 2016
+++ src/external/mit/xorg/lib/libdrm_amdgpu/Makefile Tue Aug 29 07:12:13 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2016/08/18 13:46:58 christos Exp $
+# $NetBSD: Makefile,v 1.3 2017/08/29 07:12:13 mrg Exp $
.include <bsd.own.mk>
@@ -7,6 +7,7 @@ LIB= drm_amdgpu
.PATH: ${X11SRCDIR.drm}/amdgpu
SRCS= \
+ amdgpu_asic_id.c \
amdgpu_bo.c \
amdgpu_cs.c \
amdgpu_device.c \
@@ -15,9 +16,14 @@ SRCS= \
util_hash.c \
util_hash_table.c
+LIBDRMDATADIR= ${X11ROOTDIR}/share/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+= -DAMDGPU_ASIC_ID_TABLE=\"${LIBDRMDATADIR}/amdgpu.ids\" \
+ -DAMDGPU_ASIC_ID_TABLE_NUM_ENTRIES=$(IDS_NENT)
LIBDPLIBS= drm ${.CURDIR}/../libdrm
@@ -26,6 +32,11 @@ PKGDIST= drm
COPTS.amdgpu_cs.c+= -Wno-stack-protector
+#FILES= amdgpu.ids
+#FILESDIR= ${LIBDRMDATADIR}
+
+.PATH: ${X11SRCDIR.libdrm}/data
+
.include "../libdrm/Makefile.defines"
.include <bsd.x11.mk>