graphics/gpu-firmware-intel: Fix cannonlake/coffeelake

cnl firmwares are for cannonlake so introduce this module. cml firmwares are the GuC/HuC firmware for cometlake, which uses the dmc kabylake firmware so move them accordingly. Sponsored by: Beckhoff Automation GmbH & Co. KG
freebsd · Feb 27, 2023 · 5518972 · 5518972
1 parent 88a2a7b
commit 5518972
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 12 deletions.
diff --git a/graphics/gpu-firmware-intel-kmod/Makefile b/graphics/gpu-firmware-intel-kmod/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	gpu-firmware-intel-kmod
 PORTVERSION=	20230210
+PORTREVISION=	1
 CATEGORIES=	graphics
 
 MAINTAINER=	x11@FreeBSD.org
@@ -19,7 +20,7 @@ FLAVORS=	skylake \
 		broxton \
 		kabylake \
 		geminilake \
-		coffeelake \
+		cannonlake \
 		icelake \
 		elkhartlake \
 		tigerlake \
@@ -32,7 +33,7 @@ USES=		kmod uidfix
 USE_GITHUB=	yes
 GH_ACCOUNT=	freebsd
 GH_PROJECT=	drm-kmod-firmware
-GH_TAGNAME=	20230210_2
+GH_TAGNAME=	20230210_5
 
 MAKE_ENV=	KMODS="i915kmsfw"
 MAKE_ENV+=	I915KMODS="${FLAVOR}"

diff --git a/graphics/gpu-firmware-intel-kmod/distinfo b/graphics/gpu-firmware-intel-kmod/distinfo
@@ -1,3 +1,3 @@
-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
+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
diff --git a/graphics/gpu-firmware-intel-kmod/pkg-plist b/graphics/gpu-firmware-intel-kmod/pkg-plist
@@ -16,17 +16,17 @@
 %%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
+%%KABYLAKE%%/%%KMODDIR%%/i915_cml_guc_33_0_0_bin.ko
+%%KABYLAKE%%/%%KMODDIR%%/i915_cml_guc_62_0_0_bin.ko
+%%KABYLAKE%%/%%KMODDIR%%/i915_cml_guc_70_1_1_bin.ko
+%%KABYLAKE%%/%%KMODDIR%%/i915_cml_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_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_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
+%%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

diff --git a/graphics/gpu-firmware-kmod/Makefile b/graphics/gpu-firmware-kmod/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	gpu-firmware-kmod
 PORTVERSION=	20230210
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	graphics
 
@@ -59,7 +60,7 @@ RUN_DEPENDS+=	gpu-firmware-intel-kmod-skylake>0:graphics/gpu-firmware-intel-kmod
 		gpu-firmware-intel-kmod-broxton>0:graphics/gpu-firmware-intel-kmod@broxton \
 		gpu-firmware-intel-kmod-kabylake>0:graphics/gpu-firmware-intel-kmod@kabylake \
 		gpu-firmware-intel-kmod-geminilake>0:graphics/gpu-firmware-intel-kmod@geminilake \
-		gpu-firmware-intel-kmod-coffeelake>0:graphics/gpu-firmware-intel-kmod@coffeelake \
+		gpu-firmware-intel-kmod-cannonlake>0:graphics/gpu-firmware-intel-kmod@cannonlake \
 		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 \