git: 1d1265875593 - main - fwget: pci: video amd: correct glob matching entries

From: Bjoern A. Zeeb <bz_at_FreeBSD.org>
Date: Mon, 01 Sep 2025 07:42:43 UTC
The branch main has been updated by bz:

URL: https://cgit.FreeBSD.org/src/commit/?id=1d12658755930e20904d498398379cad0e4ae396

commit 1d12658755930e20904d498398379cad0e4ae396
Author:     Bjoern A. Zeeb <bz@FreeBSD.org>
AuthorDate: 2025-08-31 18:51:55 +0000
Commit:     Bjoern A. Zeeb <bz@FreeBSD.org>
CommitDate: 2025-09-01 07:41:30 +0000

    fwget: pci: video amd: correct glob matching entries
    
    - one duplcate entry: 0x664*|0x664*) -> 0x664*|0x665*)
    - one unneeded glob: 0x98e4*) -> 0x98e4)
    - 0x15e7|0x1636|0x1638|0x164c) half of these are green-sardine; split
    - a missing entry for skillfish2 : + 0x143f
    
    MFC after:      3 days
    Reviewed by:    imp, manu
    Differential Revision: https://reviews.freebsd.org/D52312
---
 usr.sbin/fwget/pci/pci_video_amd | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/usr.sbin/fwget/pci/pci_video_amd b/usr.sbin/fwget/pci/pci_video_amd
index 5017789b9f28..7e50454d3944 100644
--- a/usr.sbin/fwget/pci/pci_video_amd
+++ b/usr.sbin/fwget/pci/pci_video_amd
@@ -48,7 +48,7 @@ pci_video_amd()
 		0x13*)
 			addpkg "gpu-firmware-amd-kmod-kaveri"
 			;;
-		0x664*|0x664*)
+		0x664*|0x665*)
 			addpkg "gpu-firmware-amd-kmod-bonaire"
 			;;
 		0x67a*|0x67b*)
@@ -72,7 +72,7 @@ pci_video_amd()
 		0x987*)
 			addpkg "gpu-firmware-amd-kmod-carrizo"
 			;;
-		0x98e4*)
+		0x98e4)
 			addpkg "gpu-firmware-amd-kmod-stoney"
 			;;
 		0x67e*|0x67ff)
@@ -111,7 +111,10 @@ pci_video_amd()
 		0x734*)
 			addpkg "gpu-firmware-amd-kmod-navi14"
 			;;
-		0x15e7|0x1636|0x1638|0x164c)
+		0x15e7|0x1638)
+			addpkg "gpu-firmware-amd-kmod-renoir gpu-firmware-amd-kmod-green-sardine"
+			;;
+		0x1636|0x164c)
 			addpkg "gpu-firmware-amd-kmod-renoir"
 			;;
 		0x736*)
@@ -135,7 +138,7 @@ pci_video_amd()
 		0x740*|0x741*)
 			addpkg "gpu-firmware-amd-kmod-aldebaran"
 			;;
-		0x13fe)
+		0x13fe|0x143f)
 			addpkg "gpu-firmware-amd-kmod-cyan-skillfish2"
 			;;
 		0x742*|0x743*)