Attachment 204128 Details for Bug 237630 – patch

[patch] patch

drm-legacy-kmod.patch (text/plain), 3.92 KB, created by Piotr Kubaj on 2019-04-30 21:59:16 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Piotr Kubaj

Created: 2019-04-30 21:59:16 UTC

Size: 3.92 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 500456)
>+++ Makefile	(working copy)
>@@ -28,6 +28,16 @@
> 
> .include <bsd.port.options.mk>
> 
>+.if ${ARCH} == powerpc64
>+EXTRA_PATCHES=	${PATCHDIR}/extra-patch-dev_drm2_drm__bufs.c
>+.endif
>+
>+.if ${ARCH} == amd64 || ${ARCH} == i386
>+PLIST_SUB+=	X86=""
>+.else
>+PLIST_SUB+=	X86="@comment "
>+.endif
>+
> .if ${OPSYS} == FreeBSD && ${OSVERSION} < 1200080
> IGNORE=		only for 12.0 or higher after removal of base components
> .endif
>Index: files/extra-patch-dev_drm2_drm__bufs.c
>===================================================================
>--- files/extra-patch-dev_drm2_drm__bufs.c	(nonexistent)
>+++ files/extra-patch-dev_drm2_drm__bufs.c	(working copy)
>@@ -0,0 +1,24 @@
>+Index: src/dev/drm2/drm_bufs.c
>+===================================================================
>+--- src/dev/drm2/drm_bufs.c	(revision 346590)
>++++ src/dev/drm2/drm_bufs.c	(working copy)
>+@@ -63,7 +63,7 @@
>+ 
>+ 	rid = PCIR_BAR(resource);
>+ 	res = bus_alloc_resource_any(dev->dev, SYS_RES_MEMORY, &rid,
>+-	    RF_SHAREABLE);
>++	    RF_SHAREABLE | RF_ACTIVE);
>+ 	if (res == NULL) {
>+ 		DRM_ERROR("Couldn't find resource 0x%x\n", resource);
>+ 		return 1;
>+@@ -87,7 +87,10 @@
>+ 	if (drm_alloc_resource(dev, resource) != 0)
>+ 		return 0;
>+ 
>++#if 0
>+ 	start = rman_get_start(dev->pcir[resource]);
>++#endif
>++	start = pmap_kextract(rman_get_bushandle(dev->pcir[resource]));
>+ 
>+ 	mtx_unlock(&dev->pcir_lock);
>+ 
>
>Property changes on: files/extra-patch-dev_drm2_drm__bufs.c
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: files/patch-drm2_radeonkms_Makefile
>===================================================================
>--- files/patch-drm2_radeonkms_Makefile	(nonexistent)
>+++ files/patch-drm2_radeonkms_Makefile	(working copy)
>@@ -0,0 +1,11 @@
>+--- drm2/radeonkms/Makefile.orig	2019-04-30 21:45:27 UTC
>++++ drm2/radeonkms/Makefile
>+@@ -110,7 +110,7 @@ SRCS	+=								\
>+ 
>+ CFLAGS+= -I${.CURDIR:H}/../src/
>+ 
>+-CFLAGS+=			-I${SRCTOP}/../src/dev/drm2/radeon
>++CFLAGS+=			-I${.CURDIR:H}/../src/dev/drm2/radeon
>+ 
>+ CWARNFLAGS+=			${CWARNFLAGS.${.IMPSRC:T}}
>+ CWARNFLAGS+=	${NO_WUNUSED_BUT_SET_VARIABLE}
>
>Property changes on: files/patch-drm2_radeonkms_Makefile
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: files/patch-drm_savage_Makefile
>===================================================================
>--- files/patch-drm_savage_Makefile	(nonexistent)
>+++ files/patch-drm_savage_Makefile	(working copy)
>@@ -0,0 +1,11 @@
>+--- drm/savage/Makefile.orig	2019-04-30 21:45:09 UTC
>++++ drm/savage/Makefile
>+@@ -3,7 +3,7 @@
>+ .PATH:	${.CURDIR:H:H}/src/dev/drm
>+ 
>+ KMOD= 	savage
>+-CFLAGS += -I${SRCTOP}/sys/dev/drm
>++CFLAGS += -I${.CURDIR:H}/drm
>+ SRCS=	savage_bci.c savage_drv.c savage_state.c
>+ SRCS+=	device_if.h bus_if.h pci_if.h opt_drm.h
>+ 
>
>Property changes on: files/patch-drm_savage_Makefile
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: pkg-plist
>===================================================================
>--- pkg-plist	(revision 500456)
>+++ pkg-plist	(working copy)
>@@ -1,6 +1,6 @@
> /%%KMODDIR%%/drm.ko
> /%%KMODDIR%%/drm2.ko
>-/%%KMODDIR%%/i915kms.ko
>+%%X86%%/%%KMODDIR%%/i915kms.ko
> /%%KMODDIR%%/mach64.ko
> /%%KMODDIR%%/mga.ko
> /%%KMODDIR%%/r128.ko

Actions: View | Diff

Attachments on bug 237630: 204128