Index: head/graphics/drm-current-kmod/Makefile =================================================================== --- head/graphics/drm-current-kmod/Makefile (revision 548209) +++ head/graphics/drm-current-kmod/Makefile (revision 548210) @@ -1,90 +1,90 @@ # Created by: Johannes Dieterich # $FreeBSD$ PORTNAME= drm-current-kmod PORTVERSION= 5.4.62.g20200905 -PORTREVISION= 1 +PORTREVISION= 2 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 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 .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/files/patch-drivers_gpu_drm_i915_i915__request.c =================================================================== --- head/graphics/drm-current-kmod/files/patch-drivers_gpu_drm_i915_i915__request.c (nonexistent) +++ head/graphics/drm-current-kmod/files/patch-drivers_gpu_drm_i915_i915__request.c (revision 548210) @@ -0,0 +1,12 @@ +--- 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 ___________________________________________________________________ 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