Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/external/mit/xorg/lib/libdrm_amdgpu update for libdrm 2.4.83...



details:   https://anonhg.NetBSD.org/src/rev/214d4131d512
branches:  trunk
changeset: 356042:214d4131d512
user:      mrg <mrg%NetBSD.org@localhost>
date:      Tue Aug 29 07:12:13 2017 +0000

description:
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.

diffstat:

 external/mit/xorg/lib/libdrm_amdgpu/Makefile |  13 ++++++++++++-
 1 files changed, 12 insertions(+), 1 deletions(-)

diffs (44 lines):

diff -r 7598823d7580 -r 214d4131d512 external/mit/xorg/lib/libdrm_amdgpu/Makefile
--- a/external/mit/xorg/lib/libdrm_amdgpu/Makefile      Tue Aug 29 06:38:49 2017 +0000
+++ b/external/mit/xorg/lib/libdrm_amdgpu/Makefile      Tue Aug 29 07:12:13 2017 +0000
@@ -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 @@
 .PATH: ${X11SRCDIR.drm}/amdgpu
 
 SRCS= \
+       amdgpu_asic_id.c \
        amdgpu_bo.c \
        amdgpu_cs.c \
        amdgpu_device.c \
@@ -15,9 +16,14 @@
        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 @@
 
 COPTS.amdgpu_cs.c+= -Wno-stack-protector
 
+#FILES=                amdgpu.ids
+#FILESDIR=     ${LIBDRMDATADIR}
+
+.PATH:          ${X11SRCDIR.libdrm}/data
+
 .include "../libdrm/Makefile.defines"
 
 .include <bsd.x11.mk>



Home | Main Index | Thread Index | Old Index