From d18f1a5bfe56cdf036b1cbdcc24d2d11ca7a21ab Mon Sep 17 00:00:00 2001 From: Emmanuel Vadot Date: Thu, 8 Dec 2022 15:36:31 +0100 Subject: [PATCH] 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