git: df7ea4b43f7a - main - graphics/gpu-firmware-kmod: Update to 20220511

From: Emmanuel Vadot <manu_at_FreeBSD.org>
Date: Wed, 11 May 2022 14:11:05 UTC
The branch main has been updated by manu:

URL: https://cgit.FreeBSD.org/ports/commit/?id=df7ea4b43f7acb69431f27e9e392a5729ad7b38c

commit df7ea4b43f7acb69431f27e9e392a5729ad7b38c
Author:     Emmanuel Vadot <manu@FreeBSD.org>
AuthorDate: 2022-05-11 14:08:38 +0000
Commit:     Emmanuel Vadot <manu@FreeBSD.org>
CommitDate: 2022-05-11 14:11:00 +0000

    graphics/gpu-firmware-kmod: Update to 20220511
    
    AMD:
     - Add green_sardine and sienna_cichlid
       Both hardware are supported by drm-510-kmod and only starting
       from 13.1 we can compile longname firmware so only add them for >= 13.1
    Intel:
     - Add rocketlake firmware, supported by drm-510-kmod
     - Add Tigerlake dmc firmware v2.08, needed by drm-510-kmod
     - Upgrade Tigerlake HuC firmware to 7.5.0, needed by drm-510-kmod
    
    Sponsored by:   Beckhoff Automation GmbH & Co. KG
---
 graphics/gpu-firmware-amd-kmod/Makefile    |  8 +++++---
 graphics/gpu-firmware-amd-kmod/distinfo    |  6 +++---
 graphics/gpu-firmware-amd-kmod/pkg-plist   | 23 +++++++++++++++++++++++
 graphics/gpu-firmware-intel-kmod/Makefile  |  7 ++++---
 graphics/gpu-firmware-intel-kmod/distinfo  |  6 +++---
 graphics/gpu-firmware-intel-kmod/pkg-plist |  4 +++-
 graphics/gpu-firmware-kmod/Makefile        |  9 +++++++--
 graphics/gpu-firmware-radeon-kmod/Makefile |  4 ++--
 graphics/gpu-firmware-radeon-kmod/distinfo |  6 +++---
 9 files changed, 53 insertions(+), 20 deletions(-)

diff --git a/graphics/gpu-firmware-amd-kmod/Makefile b/graphics/gpu-firmware-amd-kmod/Makefile
index 4f644e1a2fa3..acb7e22ab80e 100644
--- a/graphics/gpu-firmware-amd-kmod/Makefile
+++ b/graphics/gpu-firmware-amd-kmod/Makefile
@@ -1,7 +1,7 @@
 # Created by: Emmanuel Vadot <manu@FreeBSD.org>
 
 PORTNAME=	gpu-firmware-amd-kmod
-PORTVERSION=	20211014
+PORTVERSION=	20220511
 CATEGORIES=	graphics
 
 MAINTAINER=	x11@FreeBSD.org
@@ -46,7 +46,9 @@ FLAVORS=	banks \
 		vega12 \
 		vega20 \
 		vegam \
-		verde
+		verde \
+		green_sardine \
+		sienna_cichlid
 FLAVOR?=	banks
 
 USES=		kmod uidfix
@@ -54,7 +56,7 @@ USES=		kmod uidfix
 USE_GITHUB=	yes
 GH_ACCOUNT=	freebsd
 GH_PROJECT=	drm-kmod-firmware
-GH_TAGNAME=	20211014_1
+GH_TAGNAME=	20220511
 
 MAKE_ENV=	KMODS="amdgpukmsfw"
 MAKE_ENV+=	AMDGPUKMODS="${FLAVOR}"
diff --git a/graphics/gpu-firmware-amd-kmod/distinfo b/graphics/gpu-firmware-amd-kmod/distinfo
index c78289515416..487016664d33 100644
--- a/graphics/gpu-firmware-amd-kmod/distinfo
+++ b/graphics/gpu-firmware-amd-kmod/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1634226410
-SHA256 (freebsd-drm-kmod-firmware-20211014-20211014_1_GH0.tar.gz) = cf39652b616579f6461d56af21d6827f666a75c5e3193a8fb69747bb49d4cdad
-SIZE (freebsd-drm-kmod-firmware-20211014-20211014_1_GH0.tar.gz) = 19953773
+TIMESTAMP = 1652277242
+SHA256 (freebsd-drm-kmod-firmware-20220511_GH0.tar.gz) = f822f90aeb031fbc6b692dbc71f6a50b1ec637c471e7744f4f08c2972678c9b7
+SIZE (freebsd-drm-kmod-firmware-20220511_GH0.tar.gz) = 20620626
diff --git a/graphics/gpu-firmware-amd-kmod/pkg-plist b/graphics/gpu-firmware-amd-kmod/pkg-plist
index 8bfd5e0bd242..31fcca0f3d5e 100644
--- a/graphics/gpu-firmware-amd-kmod/pkg-plist
+++ b/graphics/gpu-firmware-amd-kmod/pkg-plist
@@ -356,3 +356,26 @@
 %%VERDE%%/%%KMODDIR%%/amdgpu_verde_rlc_bin.ko
 %%VERDE%%/%%KMODDIR%%/amdgpu_verde_smc_bin.ko
 %%VERDE%%/%%KMODDIR%%/amdgpu_verde_uvd_bin.ko
+%%GREEN_SARDINE%%/%%KMODDIR%%/amdgpu_green_sardine_asd_bin.ko
+%%GREEN_SARDINE%%/%%KMODDIR%%/amdgpu_green_sardine_ce_bin.ko
+%%GREEN_SARDINE%%/%%KMODDIR%%/amdgpu_green_sardine_dmcub_bin.ko
+%%GREEN_SARDINE%%/%%KMODDIR%%/amdgpu_green_sardine_me_bin.ko
+%%GREEN_SARDINE%%/%%KMODDIR%%/amdgpu_green_sardine_mec_bin.ko
+%%GREEN_SARDINE%%/%%KMODDIR%%/amdgpu_green_sardine_mec2_bin.ko
+%%GREEN_SARDINE%%/%%KMODDIR%%/amdgpu_green_sardine_pfp_bin.ko
+%%GREEN_SARDINE%%/%%KMODDIR%%/amdgpu_green_sardine_rlc_bin.ko
+%%GREEN_SARDINE%%/%%KMODDIR%%/amdgpu_green_sardine_sdma_bin.ko
+%%GREEN_SARDINE%%/%%KMODDIR%%/amdgpu_green_sardine_ta_bin.ko
+%%GREEN_SARDINE%%/%%KMODDIR%%/amdgpu_green_sardine_vcn_bin.ko
+%%SIENNA_CICHLID%%/%%KMODDIR%%/amdgpu_sienna_cichlid_ce_bin.ko
+%%SIENNA_CICHLID%%/%%KMODDIR%%/amdgpu_sienna_cichlid_dmcub_bin.ko
+%%SIENNA_CICHLID%%/%%KMODDIR%%/amdgpu_sienna_cichlid_me_bin.ko
+%%SIENNA_CICHLID%%/%%KMODDIR%%/amdgpu_sienna_cichlid_mec_bin.ko
+%%SIENNA_CICHLID%%/%%KMODDIR%%/amdgpu_sienna_cichlid_mec2_bin.ko
+%%SIENNA_CICHLID%%/%%KMODDIR%%/amdgpu_sienna_cichlid_pfp_bin.ko
+%%SIENNA_CICHLID%%/%%KMODDIR%%/amdgpu_sienna_cichlid_rlc_bin.ko
+%%SIENNA_CICHLID%%/%%KMODDIR%%/amdgpu_sienna_cichlid_sdma_bin.ko
+%%SIENNA_CICHLID%%/%%KMODDIR%%/amdgpu_sienna_cichlid_smc_bin.ko
+%%SIENNA_CICHLID%%/%%KMODDIR%%/amdgpu_sienna_cichlid_sos_bin.ko
+%%SIENNA_CICHLID%%/%%KMODDIR%%/amdgpu_sienna_cichlid_ta_bin.ko
+%%SIENNA_CICHLID%%/%%KMODDIR%%/amdgpu_sienna_cichlid_vcn_bin.ko
diff --git a/graphics/gpu-firmware-intel-kmod/Makefile b/graphics/gpu-firmware-intel-kmod/Makefile
index 49758b7d1016..0a341e956d13 100644
--- a/graphics/gpu-firmware-intel-kmod/Makefile
+++ b/graphics/gpu-firmware-intel-kmod/Makefile
@@ -1,7 +1,7 @@
 # Created by: Emmanuel Vadot <manu@FreeBSD.org>
 
 PORTNAME=	gpu-firmware-intel-kmod
-PORTVERSION=	20211014
+PORTVERSION=	20220511
 CATEGORIES=	graphics
 
 MAINTAINER=	x11@FreeBSD.org
@@ -23,7 +23,8 @@ FLAVORS=	skylake \
 		coffeelake \
 		icelake \
 		elkhartlake \
-		tigerlake
+		tigerlake \
+		rocketlake
 FLAVOR?=	skylake
 
 USES=		kmod uidfix
@@ -31,7 +32,7 @@ USES=		kmod uidfix
 USE_GITHUB=	yes
 GH_ACCOUNT=	freebsd
 GH_PROJECT=	drm-kmod-firmware
-GH_TAGNAME=	20211014_1
+GH_TAGNAME=	20220511
 
 MAKE_ENV=	KMODS="i915kmsfw"
 MAKE_ENV+=	I915KMODS="${FLAVOR}"
diff --git a/graphics/gpu-firmware-intel-kmod/distinfo b/graphics/gpu-firmware-intel-kmod/distinfo
index ca5604496e14..477b178a1a3b 100644
--- a/graphics/gpu-firmware-intel-kmod/distinfo
+++ b/graphics/gpu-firmware-intel-kmod/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1634226398
-SHA256 (freebsd-drm-kmod-firmware-20211014-20211014_1_GH0.tar.gz) = cf39652b616579f6461d56af21d6827f666a75c5e3193a8fb69747bb49d4cdad
-SIZE (freebsd-drm-kmod-firmware-20211014-20211014_1_GH0.tar.gz) = 19953773
+TIMESTAMP = 1652277124
+SHA256 (freebsd-drm-kmod-firmware-20220511_GH0.tar.gz) = f822f90aeb031fbc6b692dbc71f6a50b1ec637c471e7744f4f08c2972678c9b7
+SIZE (freebsd-drm-kmod-firmware-20220511_GH0.tar.gz) = 20620626
diff --git a/graphics/gpu-firmware-intel-kmod/pkg-plist b/graphics/gpu-firmware-intel-kmod/pkg-plist
index 619855e699dd..e6e1f0bbedd9 100644
--- a/graphics/gpu-firmware-intel-kmod/pkg-plist
+++ b/graphics/gpu-firmware-intel-kmod/pkg-plist
@@ -30,5 +30,7 @@
 %%ELKHARTLAKE%%/%%KMODDIR%%/i915_ehl_guc_33_0_4_bin.ko
 %%ELKHARTLAKE%%/%%KMODDIR%%/i915_ehl_huc_9_0_0_bin.ko
 %%TIGERLAKE%%/%%KMODDIR%%/i915_tgl_dmc_ver2_04_bin.ko
+%%TIGERLAKE%%/%%KMODDIR%%/i915_tgl_dmc_ver2_08_bin.ko
 %%TIGERLAKE%%/%%KMODDIR%%/i915_tgl_guc_35_2_0_bin.ko
-%%TIGERLAKE%%/%%KMODDIR%%/i915_tgl_huc_7_0_3_bin.ko
+%%TIGERLAKE%%/%%KMODDIR%%/i915_tgl_huc_7_5_0_bin.ko
+%%ROCKETLAKE%%/%%KMODDIR%%/i915_rkl_dmc_ver2_02_bin.ko
diff --git a/graphics/gpu-firmware-kmod/Makefile b/graphics/gpu-firmware-kmod/Makefile
index 2fa9b308d0f2..33cd69c45d86 100644
--- a/graphics/gpu-firmware-kmod/Makefile
+++ b/graphics/gpu-firmware-kmod/Makefile
@@ -1,7 +1,7 @@
 # Created by: Johannes Dieterich <jmd@FreeBSD.org>
 
 PORTNAME=	gpu-firmware-kmod
-PORTVERSION=	20220501
+PORTVERSION=	20220511
 PORTEPOCH=	1
 CATEGORIES=	graphics
 
@@ -63,7 +63,8 @@ RUN_DEPENDS+=	gpu-firmware-intel-kmod-skylake>0:graphics/gpu-firmware-intel-kmod
 		gpu-firmware-intel-kmod-coffeelake>0:graphics/gpu-firmware-intel-kmod@coffeelake \
 		gpu-firmware-intel-kmod-icelake>0:graphics/gpu-firmware-intel-kmod@icelake \
 		gpu-firmware-intel-kmod-elkhartlake>0:graphics/gpu-firmware-intel-kmod@elkhartlake \
-		gpu-firmware-intel-kmod-tigerlake>0:graphics/gpu-firmware-intel-kmod@tigerlake
+		gpu-firmware-intel-kmod-tigerlake>0:graphics/gpu-firmware-intel-kmod@tigerlake \
+		gpu-firmware-intel-kmod-rocketlake>0:graphics/gpu-firmware-intel-kmod@rocketlake
 .endif
 
 .if ${ARCH} != powerpc64
@@ -98,6 +99,10 @@ RUN_DEPENDS+=	gpu-firmware-amd-kmod-banks>0:graphics/gpu-firmware-amd-kmod@banks
 		gpu-firmware-amd-kmod-vega20>0:graphics/gpu-firmware-amd-kmod@vega20 \
 		gpu-firmware-amd-kmod-vegam>0:graphics/gpu-firmware-amd-kmod@vegam \
 		gpu-firmware-amd-kmod-verde>0:graphics/gpu-firmware-amd-kmod@verde
+.if ${OSVERSION} >= 1301000
+RUN_DEPENDS+=	gpu-firmware-amd-kmod-green-sardine>0:graphics/gpu-firmware-amd-kmod@green_sardine \
+		gpu-firmware-amd-kmod-sienna-cichlid>0:graphics/gpu-firmware-amd-kmod@sienna_cichlid
+.endif
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/graphics/gpu-firmware-radeon-kmod/Makefile b/graphics/gpu-firmware-radeon-kmod/Makefile
index 1453df5c7347..5323f561760c 100644
--- a/graphics/gpu-firmware-radeon-kmod/Makefile
+++ b/graphics/gpu-firmware-radeon-kmod/Makefile
@@ -1,7 +1,7 @@
 # Created by: Emmanuel Vadot <manu@FreeBSD.org>
 
 PORTNAME=	gpu-firmware-radeon-kmod
-PORTVERSION=	20211014
+PORTVERSION=	20220511
 CATEGORIES=	graphics
 
 MAINTAINER=	x11@FreeBSD.org
@@ -65,7 +65,7 @@ USES=		kmod uidfix
 USE_GITHUB=	yes
 GH_ACCOUNT=	freebsd
 GH_PROJECT=	drm-kmod-firmware
-GH_TAGNAME=	20211014_1
+GH_TAGNAME=	20220511
 
 MAKE_ENV=	KMODS="radeonkmsfw"
 MAKE_ENV+=	RADEONKMODS="${FLAVOR}"
diff --git a/graphics/gpu-firmware-radeon-kmod/distinfo b/graphics/gpu-firmware-radeon-kmod/distinfo
index 499e3ab4cf49..a54c565bfe35 100644
--- a/graphics/gpu-firmware-radeon-kmod/distinfo
+++ b/graphics/gpu-firmware-radeon-kmod/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1634226391
-SHA256 (freebsd-drm-kmod-firmware-20211014-20211014_1_GH0.tar.gz) = cf39652b616579f6461d56af21d6827f666a75c5e3193a8fb69747bb49d4cdad
-SIZE (freebsd-drm-kmod-firmware-20211014-20211014_1_GH0.tar.gz) = 19953773
+TIMESTAMP = 1652277693
+SHA256 (freebsd-drm-kmod-firmware-20220511_GH0.tar.gz) = f822f90aeb031fbc6b692dbc71f6a50b1ec637c471e7744f4f08c2972678c9b7
+SIZE (freebsd-drm-kmod-firmware-20220511_GH0.tar.gz) = 20620626