graphics/gpu-firmware-{amd,intel}-kmod: Update to 20230625

This bring us in sync with linux-firmware 20230625 and add the needed
firmware for i915kms GPUs supported in 6.1-lts and remove the one needed
only in 5.4-lts which isn't supported anymore.

Sponsored by:	Beckhoff Automation GmbH & Co. KG

5 files changed, 23 insertions, 26 deletions

diff --git a/graphics/gpu-firmware-amd-kmod/Makefile b/graphics/gpu-firmware-amd-kmod/Makefile
index dd91165b81bb..38d528e4f246 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=	20230210
-PORTREVISION=	1
+PORTVERSION=	20230625
 CATEGORIES=	graphics
 
 MAINTAINER=	x11@FreeBSD.org
@@ -63,7 +62,7 @@ USES=		kmod uidfix
 USE_GITHUB=	yes
 GH_ACCOUNT=	freebsd
 GH_PROJECT=	drm-kmod-firmware
-GH_TAGNAME=	20230210_3
+GH_TAGNAME=	20230625_4
 
 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 66f14fccd3cf..cd235519da42 100644
--- a/graphics/gpu-firmware-amd-kmod/distinfo
+++ b/graphics/gpu-firmware-amd-kmod/distinfo
@@ -1,3 +1,3 @@
-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
+TIMESTAMP = 1704270557
+SHA256 (freebsd-drm-kmod-firmware-20230625-20230625_4_GH0.tar.gz) = 509eb439ba85e051016127c59d32cf15f873db6558c6da8fe0af76536259152d
+SIZE (freebsd-drm-kmod-firmware-20230625-20230625_4_GH0.tar.gz) = 30535277
diff --git a/graphics/gpu-firmware-intel-kmod/Makefile b/graphics/gpu-firmware-intel-kmod/Makefile
index 8964fe8bc7f9..8dff65a15637 100644
--- a/graphics/gpu-firmware-intel-kmod/Makefile
+++ b/graphics/gpu-firmware-intel-kmod/Makefile
@@ -1,6 +1,5 @@
 PORTNAME=	gpu-firmware-intel-kmod
-PORTVERSION=	20230210
-PORTREVISION=	1
+PORTVERSION=	20230625
 CATEGORIES=	graphics
 
 MAINTAINER=	x11@FreeBSD.org
@@ -26,6 +25,7 @@ FLAVORS=	skylake \
 		tigerlake \
 		rocketlake \
 		dg1 \
+		dg2 \
 		alderlake
 
 USES=		kmod uidfix
@@ -33,7 +33,7 @@ USES=		kmod uidfix
 USE_GITHUB=	yes
 GH_ACCOUNT=	freebsd
 GH_PROJECT=	drm-kmod-firmware
-GH_TAGNAME=	20230210_5
+GH_TAGNAME=	20230625_4
 
 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 4759985bf89c..492ad3e02b6d 100644
--- a/graphics/gpu-firmware-intel-kmod/distinfo
+++ b/graphics/gpu-firmware-intel-kmod/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1677510830
-SHA256 (freebsd-drm-kmod-firmware-20230210-20230210_5_GH0.tar.gz) = d7ecacab7c45304f20900d98ce3b65f8fdfba0e6db71f76a1e2f09eccb3e1822
-SIZE (freebsd-drm-kmod-firmware-20230210-20230210_5_GH0.tar.gz) = 32031373
+TIMESTAMP = 1704270482
+SHA256 (freebsd-drm-kmod-firmware-20230625-20230625_4_GH0.tar.gz) = 509eb439ba85e051016127c59d32cf15f873db6558c6da8fe0af76536259152d
+SIZE (freebsd-drm-kmod-firmware-20230625-20230625_4_GH0.tar.gz) = 30535277
diff --git a/graphics/gpu-firmware-intel-kmod/pkg-plist b/graphics/gpu-firmware-intel-kmod/pkg-plist
index c5253fdff930..095ca60b9d43 100644
--- a/graphics/gpu-firmware-intel-kmod/pkg-plist
+++ b/graphics/gpu-firmware-intel-kmod/pkg-plist
@@ -1,20 +1,15 @@
 %%SKYLAKE%%/%%KMODDIR%%/i915_skl_dmc_ver1_27_bin.ko
-%%SKYLAKE%%/%%KMODDIR%%/i915_skl_guc_ver9_33_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_ver9_29_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_2_0_0_bin.ko
 %%KABYLAKE%%/%%KMODDIR%%/i915_kbl_dmc_ver1_04_bin.ko
-%%KABYLAKE%%/%%KMODDIR%%/i915_kbl_guc_ver9_39_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_guc_70_1_1_bin.ko
 %%KABYLAKE%%/%%KMODDIR%%/i915_kbl_huc_4_0_0_bin.ko
 %%KABYLAKE%%/%%KMODDIR%%/i915_cml_guc_33_0_0_bin.ko
 %%KABYLAKE%%/%%KMODDIR%%/i915_cml_guc_62_0_0_bin.ko
@@ -23,35 +18,38 @@
 %%GEMINILAKE%%/%%KMODDIR%%/i915_glk_dmc_ver1_04_bin.ko
 %%GEMINILAKE%%/%%KMODDIR%%/i915_glk_guc_33_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_guc_70_1_1_bin.ko
 %%GEMINILAKE%%/%%KMODDIR%%/i915_glk_huc_4_0_0_bin.ko
-%%CANNONLAKE%%/%%KMODDIR%%/i915_cnl_dmc_ver1_06_bin.ko
 %%CANNONLAKE%%/%%KMODDIR%%/i915_cnl_dmc_ver1_07_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_62_0_0_bin.ko
-%%ICELAKE%%/%%KMODDIR%%/i915_icl_huc_ver8_4_bin.ko
+%%ICELAKE%%/%%KMODDIR%%/i915_icl_guc_70_1_1_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_62_0_0_bin.ko
+%%ELKHARTLAKE%%/%%KMODDIR%%/i915_ehl_guc_70_1_1_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_62_0_0_bin.ko
+%%TIGERLAKE%%/%%KMODDIR%%/i915_tgl_guc_70_1_1_bin.ko
+%%TIGERLAKE%%/%%KMODDIR%%/i915_tgl_guc_70_bin.ko
+%%TIGERLAKE%%/%%KMODDIR%%/i915_tgl_huc_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_62_0_0_bin.ko
+%%DG1%%/%%KMODDIR%%/i915_dg1_guc_70_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
+%%DG2%%/%%KMODDIR%%/i915_dg2_dmc_ver2_07_bin.ko
+%%DG2%%/%%KMODDIR%%/i915_dg2_guc_70_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_dmc_ver2_16_bin.ko
 %%ALDERLAKE%%/%%KMODDIR%%/i915_adlp_guc_62_0_3_bin.ko
+%%ALDERLAKE%%/%%KMODDIR%%/i915_adlp_guc_70_bin.ko
 %%ALDERLAKE%%/%%KMODDIR%%/i915_adls_dmc_ver2_01_bin.ko