From nobody Mon Feb 27 15:26:24 2023 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PQPV92YdVz3vFYw; Mon, 27 Feb 2023 15:26:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PQPV91crBz3NWF; Mon, 27 Feb 2023 15:26:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677511585; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=lGtK7ip4yYdl5AkBeqX/W01FcbQwbjSqlaSkpE8yxBs=; b=PBoIFWc2+sAPoRGGPrXzBz6cFyf5jgLtkjmr3BcVVM2yXNWQUFjPFQXjlXlWfv3965+n9J +bNRlcXp+0AvXoRiB1Rs7nW5ejUfAU2lojY62IfdX2/AcE280uFr51Vkd5jUDi9dbMUj8k /uksvmOBunHy+jiMBxTSoot8owdfUjXZPo+KvutruI/5SS4UK8Zbo9pnar63deLNhN5BAx GmeEIG+FikBcz7fMxmIzrWBsQ6oUTB2PGR0i+ANfGXdjME3vXtapjDv04Im34c1ji6SlQj bWBUDzAt6vuxEgTS/JmYYSLB2WQ5RnfOUW+ciZXKUaJO4//JivAnJBgR7Can7Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677511585; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=lGtK7ip4yYdl5AkBeqX/W01FcbQwbjSqlaSkpE8yxBs=; b=eTyByVFvwqFzlbDJP9OONBeZHfwqr+x0fHL6Kk9NOp6ScGqlXLRpXgISiNeJNaMyRSqKnQ zhCt3IQYvgTktipdHaTRCMrB85tA+X67BOnbP4vkhU8UUtcTHJstRwLCvSSJKTxGUhf5KO jZBlaalfHfS47le2jhMguGycU1KbubGmVTvIo7+yKvTrdWmqZa1j19wPkzVSNwHK5NkcUn OeZr4sV9vSrUI+Y8EZBd2L6+E9IVGeCXRUxldHDjRY+/+dO8Fi+MwwMoijPCsC3AlQe9oE ss03hnqFf4P/9/GjuFIHgZh+c0VsioIl3mVO7o3pMtQjA0RCK/0tWGECALqrbw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677511585; a=rsa-sha256; cv=none; b=YRn7R5Ol527WFiSwwNbVP4Ic5L4NK/EAN/pVFBLo7qGAvqjtFq8FShwcuCO4m7qRT+sA9P UOAZcuBuzoeybSg/yqzDv0VMAhpeIuHK7hQVZ6Fh/KYyZCae3SqRgXCZgEBi8wGCIafxl9 32iIIRqikgUOJ8Uq9hEARpX313rA/YaF4zKhrl3eJhxfALXOgzS7J0TqpAI9oiS4utacVR 9WN0ubjE6TbOX+8uUMb1n6x2B3FRDHT1qTuGGt9MYh7fKG18ffTYb7UoaNJcxY7CAytSBV +TiUp4X81/Dza9beL7W+Ml4/ZwQXdBfyxRBfitF0G0zc6CVpYqEtR+6G9AL5yg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PQPV90gGpzWHM; Mon, 27 Feb 2023 15:26:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 31RFQOkC053562; Mon, 27 Feb 2023 15:26:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 31RFQO20053561; Mon, 27 Feb 2023 15:26:24 GMT (envelope-from git) Date: Mon, 27 Feb 2023 15:26:24 GMT Message-Id: <202302271526.31RFQO20053561@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Emmanuel Vadot Subject: git: 551897255685 - main - graphics/gpu-firmware-intel: Fix cannonlake/coffeelake List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: manu X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5518972556857bbae7a0f7fb1c37d69a862b8bc0 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by manu: URL: https://cgit.FreeBSD.org/ports/commit/?id=5518972556857bbae7a0f7fb1c37d69a862b8bc0 commit 5518972556857bbae7a0f7fb1c37d69a862b8bc0 Author: Emmanuel Vadot AuthorDate: 2023-02-27 15:15:51 +0000 Commit: Emmanuel Vadot CommitDate: 2023-02-27 15:26:10 +0000 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 --- graphics/gpu-firmware-intel-kmod/Makefile | 5 +++-- graphics/gpu-firmware-intel-kmod/distinfo | 6 +++--- graphics/gpu-firmware-intel-kmod/pkg-plist | 12 ++++++------ graphics/gpu-firmware-kmod/Makefile | 3 ++- 4 files changed, 14 insertions(+), 12 deletions(-) diff --git a/graphics/gpu-firmware-intel-kmod/Makefile b/graphics/gpu-firmware-intel-kmod/Makefile index fa811c364c60..8964fe8bc7f9 100644 --- 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 index bde991b38dec..4759985bf89c 100644 --- 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 index 701f4fc9f475..c5253fdff930 100644 --- 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 index fc09e0c191f0..4886e20bd600 100644 --- 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 \