From nobody Thu Dec 8 14:38:46 2022 X-Original-To: dev-commits-ports-main@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 4NScGZ3DtRz4jdC9; Thu, 8 Dec 2022 14:38:46 +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 4NScGZ2hq0z3jFX; Thu, 8 Dec 2022 14:38:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1670510326; 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=/EfoS+VmUDa50GzMcLcVVzXeGJsXZSnfkQyaCptat8o=; b=JynDwC4vqUKbhJJ0+2ZzbGpJl2maFUVt+ClUW6IfX9egcl4E5DJakuL1H7pJpgeiupY35w d7jQmZ3rs61CyvnzFz/QfJDr+XHc0wmKbQAMbFP4bNavEEG5MaqAiaCFvfB6J/Cy3/EgPe zNoCTk9B1gTK4HKe4FgGwwp50HQYcBRN98eTHia5YpEwAQv3hqvf6yNOz6MZj2FHWL1UVo 2Ms1fNAhLrdvhxjviO5Afh25NdkogflxNOqtzJr53wzaTN79ExCjQB7q4U5rGR9J2ZiYXm REZOrW8IlUrC5pfUMOEd+SOY0kIqtdicr2p4pqWiwV8TpkjXL74kb3F5OFYUtw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1670510326; 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=/EfoS+VmUDa50GzMcLcVVzXeGJsXZSnfkQyaCptat8o=; b=RZ9CnWoaLziq5DpbmisRCeHRwavhbcqC7HW9/jO6NoXDAPqT5G1xAMmp3YBtCW2e+V9miy LhQlN3A1RcDM4zbmf5bsJb5T87qqmxeDCtkaRBaVb/AW3x69yO6NqeTYmCpsZfKbqeTsVs IyYattJMaMNVBF5PEc91W2/qRL5F91E6ghwLPJTwB9ecQKQ0fLOSqfP1xxyp/P2nTgbwRb 2/mxb0MCAM1G+2J3/edM3mgHE49Xob4gpuAVm9FLoxsk2X4pBJV7N1DJKyaEMN/LA+1hDp mqdVDSinETkh2opp02VX+PXmnG6HkULwg//wGAvKM2LGRLQOckSw0enB286A6Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1670510326; a=rsa-sha256; cv=none; b=EEIyKxmnbJjdzsdxhkHKlIFGecEXI2H3m0Z0VtrPwtRmxnxuRzXXZUfm7AeZLmdLw+KPFd 8GJHV6Ka1//xFu5s1+t7u5LkSO5AGmHyRXDU5si1pNvRxd/k6qz8Smrli+8ImUj8qNFdAn HqF8k+yL3IZzxnmlVsdVwOc8DZ5HVYoqSLXW4NxNz1JvyXysoHajKy6c564/rA/gPzQDLN kEcIN4Pp++MPUDTr/zngrq2ETs7AQRJ6R4JL0kvWg/9kcladoEPSRii0qsUFllhaOJVW0M n1rtucTPSt1BkOnI/ZvSSOECnLeLLTw3bZvjrjBijYksLJrr3iVyJMKp5Tsrqg== 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 4NScGZ1m1Tz103B; Thu, 8 Dec 2022 14:38:46 +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 2B8Eck1L028608; Thu, 8 Dec 2022 14:38:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2B8Eckm2028607; Thu, 8 Dec 2022 14:38:46 GMT (envelope-from git) Date: Thu, 8 Dec 2022 14:38:46 GMT Message-Id: <202212081438.2B8Eckm2028607@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: d18f1a5bfe56 - main - graphics/gpu-firmware: Add flavors for the new amd firmwares List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@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: d18f1a5bfe56cdf036b1cbdcc24d2d11ca7a21ab Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by manu: URL: https://cgit.FreeBSD.org/ports/commit/?id=d18f1a5bfe56cdf036b1cbdcc24d2d11ca7a21ab commit d18f1a5bfe56cdf036b1cbdcc24d2d11ca7a21ab Author: Emmanuel Vadot AuthorDate: 2022-12-08 14:36:31 +0000 Commit: Emmanuel Vadot CommitDate: 2022-12-08 14:38:09 +0000 graphics/gpu-firmware: Add flavors for the new amd firmwares While here tag vangogh and the new ones as ignored on < 13.1 Fixes: 2a813bbc99cc ("graphics/gpu-firmware: Update AMD firmware") Sponsored by: Beckhoff Automation GmbH & Co. KG --- graphics/gpu-firmware-amd-kmod/Makefile | 10 +++++-- graphics/gpu-firmware-amd-kmod/pkg-plist | 46 ++++++++++++++++++++++++-------- graphics/gpu-firmware-kmod/Makefile | 9 ++++--- 3 files changed, 49 insertions(+), 16 deletions(-) diff --git a/graphics/gpu-firmware-amd-kmod/Makefile b/graphics/gpu-firmware-amd-kmod/Makefile index 9548f33f1af2..e83eaa5d89ea 100644 --- a/graphics/gpu-firmware-amd-kmod/Makefile +++ b/graphics/gpu-firmware-amd-kmod/Makefile @@ -1,5 +1,6 @@ PORTNAME= gpu-firmware-amd-kmod PORTVERSION= 20221207 +PORTREVISION= 1 CATEGORIES= graphics MAINTAINER= x11@FreeBSD.org @@ -41,17 +42,22 @@ FLAVORS= banks \ tahiti \ tonga \ topaz \ - vangogh \ vega10 \ vega12 \ vega20 \ vegam \ verde \ + dimgrey_cavefish \ green_sardine \ - sienna_cichlid + navy_flounder \ + sienna_cichlid \ + vangogh +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" +navy_flounder_IGNORE_FreeBSD_12= "Not supported on < 13.1" +vangogh_IGNORE_FreeBSD_12= "Not supported on < 13.1" USES= kmod uidfix diff --git a/graphics/gpu-firmware-amd-kmod/pkg-plist b/graphics/gpu-firmware-amd-kmod/pkg-plist index c0374b9e9e0f..43330d985834 100644 --- a/graphics/gpu-firmware-amd-kmod/pkg-plist +++ b/graphics/gpu-firmware-amd-kmod/pkg-plist @@ -294,17 +294,6 @@ %%TOPAZ%%/%%KMODDIR%%/amdgpu_topaz_sdma1_bin.ko %%TOPAZ%%/%%KMODDIR%%/amdgpu_topaz_sdma_bin.ko %%TOPAZ%%/%%KMODDIR%%/amdgpu_topaz_smc_bin.ko -%%VANGOGH%%/%%KMODDIR%%/amdgpu_vangogh_asd_bin.ko -%%VANGOGH%%/%%KMODDIR%%/amdgpu_vangogh_me_bin.ko -%%VANGOGH%%/%%KMODDIR%%/amdgpu_vangogh_pfp_bin.ko -%%VANGOGH%%/%%KMODDIR%%/amdgpu_vangogh_toc_bin.ko -%%VANGOGH%%/%%KMODDIR%%/amdgpu_vangogh_ce_bin.ko -%%VANGOGH%%/%%KMODDIR%%/amdgpu_vangogh_mec2_bin.ko -%%VANGOGH%%/%%KMODDIR%%/amdgpu_vangogh_rlc_bin.ko -%%VANGOGH%%/%%KMODDIR%%/amdgpu_vangogh_vcn_bin.ko -%%VANGOGH%%/%%KMODDIR%%/amdgpu_vangogh_dmcub_bin.ko -%%VANGOGH%%/%%KMODDIR%%/amdgpu_vangogh_mec_bin.ko -%%VANGOGH%%/%%KMODDIR%%/amdgpu_vangogh_sdma_bin.ko %%VEGA10%%/%%KMODDIR%%/amdgpu_vega10_acg_smc_bin.ko %%VEGA10%%/%%KMODDIR%%/amdgpu_vega10_asd_bin.ko %%VEGA10%%/%%KMODDIR%%/amdgpu_vega10_ce_bin.ko @@ -367,6 +356,18 @@ %%VERDE%%/%%KMODDIR%%/amdgpu_verde_rlc_bin.ko %%VERDE%%/%%KMODDIR%%/amdgpu_verde_smc_bin.ko %%VERDE%%/%%KMODDIR%%/amdgpu_verde_uvd_bin.ko +%%DIMGREY_CAVEFISH%%/%%KMODDIR%%/amdgpu_dimgrey_cavefish_ce_bin.ko +%%DIMGREY_CAVEFISH%%/%%KMODDIR%%/amdgpu_dimgrey_cavefish_dmcub_bin.ko +%%DIMGREY_CAVEFISH%%/%%KMODDIR%%/amdgpu_dimgrey_cavefish_me_bin.ko +%%DIMGREY_CAVEFISH%%/%%KMODDIR%%/amdgpu_dimgrey_cavefish_mec2_bin.ko +%%DIMGREY_CAVEFISH%%/%%KMODDIR%%/amdgpu_dimgrey_cavefish_mec_bin.ko +%%DIMGREY_CAVEFISH%%/%%KMODDIR%%/amdgpu_dimgrey_cavefish_pfp_bin.ko +%%DIMGREY_CAVEFISH%%/%%KMODDIR%%/amdgpu_dimgrey_cavefish_rlc_bin.ko +%%DIMGREY_CAVEFISH%%/%%KMODDIR%%/amdgpu_dimgrey_cavefish_sdma_bin.ko +%%DIMGREY_CAVEFISH%%/%%KMODDIR%%/amdgpu_dimgrey_cavefish_smc_bin.ko +%%DIMGREY_CAVEFISH%%/%%KMODDIR%%/amdgpu_dimgrey_cavefish_sos_bin.ko +%%DIMGREY_CAVEFISH%%/%%KMODDIR%%/amdgpu_dimgrey_cavefish_ta_bin.ko +%%DIMGREY_CAVEFISH%%/%%KMODDIR%%/amdgpu_dimgrey_cavefish_vcn_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 @@ -378,6 +379,18 @@ %%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 +%%NAVY_FLOUNDER%%/%%KMODDIR%%/amdgpu_navy_flounder_ce_bin.ko +%%NAVY_FLOUNDER%%/%%KMODDIR%%/amdgpu_navy_flounder_dmcub_bin.ko +%%NAVY_FLOUNDER%%/%%KMODDIR%%/amdgpu_navy_flounder_me_bin.ko +%%NAVY_FLOUNDER%%/%%KMODDIR%%/amdgpu_navy_flounder_mec2_bin.ko +%%NAVY_FLOUNDER%%/%%KMODDIR%%/amdgpu_navy_flounder_mec_bin.ko +%%NAVY_FLOUNDER%%/%%KMODDIR%%/amdgpu_navy_flounder_pfp_bin.ko +%%NAVY_FLOUNDER%%/%%KMODDIR%%/amdgpu_navy_flounder_rlc_bin.ko +%%NAVY_FLOUNDER%%/%%KMODDIR%%/amdgpu_navy_flounder_sdma_bin.ko +%%NAVY_FLOUNDER%%/%%KMODDIR%%/amdgpu_navy_flounder_smc_bin.ko +%%NAVY_FLOUNDER%%/%%KMODDIR%%/amdgpu_navy_flounder_sos_bin.ko +%%NAVY_FLOUNDER%%/%%KMODDIR%%/amdgpu_navy_flounder_ta_bin.ko +%%NAVY_FLOUNDER%%/%%KMODDIR%%/amdgpu_navy_flounder_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 @@ -390,3 +403,14 @@ %%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 +%%VANGOGH%%/%%KMODDIR%%/amdgpu_vangogh_asd_bin.ko +%%VANGOGH%%/%%KMODDIR%%/amdgpu_vangogh_me_bin.ko +%%VANGOGH%%/%%KMODDIR%%/amdgpu_vangogh_pfp_bin.ko +%%VANGOGH%%/%%KMODDIR%%/amdgpu_vangogh_toc_bin.ko +%%VANGOGH%%/%%KMODDIR%%/amdgpu_vangogh_ce_bin.ko +%%VANGOGH%%/%%KMODDIR%%/amdgpu_vangogh_mec2_bin.ko +%%VANGOGH%%/%%KMODDIR%%/amdgpu_vangogh_rlc_bin.ko +%%VANGOGH%%/%%KMODDIR%%/amdgpu_vangogh_vcn_bin.ko +%%VANGOGH%%/%%KMODDIR%%/amdgpu_vangogh_dmcub_bin.ko +%%VANGOGH%%/%%KMODDIR%%/amdgpu_vangogh_mec_bin.ko +%%VANGOGH%%/%%KMODDIR%%/amdgpu_vangogh_sdma_bin.ko diff --git a/graphics/gpu-firmware-kmod/Makefile b/graphics/gpu-firmware-kmod/Makefile index f9efc9efb4ca..5ad7447ac8c8 100644 --- a/graphics/gpu-firmware-kmod/Makefile +++ b/graphics/gpu-firmware-kmod/Makefile @@ -1,5 +1,6 @@ PORTNAME= gpu-firmware-kmod PORTVERSION= 20221207 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= graphics @@ -93,15 +94,17 @@ RUN_DEPENDS+= gpu-firmware-amd-kmod-banks>0:graphics/gpu-firmware-amd-kmod@banks gpu-firmware-amd-kmod-tahiti>0:graphics/gpu-firmware-amd-kmod@tahiti \ gpu-firmware-amd-kmod-tonga>0:graphics/gpu-firmware-amd-kmod@tonga \ gpu-firmware-amd-kmod-topaz>0:graphics/gpu-firmware-amd-kmod@topaz \ - gpu-firmware-amd-kmod-vangogh>0:graphics/gpu-firmware-amd-kmod@vangogh \ gpu-firmware-amd-kmod-vega10>0:graphics/gpu-firmware-amd-kmod@vega10 \ 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 .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 +RUN_DEPENDS+= 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 \ + gpu-firmware-amd-kmod-vangogh>0:graphics/gpu-firmware-amd-kmod@vangogh .endif .endif