View | Details | Raw Unified | Return to bug 237630
Collapse All | Expand All

(-)Makefile (+10 lines)
Lines 28-33 Link Here
28
28
29
.include <bsd.port.options.mk>
29
.include <bsd.port.options.mk>
30
30
31
.if ${ARCH} == powerpc64
32
EXTRA_PATCHES=	${PATCHDIR}/extra-patch-dev_drm2_drm__bufs.c
33
.endif
34
35
.if ${ARCH} == amd64 || ${ARCH} == i386
36
PLIST_SUB+=	X86=""
37
.else
38
PLIST_SUB+=	X86="@comment "
39
.endif
40
31
.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1200080
41
.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1200080
32
IGNORE=		only for 12.0 or higher after removal of base components
42
IGNORE=		only for 12.0 or higher after removal of base components
33
.endif
43
.endif
(-)files/extra-patch-dev_drm2_drm__bufs.c (+24 lines)
Line 0 Link Here
1
Index: src/dev/drm2/drm_bufs.c
2
===================================================================
3
--- src/dev/drm2/drm_bufs.c	(revision 346590)
4
+++ src/dev/drm2/drm_bufs.c	(working copy)
5
@@ -63,7 +63,7 @@
6
 
7
 	rid = PCIR_BAR(resource);
8
 	res = bus_alloc_resource_any(dev->dev, SYS_RES_MEMORY, &rid,
9
-	    RF_SHAREABLE);
10
+	    RF_SHAREABLE | RF_ACTIVE);
11
 	if (res == NULL) {
12
 		DRM_ERROR("Couldn't find resource 0x%x\n", resource);
13
 		return 1;
14
@@ -87,7 +87,10 @@
15
 	if (drm_alloc_resource(dev, resource) != 0)
16
 		return 0;
17
 
18
+#if 0
19
 	start = rman_get_start(dev->pcir[resource]);
20
+#endif
21
+	start = pmap_kextract(rman_get_bushandle(dev->pcir[resource]));
22
 
23
 	mtx_unlock(&dev->pcir_lock);
24
 
(-)files/patch-drm2_radeonkms_Makefile (+11 lines)
Line 0 Link Here
1
--- drm2/radeonkms/Makefile.orig	2019-04-30 21:45:27 UTC
2
+++ drm2/radeonkms/Makefile
3
@@ -110,7 +110,7 @@ SRCS	+=								\
4
 
5
 CFLAGS+= -I${.CURDIR:H}/../src/
6
 
7
-CFLAGS+=			-I${SRCTOP}/../src/dev/drm2/radeon
8
+CFLAGS+=			-I${.CURDIR:H}/../src/dev/drm2/radeon
9
 
10
 CWARNFLAGS+=			${CWARNFLAGS.${.IMPSRC:T}}
11
 CWARNFLAGS+=	${NO_WUNUSED_BUT_SET_VARIABLE}
(-)files/patch-drm_savage_Makefile (+11 lines)
Line 0 Link Here
1
--- drm/savage/Makefile.orig	2019-04-30 21:45:09 UTC
2
+++ drm/savage/Makefile
3
@@ -3,7 +3,7 @@
4
 .PATH:	${.CURDIR:H:H}/src/dev/drm
5
 
6
 KMOD= 	savage
7
-CFLAGS += -I${SRCTOP}/sys/dev/drm
8
+CFLAGS += -I${.CURDIR:H}/drm
9
 SRCS=	savage_bci.c savage_drv.c savage_state.c
10
 SRCS+=	device_if.h bus_if.h pci_if.h opt_drm.h
11
 
(-)pkg-plist (-1 / +1 lines)
Lines 1-6 Link Here
1
/%%KMODDIR%%/drm.ko
1
/%%KMODDIR%%/drm.ko
2
/%%KMODDIR%%/drm2.ko
2
/%%KMODDIR%%/drm2.ko
3
/%%KMODDIR%%/i915kms.ko
3
%%X86%%/%%KMODDIR%%/i915kms.ko
4
/%%KMODDIR%%/mach64.ko
4
/%%KMODDIR%%/mach64.ko
5
/%%KMODDIR%%/mga.ko
5
/%%KMODDIR%%/mga.ko
6
/%%KMODDIR%%/r128.ko
6
/%%KMODDIR%%/r128.ko

Return to bug 237630