freebsd/ports
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

graphics/drm*kmod: Update to latest upstream

Browse Source 
drm-current-kmod/drm-devel-kmod:
 - Remove local patch, code is upstream now
 - Fix amdgpu build on powerpc64
 - Depend on latest gpu-firmware-kmod (for navi14 and renoir users)

drm-kmod:
 - Need FreeBSD 1300108, missed in r548208
This commit is contained in:
Emmanuel Vadot
2020-09-14 09:46:36 +00:00
parent eb195d2c9a
commit bd6dcdd238
6 changed files with 14 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
graphics/drm-current-kmod/Makefile
+3 -4
View File
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= drm-current-kmod
PORTVERSION= 5.4.62.g20200905
PORTREVISION= 2
PORTVERSION= 5.4.62.g20200914
CATEGORIES= graphics kld
MAINTAINER= x11@FreeBSD.org
@@ -15,7 +14,7 @@ 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 \
@@ -35,7 +34,7 @@ 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 <bsd.port.options.mk>
graphics/drm-current-kmod/distinfo
+3 -3
View File
@@ -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
graphics/drm-current-kmod/files/patch-drivers_gpu_drm_i915_i915__request.c
-12
View File
@@ -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
graphics/drm-devel-kmod/Makefile
+3 -4
View File
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= drm-devel-kmod
PORTVERSION= 5.4.62.g20200905
PORTREVISION= 1
PORTVERSION= 5.4.62.g20200914
CATEGORIES= graphics kld
MAINTAINER= x11@FreeBSD.org
@@ -15,7 +14,7 @@ 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 \
@@ -29,7 +28,7 @@ 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 <bsd.port.options.mk>
graphics/drm-devel-kmod/distinfo
+3 -3
View File
@@ -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
graphics/drm-kmod/Makefile
+2 -2
View File
@@ -26,9 +26,9 @@ IGNORE= legacy kmod not required on less than 12.0
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