sync with OpenBSD -current

This commit is contained in:
purplerain 2024-04-20 22:43:32 +00:00
parent df63f5284d
commit 696b0fa6e4
Signed by: purplerain
GPG key ID: F42C07F07E2E35B7
9 changed files with 59 additions and 53 deletions

View file

@ -215,6 +215,9 @@ static const struct pci_matchid amdgpu_devices[] = {
/* GC 11.0.1, DCN 3.1.4, APU, Ryzen 7040 "Phoenix" */
{0x1002, 0x15bf }, /* Radeon 740M / 760M / 780M */
/* GC 11.0.1, DCN 3.1.4, APU, Ryzen 8040 "Hawk Point" */
{0x1002, 0x1900 }, /* Radeon 760M / 780M */
/* GC 11.0.2, DCN 3.2.1, dGPU, "Navi 33" */
{0x1002, 0x7480 }, /* Radeon RX 7600S, 7700S, 7600M XT,
7600, 7600 XT, Pro W7600 */
@ -225,9 +228,12 @@ static const struct pci_matchid amdgpu_devices[] = {
{0x1002, 0x7470 }, /* Radeon Pro W7700 */
{0x1002, 0x747e }, /* Radeon RX 7700 XT, 7800 XT */
/* GC 11.0.4, DCN 3.1.4, APU, "Phoenix 2" */
/* GC 11.0.4, DCN 3.1.4, APU, Ryzen 7040, "Phoenix" */
{0x1002, 0x15c8 }, /* Radeon 740M */
/* GC 11.0.4, DCN 3.1.4, APU, Ryzen 8040, "Hawk Point" */
{0x1002, 0x1901 }, /* Radeon 740M */
/* GC 11.5.0, DCN 3.5.0, APU, linux >= 6.7 */
/* GC 11.5.1, DCN 3.5.0, APU, linux >= 6.9 */
};

View file

@ -1,4 +1,4 @@
$OpenBSD: pcidevs,v 1.2073 2024/04/09 01:22:19 jsg Exp $
$OpenBSD: pcidevs,v 1.2074 2024/04/20 08:54:01 jsg Exp $
/* $NetBSD: pcidevs,v 1.30 1997/06/24 06:20:24 thorpej Exp $ */
/*
@ -1326,8 +1326,8 @@ product ATI CYAN_SKILLFISH_2 0x143f Cyan Skillfish
product ATI PPB_1 0x1478 PCIE
product ATI PPB_2 0x1479 PCIE
product ATI MENDOCINO 0x1506 Mendocino
product ATI PHOENIX 0x15bf Phoenix
product ATI PHOENIX2 0x15c8 Phoenix 2
product ATI PHOENIX_1 0x15bf Phoenix
product ATI PHOENIX_2 0x15c8 Phoenix
product ATI PICASSO 0x15d8 Picasso
product ATI RAVEN_VEGA 0x15dd Radeon Vega
product ATI RAVEN_VEGA_HDA 0x15de Radeon Vega HD Audio
@ -1342,6 +1342,8 @@ product ATI YELLOW_CARP_1 0x164d Rembrandt
product ATI RAPHAEL 0x164e Raphael
product ATI YELLOW_CARP_2 0x1681 Rembrandt
product ATI RADEON_HD6500D_HDA 0x1714 Radeon HD 6500D HD Audio
product ATI HAWK_POINT_1 0x1900 Hawk Point
product ATI HAWK_POINT_2 0x1901 Hawk Point
product ATI RADEON_M241P 0x3150 Mobility Radeon X600
product ATI FIREMV_2400_1 0x3151 FireMV 2400
product ATI RADEON_X300M24 0x3152 Mobility Radeon X300

View file

@ -2,7 +2,7 @@
* THIS FILE AUTOMATICALLY GENERATED. DO NOT EDIT.
*
* generated from:
* OpenBSD: pcidevs,v 1.2073 2024/04/09 01:22:19 jsg Exp
* OpenBSD: pcidevs,v 1.2074 2024/04/20 08:54:01 jsg Exp
*/
/* $NetBSD: pcidevs,v 1.30 1997/06/24 06:20:24 thorpej Exp $ */
@ -1331,8 +1331,8 @@
#define PCI_PRODUCT_ATI_PPB_1 0x1478 /* PCIE */
#define PCI_PRODUCT_ATI_PPB_2 0x1479 /* PCIE */
#define PCI_PRODUCT_ATI_MENDOCINO 0x1506 /* Mendocino */
#define PCI_PRODUCT_ATI_PHOENIX 0x15bf /* Phoenix */
#define PCI_PRODUCT_ATI_PHOENIX2 0x15c8 /* Phoenix 2 */
#define PCI_PRODUCT_ATI_PHOENIX_1 0x15bf /* Phoenix */
#define PCI_PRODUCT_ATI_PHOENIX_2 0x15c8 /* Phoenix */
#define PCI_PRODUCT_ATI_PICASSO 0x15d8 /* Picasso */
#define PCI_PRODUCT_ATI_RAVEN_VEGA 0x15dd /* Radeon Vega */
#define PCI_PRODUCT_ATI_RAVEN_VEGA_HDA 0x15de /* Radeon Vega HD Audio */
@ -1347,6 +1347,8 @@
#define PCI_PRODUCT_ATI_RAPHAEL 0x164e /* Raphael */
#define PCI_PRODUCT_ATI_YELLOW_CARP_2 0x1681 /* Rembrandt */
#define PCI_PRODUCT_ATI_RADEON_HD6500D_HDA 0x1714 /* Radeon HD 6500D HD Audio */
#define PCI_PRODUCT_ATI_HAWK_POINT_1 0x1900 /* Hawk Point */
#define PCI_PRODUCT_ATI_HAWK_POINT_2 0x1901 /* Hawk Point */
#define PCI_PRODUCT_ATI_RADEON_M241P 0x3150 /* Mobility Radeon X600 */
#define PCI_PRODUCT_ATI_FIREMV_2400_1 0x3151 /* FireMV 2400 */
#define PCI_PRODUCT_ATI_RADEON_X300M24 0x3152 /* Mobility Radeon X300 */

View file

@ -2,7 +2,7 @@
* THIS FILE AUTOMATICALLY GENERATED. DO NOT EDIT.
*
* generated from:
* OpenBSD: pcidevs,v 1.2073 2024/04/09 01:22:19 jsg Exp
* OpenBSD: pcidevs,v 1.2074 2024/04/20 08:54:01 jsg Exp
*/
/* $NetBSD: pcidevs,v 1.30 1997/06/24 06:20:24 thorpej Exp $ */
@ -3436,12 +3436,12 @@ static const struct pci_known_product pci_known_products[] = {
"Mendocino",
},
{
PCI_VENDOR_ATI, PCI_PRODUCT_ATI_PHOENIX,
PCI_VENDOR_ATI, PCI_PRODUCT_ATI_PHOENIX_1,
"Phoenix",
},
{
PCI_VENDOR_ATI, PCI_PRODUCT_ATI_PHOENIX2,
"Phoenix 2",
PCI_VENDOR_ATI, PCI_PRODUCT_ATI_PHOENIX_2,
"Phoenix",
},
{
PCI_VENDOR_ATI, PCI_PRODUCT_ATI_PICASSO,
@ -3499,6 +3499,14 @@ static const struct pci_known_product pci_known_products[] = {
PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_HD6500D_HDA,
"Radeon HD 6500D HD Audio",
},
{
PCI_VENDOR_ATI, PCI_PRODUCT_ATI_HAWK_POINT_1,
"Hawk Point",
},
{
PCI_VENDOR_ATI, PCI_PRODUCT_ATI_HAWK_POINT_2,
"Hawk Point",
},
{
PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_M241P,
"Mobility Radeon X600",