From bd6dcdd238dba74f691707b4e1440d0b0013dab1 Mon Sep 17 00:00:00 2001 From: Emmanuel Vadot Date: Mon, 14 Sep 2020 09:46:36 +0000 Subject: [PATCH] graphics/drm*kmod: Update to latest upstream 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 --- graphics/drm-current-kmod/Makefile | 7 +++---- graphics/drm-current-kmod/distinfo | 6 +++--- .../files/patch-drivers_gpu_drm_i915_i915__request.c | 12 ------------ graphics/drm-devel-kmod/Makefile | 7 +++---- graphics/drm-devel-kmod/distinfo | 6 +++--- graphics/drm-kmod/Makefile | 4 ++-- 6 files changed, 14 insertions(+), 28 deletions(-) delete mode 100644 graphics/drm-current-kmod/files/patch-drivers_gpu_drm_i915_i915__request.c diff --git a/graphics/drm-current-kmod/Makefile b/graphics/drm-current-kmod/Makefile index 5b033e650ea9..7874aa04fb0e 100644 --- a/graphics/drm-current-kmod/Makefile +++ b/graphics/drm-current-kmod/Makefile @@ -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 diff --git a/graphics/drm-current-kmod/distinfo b/graphics/drm-current-kmod/distinfo index d9557ba6ba49..fdba4348dc14 100644 --- a/graphics/drm-current-kmod/distinfo +++ b/graphics/drm-current-kmod/distinfo @@ -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 diff --git a/graphics/drm-current-kmod/files/patch-drivers_gpu_drm_i915_i915__request.c b/graphics/drm-current-kmod/files/patch-drivers_gpu_drm_i915_i915__request.c deleted file mode 100644 index 467f6d60eda4..000000000000 --- a/graphics/drm-current-kmod/files/patch-drivers_gpu_drm_i915_i915__request.c +++ /dev/null @@ -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 diff --git a/graphics/drm-devel-kmod/Makefile b/graphics/drm-devel-kmod/Makefile index e844291c60da..820670972ae5 100644 --- a/graphics/drm-devel-kmod/Makefile +++ b/graphics/drm-devel-kmod/Makefile @@ -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 diff --git a/graphics/drm-devel-kmod/distinfo b/graphics/drm-devel-kmod/distinfo index 9a15696409e6..78bea5e4abff 100644 --- a/graphics/drm-devel-kmod/distinfo +++ b/graphics/drm-devel-kmod/distinfo @@ -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 diff --git a/graphics/drm-kmod/Makefile b/graphics/drm-kmod/Makefile index e127621875b0..ea44f9791131 100644 --- a/graphics/drm-kmod/Makefile +++ b/graphics/drm-kmod/Makefile @@ -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