Index: head/graphics/drm-current-kmod/files/patch-drivers_gpu_drm_i915_i915__request.c =================================================================== --- head/graphics/drm-current-kmod/files/patch-drivers_gpu_drm_i915_i915__request.c (revision 548600) +++ head/graphics/drm-current-kmod/files/patch-drivers_gpu_drm_i915_i915__request.c (nonexistent) @@ -1,12 +0,0 @@ ---- drivers/gpu/drm/i915/i915_request.c.orig 2020-09-10 16:18:40 UTC -+++ drivers/gpu/drm/i915/i915_request.c -@@ -492,7 +492,9 @@ void __i915_request_unsubmit(struct i915_request *requ - #endif - - GEM_BUG_ON(!irqs_disabled()); -+#ifdef __freebsd_notyet__ - lockdep_assert_held(&engine->active.lock); -+#endif - - /* - * Only unwind in reverse order, required so that the per-context list Property changes on: head/graphics/drm-current-kmod/files/patch-drivers_gpu_drm_i915_i915__request.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/graphics/drm-current-kmod/Makefile =================================================================== --- head/graphics/drm-current-kmod/Makefile (revision 548600) +++ head/graphics/drm-current-kmod/Makefile (revision 548601) @@ -1,90 +1,89 @@ # Created by: Johannes Dieterich # $FreeBSD$ PORTNAME= drm-current-kmod -PORTVERSION= 5.4.62.g20200905 -PORTREVISION= 2 +PORTVERSION= 5.4.62.g20200914 CATEGORIES= graphics kld MAINTAINER= x11@FreeBSD.org COMMENT= DRM modules for the linuxkpi-based KMS components LICENSE= BSD2CLAUSE MIT GPLv2 LICENSE_COMB= multi ONLY_FOR_ARCHS= aarch64 amd64 i386 powerpc64 ONLY_FOR_ARCHS_REASON= the new KMS components are only supported on amd64, i386, aarch64 and powerpc64 -RUN_DEPENDS= gpu-firmware-kmod>=g20200503:graphics/gpu-firmware-kmod +RUN_DEPENDS= gpu-firmware-kmod>=g20200914:graphics/gpu-firmware-kmod CONFLICTS_INSTALL= drm-devel-kmod \ drm-fbsd11.2-kmod \ drm-fbsd12.0-kmod \ drm-legacy-kmod OPTIONS_DEFINE= DEBUG SOURCE OPTIONS_DEFAULT= SOURCE SOURCE_DESC= Install kernel module sources OPTIONS_SUB= yes USES= kmod uidfix compiler:c++11-lang USE_GITHUB= yes GH_ACCOUNT= freebsd GH_PROJECT= drm-kmod -GH_TAGNAME= drm_v5.4.62 +GH_TAGNAME= drm_v5.4.62_1 .include .if ${OPSYS} == FreeBSD && ${OSVERSION} < 1300108 IGNORE= not supported on older CURRENT, no kernel support .endif .if ${OPSYS} != FreeBSD IGNORE= not supported on anything but FreeBSD (missing linuxkpi functionality) .endif .if ${ARCH} == "amd64" PLIST_SUB+= AMDGPU="" PLIST_SUB+= I915="" PLIST_SUB+= VMWGFX="" PLIST_SUB+= VBOXVIDEO="" .elif ${ARCH} == "i386" PLIST_SUB+= AMDGPU="@comment " PLIST_SUB+= I915="" PLIST_SUB+= VMWGFX="" PLIST_SUB+= VBOXVIDEO="" .elif ${ARCH} == "aarch64" || ${ARCH} == "powerpc64" PLIST_SUB+= AMDGPU="" PLIST_SUB+= I915="@comment " PLIST_SUB+= VBOXVIDEO="@comment " PLIST_SUB+= VMWGFX="@comment " .else PLIST_SUB+= AMDGPU="@comment " PLIST_SUB+= I915="@comment " PLIST_SUB+= VBOXVIDEO="@comment " PLIST_SUB+= VMWGFX="@comment " .endif KMODSRC= ${STAGEDIR}${PREFIX}/sys/modules/${PORTNAME} SRCDIRS= amd drivers drm i915 include linuxkpi radeon ttm vmwgfx vboxvideo PLIST_SUB+= KMODSRC="sys/modules/${PORTNAME}" MAKE_ENV+= MAKEOBJDIRPREFIX=${WRKSRC}/obj pre-build: ${MKDIR} ${WRKSRC}/obj (cd ${WRKSRC} ; ${SETENV} ${MAKE_ENV} ${MAKE_CMD} obj) post-install-SOURCE-on: ${MKDIR} ${KMODSRC} ${INSTALL_DATA} ${WRKSRC}/Makefile ${KMODSRC} ${INSTALL_DATA} ${WRKSRC}/kconfig.mk ${KMODSRC} .for dir in ${SRCDIRS} cd ${WRKSRC} && ${COPYTREE_SHARE} ${dir} ${KMODSRC} .endfor .include Index: head/graphics/drm-current-kmod/distinfo =================================================================== --- head/graphics/drm-current-kmod/distinfo (revision 548600) +++ head/graphics/drm-current-kmod/distinfo (revision 548601) @@ -1,3 +1,3 @@ -TIMESTAMP = 1599641604 -SHA256 (freebsd-drm-kmod-5.4.62.g20200905-drm_v5.4.62_GH0.tar.gz) = 8656855b9ca8b64335271cbfbc33bbc5f98c58557c28e8d91024b4f27f9044ac -SIZE (freebsd-drm-kmod-5.4.62.g20200905-drm_v5.4.62_GH0.tar.gz) = 18881083 +TIMESTAMP = 1600076010 +SHA256 (freebsd-drm-kmod-5.4.62.g20200914-drm_v5.4.62_1_GH0.tar.gz) = 1c225ec66c3734670a85697827757a64bdfa90d6e0f6edcd454a3891040a5351 +SIZE (freebsd-drm-kmod-5.4.62.g20200914-drm_v5.4.62_1_GH0.tar.gz) = 18881626 Index: head/graphics/drm-devel-kmod/Makefile =================================================================== --- head/graphics/drm-devel-kmod/Makefile (revision 548600) +++ head/graphics/drm-devel-kmod/Makefile (revision 548601) @@ -1,69 +1,68 @@ # Created by: Johannes Dieterich # $FreeBSD$ PORTNAME= drm-devel-kmod -PORTVERSION= 5.4.62.g20200905 -PORTREVISION= 1 +PORTVERSION= 5.4.62.g20200914 CATEGORIES= graphics kld MAINTAINER= x11@FreeBSD.org COMMENT= DRM modules for the linuxkpi-based KMS components (development version) LICENSE= BSD2CLAUSE MIT GPLv2 LICENSE_COMB= multi ONLY_FOR_ARCHS= aarch64 amd64 i386 powerpc64 ONLY_FOR_ARCHS_REASON= the new KMS components are only supported on amd64, arm64, i386 and powerpc64 -RUN_DEPENDS= gpu-firmware-kmod>=g20200503:graphics/gpu-firmware-kmod +RUN_DEPENDS= gpu-firmware-kmod>=g20200914:graphics/gpu-firmware-kmod CONFLICTS_INSTALL= drm-current-kmod \ drm-fbsd11.2-kmod \ drm-fbsd12.0-kmod \ drm-legacy-kmod OPTIONS_DEFINE= DEBUG USES= kmod uidfix compiler:c++11-lang USE_GITHUB= yes GH_ACCOUNT= freebsd GH_PROJECT= drm-kmod -GH_TAGNAME= drm_v5.4.62 +GH_TAGNAME= drm_v5.4.62_1 .include .if ${OPSYS} == FreeBSD && ${OSVERSION} < 1300108 IGNORE= not supported on older CURRENT, no kernel support .endif .if ${OPSYS} != FreeBSD IGNORE= not supported on anything but FreeBSD (missing linuxkpi functionality) .endif .if ${ARCH} == "amd64" PLIST_SUB+= AMDGPU="" PLIST_SUB+= AMDKFD="@comment " PLIST_SUB+= I915="" PLIST_SUB+= VMWGFX="" PLIST_SUB+= VBOXVIDEO="" .elif ${ARCH} == "i386" PLIST_SUB+= AMDGPU="@comment " PLIST_SUB+= AMDKFD="@comment " PLIST_SUB+= I915="" PLIST_SUB+= VMWGFX="" PLIST_SUB+= VBOXVIDEO="" .elif ${ARCH} == "aarch64" || ${ARCH} == "powerpc64" PLIST_SUB+= AMDGPU="" PLIST_SUB+= AMDKFD="@comment " PLIST_SUB+= I915="@comment " PLIST_SUB+= VBOXVIDEO="@comment " PLIST_SUB+= VMWGFX="@comment " .else PLIST_SUB+= AMDGPU="@comment " PLIST_SUB+= AMDKFD="@comment " PLIST_SUB+= I915="@comment " PLIST_SUB+= VBOXVIDEO="@comment " PLIST_SUB+= VMWGFX="@comment " .endif .include Index: head/graphics/drm-devel-kmod/distinfo =================================================================== --- head/graphics/drm-devel-kmod/distinfo (revision 548600) +++ head/graphics/drm-devel-kmod/distinfo (revision 548601) @@ -1,3 +1,3 @@ -TIMESTAMP = 1599312030 -SHA256 (freebsd-drm-kmod-5.4.62.g20200905-drm_v5.4.62_GH0.tar.gz) = 8656855b9ca8b64335271cbfbc33bbc5f98c58557c28e8d91024b4f27f9044ac -SIZE (freebsd-drm-kmod-5.4.62.g20200905-drm_v5.4.62_GH0.tar.gz) = 18881083 +TIMESTAMP = 1600076609 +SHA256 (freebsd-drm-kmod-5.4.62.g20200914-drm_v5.4.62_1_GH0.tar.gz) = 1c225ec66c3734670a85697827757a64bdfa90d6e0f6edcd454a3891040a5351 +SIZE (freebsd-drm-kmod-5.4.62.g20200914-drm_v5.4.62_1_GH0.tar.gz) = 18881626 Index: head/graphics/drm-kmod/Makefile =================================================================== --- head/graphics/drm-kmod/Makefile (revision 548600) +++ head/graphics/drm-kmod/Makefile (revision 548601) @@ -1,39 +1,39 @@ # Created by: Johannes Dieterich # $FreeBSD$ PORTNAME= drm-kmod PORTVERSION= g20190710 CATEGORIES= graphics MAINTAINER= x11@FreeBSD.org COMMENT= Metaport of DRM modules for the linuxkpi-based KMS components USES= metaport .include .if ${OPSYS} != FreeBSD IGNORE= not supported on anything but FreeBSD (missing linuxkpi functionality) .else .if ${ARCH} != "amd64" .if ${OSVERSION} >= 1200080 RUN_DEPENDS= ${KMODDIR}/drm.ko:graphics/drm-legacy-kmod .elif ${OSVERSION} < 1200080 IGNORE= legacy kmod not required on less than 12.0 .endif .else .if ${OSVERSION} >= 1103000 && ${OSVERSION} < 1200000 RUN_DEPENDS= ${KMODDIR}/drm.ko:graphics/drm-fbsd11.2-kmod .elif ${OSVERSION} >= 1200058 && ${OSVERSION} < 1300000 RUN_DEPENDS= ${KMODDIR}/drm.ko:graphics/drm-fbsd12.0-kmod -.elif ${OSVERSION} >= 1300000 && ${OSVERSION} < 1300029 +.elif ${OSVERSION} >= 1300000 && ${OSVERSION} < 1300108 IGNORE= not supported on older 13, no kernel support -.elif ${OSVERSION} >= 1300029 +.elif ${OSVERSION} >= 1300108 RUN_DEPENDS= ${KMODDIR}/drm.ko:graphics/drm-current-kmod .else IGNORE= not supported for this configuration .endif .endif .endif .include