7 files changed, 125 insertions, 38 deletions

diff --git a/graphics/gpu-firmware-amd-kmod/Makefile b/graphics/gpu-firmware-amd-kmod/Makefile
index e83eaa5d89ea..740f129b5c8b 100644
--- a/graphics/gpu-firmware-amd-kmod/Makefile
+++ b/graphics/gpu-firmware-amd-kmod/Makefile
@@ -1,6 +1,5 @@
 PORTNAME=	gpu-firmware-amd-kmod
-PORTVERSION=	20221207
-PORTREVISION=	1
+PORTVERSION=	20230210
 CATEGORIES=	graphics
 
 MAINTAINER=	x11@FreeBSD.org
@@ -16,9 +15,13 @@ ONLY_FOR_ARCHS=		aarch64 amd64 i386 powerpc64le
 ONLY_FOR_ARCHS_REASON=	AMD GPUs are only available on aarch64, x86 and powerpc64le
 
 PKGNAMESUFFIX=	-${FLAVOR:C/_/-/g}
-FLAVORS=	banks \
+FLAVORS=	aldebaran \
+		arcturus \
+		banks \
+		beige_goby \
 		bonaire \
 		carrizo \
+		cyan_skillfish2 \
 		fiji \
 		hainan \
 		hawaii \
@@ -51,8 +54,10 @@ FLAVORS=	banks \
 		green_sardine \
 		navy_flounder \
 		sienna_cichlid \
-		vangogh
+		vangogh \
+		yellow_carp
 
+cyan_skillfish2_IGNORE_FreeBSD_12=	"Not supported on < 13.1"
 dimgrey_cavefish_IGNORE_FreeBSD_12=	"Not supported on < 13.1"
 green_sardine_IGNORE_FreeBSD_12=	"Not supported on < 13.1"
 sienna_cichlid_IGNORE_FreeBSD_12=	"Not supported on < 13.1"
@@ -64,7 +69,7 @@ USES=		kmod uidfix
 USE_GITHUB=	yes
 GH_ACCOUNT=	freebsd
 GH_PROJECT=	drm-kmod-firmware
-GH_TAGNAME=	20221207
+GH_TAGNAME=	20230210_3
 
 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 3973c41f32b2..66f14fccd3cf 100644
--- a/graphics/gpu-firmware-amd-kmod/distinfo
+++ b/graphics/gpu-firmware-amd-kmod/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1670412325
-SHA256 (freebsd-drm-kmod-firmware-20221207_GH0.tar.gz) = ebadd13d99dd48e2b84fc47bc35db095a5c22868183e885b9252916adc5c6ce1
-SIZE (freebsd-drm-kmod-firmware-20221207_GH0.tar.gz) = 24321513
+TIMESTAMP = 1676631164
+SHA256 (freebsd-drm-kmod-firmware-20230210-20230210_3_GH0.tar.gz) = 0295a5f808df787496dc4ccc5b6f576bbd1780ce3c47652bc112f0de1dc7d0a7
+SIZE (freebsd-drm-kmod-firmware-20230210-20230210_3_GH0.tar.gz) = 32031357
diff --git a/graphics/gpu-firmware-amd-kmod/pkg-plist b/graphics/gpu-firmware-amd-kmod/pkg-plist
index 43330d985834..22c9c1c7b0d4 100644
--- a/graphics/gpu-firmware-amd-kmod/pkg-plist
+++ b/graphics/gpu-firmware-amd-kmod/pkg-plist
@@ -1,4 +1,36 @@
+%%ARCTURUS%%/%%KMODDIR%%/amdgpu_arcturus_asd_bin.ko
+%%ARCTURUS%%/%%KMODDIR%%/amdgpu_arcturus_gpu_info_bin.ko
+%%ARCTURUS%%/%%KMODDIR%%/amdgpu_arcturus_mec2_bin.ko
+%%ARCTURUS%%/%%KMODDIR%%/amdgpu_arcturus_mec_bin.ko
+%%ARCTURUS%%/%%KMODDIR%%/amdgpu_arcturus_rlc_bin.ko
+%%ARCTURUS%%/%%KMODDIR%%/amdgpu_arcturus_sdma_bin.ko
+%%ARCTURUS%%/%%KMODDIR%%/amdgpu_arcturus_smc_bin.ko
+%%ARCTURUS%%/%%KMODDIR%%/amdgpu_arcturus_sos_bin.ko
+%%ARCTURUS%%/%%KMODDIR%%/amdgpu_arcturus_ta_bin.ko
+%%ARCTURUS%%/%%KMODDIR%%/amdgpu_arcturus_vcn_bin.ko
+%%ALDEBARAN%%/%%KMODDIR%%/amdgpu_aldebaran_mec2_bin.ko
+%%ALDEBARAN%%/%%KMODDIR%%/amdgpu_aldebaran_mec_bin.ko
+%%ALDEBARAN%%/%%KMODDIR%%/amdgpu_aldebaran_rlc_bin.ko
+%%ALDEBARAN%%/%%KMODDIR%%/amdgpu_aldebaran_sdma_bin.ko
+%%ALDEBARAN%%/%%KMODDIR%%/amdgpu_aldebaran_sjt_mec2_bin.ko
+%%ALDEBARAN%%/%%KMODDIR%%/amdgpu_aldebaran_sjt_mec_bin.ko
+%%ALDEBARAN%%/%%KMODDIR%%/amdgpu_aldebaran_smc_bin.ko
+%%ALDEBARAN%%/%%KMODDIR%%/amdgpu_aldebaran_sos_bin.ko
+%%ALDEBARAN%%/%%KMODDIR%%/amdgpu_aldebaran_ta_bin.ko
+%%ALDEBARAN%%/%%KMODDIR%%/amdgpu_aldebaran_vcn_bin.ko
 %%BANKS%%/%%KMODDIR%%/amdgpu_banks_k_2_smc_bin.ko
+%%BEIGE_GOBY%%/%%KMODDIR%%/amdgpu_beige_goby_ce_bin.ko
+%%BEIGE_GOBY%%/%%KMODDIR%%/amdgpu_beige_goby_dmcub_bin.ko
+%%BEIGE_GOBY%%/%%KMODDIR%%/amdgpu_beige_goby_me_bin.ko
+%%BEIGE_GOBY%%/%%KMODDIR%%/amdgpu_beige_goby_mec2_bin.ko
+%%BEIGE_GOBY%%/%%KMODDIR%%/amdgpu_beige_goby_mec_bin.ko
+%%BEIGE_GOBY%%/%%KMODDIR%%/amdgpu_beige_goby_pfp_bin.ko
+%%BEIGE_GOBY%%/%%KMODDIR%%/amdgpu_beige_goby_rlc_bin.ko
+%%BEIGE_GOBY%%/%%KMODDIR%%/amdgpu_beige_goby_sdma_bin.ko
+%%BEIGE_GOBY%%/%%KMODDIR%%/amdgpu_beige_goby_smc_bin.ko
+%%BEIGE_GOBY%%/%%KMODDIR%%/amdgpu_beige_goby_sos_bin.ko
+%%BEIGE_GOBY%%/%%KMODDIR%%/amdgpu_beige_goby_ta_bin.ko
+%%BEIGE_GOBY%%/%%KMODDIR%%/amdgpu_beige_goby_vcn_bin.ko
 %%BONAIRE%%/%%KMODDIR%%/amdgpu_bonaire_ce_bin.ko
 %%BONAIRE%%/%%KMODDIR%%/amdgpu_bonaire_k_smc_bin.ko
 %%BONAIRE%%/%%KMODDIR%%/amdgpu_bonaire_mc_bin.ko
@@ -21,6 +53,14 @@
 %%CARRIZO%%/%%KMODDIR%%/amdgpu_carrizo_sdma_bin.ko
 %%CARRIZO%%/%%KMODDIR%%/amdgpu_carrizo_uvd_bin.ko
 %%CARRIZO%%/%%KMODDIR%%/amdgpu_carrizo_vce_bin.ko
+%%CYAN_SKILLFISH2%%/%%KMODDIR%%/amdgpu_cyan_skillfish2_ce_bin.ko
+%%CYAN_SKILLFISH2%%/%%KMODDIR%%/amdgpu_cyan_skillfish2_me_bin.ko
+%%CYAN_SKILLFISH2%%/%%KMODDIR%%/amdgpu_cyan_skillfish2_mec2_bin.ko
+%%CYAN_SKILLFISH2%%/%%KMODDIR%%/amdgpu_cyan_skillfish2_mec_bin.ko
+%%CYAN_SKILLFISH2%%/%%KMODDIR%%/amdgpu_cyan_skillfish2_pfp_bin.ko
+%%CYAN_SKILLFISH2%%/%%KMODDIR%%/amdgpu_cyan_skillfish2_rlc_bin.ko
+%%CYAN_SKILLFISH2%%/%%KMODDIR%%/amdgpu_cyan_skillfish2_sdma1_bin.ko
+%%CYAN_SKILLFISH2%%/%%KMODDIR%%/amdgpu_cyan_skillfish2_sdma_bin.ko
 %%FIJI%%/%%KMODDIR%%/amdgpu_fiji_ce_bin.ko
 %%FIJI%%/%%KMODDIR%%/amdgpu_fiji_mc_bin.ko
 %%FIJI%%/%%KMODDIR%%/amdgpu_fiji_me_bin.ko
@@ -414,3 +454,27 @@
 %%VANGOGH%%/%%KMODDIR%%/amdgpu_vangogh_dmcub_bin.ko
 %%VANGOGH%%/%%KMODDIR%%/amdgpu_vangogh_mec_bin.ko
 %%VANGOGH%%/%%KMODDIR%%/amdgpu_vangogh_sdma_bin.ko
+%%BEIGE_GOBY%%/%%KMODDIR%%/amdgpu_beige_goby_ce_bin.ko
+%%BEIGE_GOBY%%/%%KMODDIR%%/amdgpu_beige_goby_dmcub_bin.ko
+%%BEIGE_GOBY%%/%%KMODDIR%%/amdgpu_beige_goby_me_bin.ko
+%%BEIGE_GOBY%%/%%KMODDIR%%/amdgpu_beige_goby_mec2_bin.ko
+%%BEIGE_GOBY%%/%%KMODDIR%%/amdgpu_beige_goby_mec_bin.ko
+%%BEIGE_GOBY%%/%%KMODDIR%%/amdgpu_beige_goby_pfp_bin.ko
+%%BEIGE_GOBY%%/%%KMODDIR%%/amdgpu_beige_goby_rlc_bin.ko
+%%BEIGE_GOBY%%/%%KMODDIR%%/amdgpu_beige_goby_sdma_bin.ko
+%%BEIGE_GOBY%%/%%KMODDIR%%/amdgpu_beige_goby_smc_bin.ko
+%%BEIGE_GOBY%%/%%KMODDIR%%/amdgpu_beige_goby_sos_bin.ko
+%%BEIGE_GOBY%%/%%KMODDIR%%/amdgpu_beige_goby_ta_bin.ko
+%%BEIGE_GOBY%%/%%KMODDIR%%/amdgpu_beige_goby_vcn_bin.ko
+%%YELLOW_CARP%%/%%KMODDIR%%/amdgpu_yellow_carp_asd_bin.ko
+%%YELLOW_CARP%%/%%KMODDIR%%/amdgpu_yellow_carp_ce_bin.ko
+%%YELLOW_CARP%%/%%KMODDIR%%/amdgpu_yellow_carp_dmcub_bin.ko
+%%YELLOW_CARP%%/%%KMODDIR%%/amdgpu_yellow_carp_me_bin.ko
+%%YELLOW_CARP%%/%%KMODDIR%%/amdgpu_yellow_carp_mec2_bin.ko
+%%YELLOW_CARP%%/%%KMODDIR%%/amdgpu_yellow_carp_mec_bin.ko
+%%YELLOW_CARP%%/%%KMODDIR%%/amdgpu_yellow_carp_pfp_bin.ko
+%%YELLOW_CARP%%/%%KMODDIR%%/amdgpu_yellow_carp_rlc_bin.ko
+%%YELLOW_CARP%%/%%KMODDIR%%/amdgpu_yellow_carp_sdma_bin.ko
+%%YELLOW_CARP%%/%%KMODDIR%%/amdgpu_yellow_carp_ta_bin.ko
+%%YELLOW_CARP%%/%%KMODDIR%%/amdgpu_yellow_carp_toc_bin.ko
+%%YELLOW_CARP%%/%%KMODDIR%%/amdgpu_yellow_carp_vcn_bin.ko
diff --git a/graphics/gpu-firmware-intel-kmod/Makefile b/graphics/gpu-firmware-intel-kmod/Makefile
index 0683d877bbce..fa811c364c60 100644
--- a/graphics/gpu-firmware-intel-kmod/Makefile
+++ b/graphics/gpu-firmware-intel-kmod/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	gpu-firmware-intel-kmod
-PORTVERSION=	20221213
+PORTVERSION=	20230210
 CATEGORIES=	graphics
 
 MAINTAINER=	x11@FreeBSD.org
@@ -24,14 +24,15 @@ FLAVORS=	skylake \
 		elkhartlake \
 		tigerlake \
 		rocketlake \
-		dg1
+		dg1 \
+		alderlake
 
 USES=		kmod uidfix
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	freebsd
 GH_PROJECT=	drm-kmod-firmware
-GH_TAGNAME=	20221213
+GH_TAGNAME=	20230210_2
 
 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 4b3377c0a99e..bde991b38dec 100644
--- a/graphics/gpu-firmware-intel-kmod/distinfo
+++ b/graphics/gpu-firmware-intel-kmod/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1670928238
-SHA256 (freebsd-drm-kmod-firmware-20221213_GH0.tar.gz) = cea5646a8e6b49cca7cb7539811322a786ebfc2070f95877d6dd341be32aeab5
-SIZE (freebsd-drm-kmod-firmware-20221213_GH0.tar.gz) = 25274916
+TIMESTAMP = 1676629598
+SHA256 (freebsd-drm-kmod-firmware-20230210-20230210_2_GH0.tar.gz) = 59802054a93f2453f6565c24178469c0b5ccf928d7f6dd31cc052b1b4134388a
+SIZE (freebsd-drm-kmod-firmware-20230210-20230210_2_GH0.tar.gz) = 36204548
diff --git a/graphics/gpu-firmware-intel-kmod/pkg-plist b/graphics/gpu-firmware-intel-kmod/pkg-plist
index d0c27ecc2df6..701f4fc9f475 100644
--- a/graphics/gpu-firmware-intel-kmod/pkg-plist
+++ b/graphics/gpu-firmware-intel-kmod/pkg-plist
@@ -1,46 +1,57 @@
 %%SKYLAKE%%/%%KMODDIR%%/i915_skl_dmc_ver1_27_bin.ko
-%%SKYLAKE%%/%%KMODDIR%%/i915_skl_guc_33_0_0_bin.ko
-%%SKYLAKE%%/%%KMODDIR%%/i915_skl_guc_49_0_1_bin.ko
 %%SKYLAKE%%/%%KMODDIR%%/i915_skl_guc_ver9_33_bin.ko
-%%SKYLAKE%%/%%KMODDIR%%/i915_skl_huc_2_0_0_bin.ko
+%%SKYLAKE%%/%%KMODDIR%%/i915_skl_guc_33_0_0_bin.ko
+%%SKYLAKE%%/%%KMODDIR%%/i915_skl_guc_62_0_0_bin.ko
 %%SKYLAKE%%/%%KMODDIR%%/i915_skl_huc_ver01_07_bin.ko
+%%SKYLAKE%%/%%KMODDIR%%/i915_skl_huc_2_0_0_bin.ko
 %%BROXTON%%/%%KMODDIR%%/i915_bxt_dmc_ver1_07_bin.ko
-%%BROXTON%%/%%KMODDIR%%/i915_bxt_guc_33_0_0_bin.ko
-%%BROXTON%%/%%KMODDIR%%/i915_bxt_guc_49_0_1_bin.ko
 %%BROXTON%%/%%KMODDIR%%/i915_bxt_guc_ver9_29_bin.ko
-%%BROXTON%%/%%KMODDIR%%/i915_bxt_huc_2_0_0_bin.ko
+%%BROXTON%%/%%KMODDIR%%/i915_bxt_guc_33_0_0_bin.ko
+%%BROXTON%%/%%KMODDIR%%/i915_bxt_guc_62_0_0_bin.ko
 %%BROXTON%%/%%KMODDIR%%/i915_bxt_huc_ver01_07_bin.ko
-%%BROXTON%%/%%KMODDIR%%/i915_bxt_huc_ver01_8_bin.ko
+%%BROXTON%%/%%KMODDIR%%/i915_bxt_huc_2_0_0_bin.ko
 %%KABYLAKE%%/%%KMODDIR%%/i915_kbl_dmc_ver1_04_bin.ko
-%%KABYLAKE%%/%%KMODDIR%%/i915_kbl_guc_33_0_0_bin.ko
 %%KABYLAKE%%/%%KMODDIR%%/i915_kbl_guc_ver9_39_bin.ko
-%%KABYLAKE%%/%%KMODDIR%%/i915_kbl_guc_49_0_1_bin.ko
-%%KABYLAKE%%/%%KMODDIR%%/i915_kbl_huc_4_0_0_bin.ko
+%%KABYLAKE%%/%%KMODDIR%%/i915_kbl_guc_33_0_0_bin.ko
+%%KABYLAKE%%/%%KMODDIR%%/i915_kbl_guc_62_0_0_bin.ko
 %%KABYLAKE%%/%%KMODDIR%%/i915_kbl_huc_ver02_00_bin.ko
+%%KABYLAKE%%/%%KMODDIR%%/i915_kbl_huc_4_0_0_bin.ko
 %%GEMINILAKE%%/%%KMODDIR%%/i915_glk_dmc_ver1_04_bin.ko
 %%GEMINILAKE%%/%%KMODDIR%%/i915_glk_guc_33_0_0_bin.ko
-%%GEMINILAKE%%/%%KMODDIR%%/i915_glk_guc_49_0_1_bin.ko
-%%GEMINILAKE%%/%%KMODDIR%%/i915_glk_huc_4_0_0_bin.ko
+%%GEMINILAKE%%/%%KMODDIR%%/i915_glk_guc_62_0_0_bin.ko
 %%GEMINILAKE%%/%%KMODDIR%%/i915_glk_huc_ver03_01_bin.ko
+%%GEMINILAKE%%/%%KMODDIR%%/i915_glk_huc_4_0_0_bin.ko
 %%COFFEELAKE%%/%%KMODDIR%%/i915_cnl_dmc_ver1_06_bin.ko
 %%COFFEELAKE%%/%%KMODDIR%%/i915_cnl_dmc_ver1_07_bin.ko
 %%COFFEELAKE%%/%%KMODDIR%%/i915_cml_guc_33_0_0_bin.ko
-%%COFFEELAKE%%/%%KMODDIR%%/i915_cml_guc_49_0_1_bin.ko
+%%COFFEELAKE%%/%%KMODDIR%%/i915_cml_guc_62_0_0_bin.ko
+%%COFFEELAKE%%/%%KMODDIR%%/i915_cml_guc_70_1_1_bin.ko
 %%COFFEELAKE%%/%%KMODDIR%%/i915_cml_huc_4_0_0_bin.ko
 %%ICELAKE%%/%%KMODDIR%%/i915_icl_dmc_ver1_07_bin.ko
 %%ICELAKE%%/%%KMODDIR%%/i915_icl_dmc_ver1_09_bin.ko
 %%ICELAKE%%/%%KMODDIR%%/i915_icl_guc_33_0_0_bin.ko
-%%ICELAKE%%/%%KMODDIR%%/i915_icl_guc_49_0_1_bin.ko
-%%ICELAKE%%/%%KMODDIR%%/i915_icl_huc_9_0_0_bin.ko
+%%ICELAKE%%/%%KMODDIR%%/i915_icl_guc_62_0_0_bin.ko
 %%ICELAKE%%/%%KMODDIR%%/i915_icl_huc_ver8_4_bin.ko
+%%ICELAKE%%/%%KMODDIR%%/i915_icl_huc_9_0_0_bin.ko
 %%ELKHARTLAKE%%/%%KMODDIR%%/i915_ehl_guc_33_0_4_bin.ko
-%%ELKHARTLAKE%%/%%KMODDIR%%/i915_ehl_guc_49_0_1_bin.ko
+%%ELKHARTLAKE%%/%%KMODDIR%%/i915_ehl_guc_62_0_0_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_dmc_ver2_12_bin.ko
 %%TIGERLAKE%%/%%KMODDIR%%/i915_tgl_guc_35_2_0_bin.ko
-%%TIGERLAKE%%/%%KMODDIR%%/i915_tgl_guc_49_0_1_bin.ko
+%%TIGERLAKE%%/%%KMODDIR%%/i915_tgl_guc_62_0_0_bin.ko
 %%TIGERLAKE%%/%%KMODDIR%%/i915_tgl_huc_7_5_0_bin.ko
+%%TIGERLAKE%%/%%KMODDIR%%/i915_tgl_huc_7_9_3_bin.ko
 %%ROCKETLAKE%%/%%KMODDIR%%/i915_rkl_dmc_ver2_02_bin.ko
+%%ROCKETLAKE%%/%%KMODDIR%%/i915_rkl_dmc_ver2_03_bin.ko
 %%DG1%%/%%KMODDIR%%/i915_dg1_dmc_ver2_02_bin.ko
-%%DG1%%/%%KMODDIR%%/i915_dg1_guc_49_0_1_bin.ko
+%%DG1%%/%%KMODDIR%%/i915_dg1_guc_62_0_0_bin.ko
+%%DG1%%/%%KMODDIR%%/i915_dg1_huc_bin.ko
+%%DG1%%/%%KMODDIR%%/i915_dg1_huc_7_7_1_bin.ko
+%%DG1%%/%%KMODDIR%%/i915_dg1_huc_7_9_3_bin.ko
+%%ALDERLAKE%%/%%KMODDIR%%/i915_adlp_dmc_bin.ko
+%%ALDERLAKE%%/%%KMODDIR%%/i915_adlp_dmc_ver2_10_bin.ko
+%%ALDERLAKE%%/%%KMODDIR%%/i915_adlp_dmc_ver2_12_bin.ko
+%%ALDERLAKE%%/%%KMODDIR%%/i915_adlp_guc_62_0_3_bin.ko
+%%ALDERLAKE%%/%%KMODDIR%%/i915_adls_dmc_ver2_01_bin.ko
diff --git a/graphics/gpu-firmware-kmod/Makefile b/graphics/gpu-firmware-kmod/Makefile
index 5ad7447ac8c8..fc09e0c191f0 100644
--- a/graphics/gpu-firmware-kmod/Makefile
+++ b/graphics/gpu-firmware-kmod/Makefile
@@ -1,6 +1,5 @@
 PORTNAME=	gpu-firmware-kmod
-PORTVERSION=	20221207
-PORTREVISION=	1
+PORTVERSION=	20230210
 PORTEPOCH=	1
 CATEGORIES=	graphics
 
@@ -64,11 +63,16 @@ RUN_DEPENDS+=	gpu-firmware-intel-kmod-skylake>0:graphics/gpu-firmware-intel-kmod
 		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-rocketlake>0:graphics/gpu-firmware-intel-kmod@rocketlake
+		gpu-firmware-intel-kmod-rocketlake>0:graphics/gpu-firmware-intel-kmod@rocketlake \
+		gpu-firmware-intel-kmod-dg1>0:graphics/gpu-firmware-intel-kmod@dg1 \
+		gpu-firmware-intel-kmod-alderlake>0:graphics/gpu-firmware-intel-kmod@alderlake
 .endif
 
 .if ${ARCH} != powerpc64
-RUN_DEPENDS+=	gpu-firmware-amd-kmod-banks>0:graphics/gpu-firmware-amd-kmod@banks \
+RUN_DEPENDS+=	gpu-firmware-amd-kmod-aldebaran>0:graphics/gpu-firmware-amd-kmod@aldebaran \
+		gpu-firmware-amd-kmod-arcturus>0:graphics/gpu-firmware-amd-kmod@arcturus \
+		gpu-firmware-amd-kmod-banks>0:graphics/gpu-firmware-amd-kmod@banks \
+		gpu-firmware-amd-kmod-beige-goby>0:graphics/gpu-firmware-amd-kmod@beige_goby \
 		gpu-firmware-amd-kmod-bonaire>0:graphics/gpu-firmware-amd-kmod@bonaire \
 		gpu-firmware-amd-kmod-carrizo>0:graphics/gpu-firmware-amd-kmod@carrizo \
 		gpu-firmware-amd-kmod-fiji>0:graphics/gpu-firmware-amd-kmod@fiji \
@@ -98,9 +102,11 @@ RUN_DEPENDS+=	gpu-firmware-amd-kmod-banks>0:graphics/gpu-firmware-amd-kmod@banks
 		gpu-firmware-amd-kmod-vega12>0:graphics/gpu-firmware-amd-kmod@vega12 \
 		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
+		gpu-firmware-amd-kmod-verde>0:graphics/gpu-firmware-amd-kmod@verde \
+		gpu-firmware-amd-kmod-yellow-carp>0:graphics/gpu-firmware-amd-kmod@yellow_carp
 .if ${OSVERSION} >= 1301000
-RUN_DEPENDS+=	gpu-firmware-amd-kmod-dimgrey-cavefish>0:graphics/gpu-firmware-amd-kmod@dimgrey_cavefish \
+RUN_DEPENDS+=		gpu-firmware-amd-kmod-cyan-skillfish2>0:graphics/gpu-firmware-amd-kmod@cyan_skillfish2 \
+		gpu-firmware-amd-kmod-dimgrey-cavefish>0:graphics/gpu-firmware-amd-kmod@dimgrey_cavefish \
 		gpu-firmware-amd-kmod-green-sardine>0:graphics/gpu-firmware-amd-kmod@green_sardine \
 		gpu-firmware-amd-kmod-navy-flounder>0:graphics/gpu-firmware-amd-kmod@navy_flounder \
 		gpu-firmware-amd-kmod-sienna-cichlid>0:graphics/gpu-firmware-amd-kmod@sienna_cichlid \