sync with OpenBSD -current
This commit is contained in:
parent
aa342b6fac
commit
f172bc2cf7
GPG key ID:
F42C07F07E2E35B7
7 changed files with 32 additions and 11 deletions
|
|
@ -209,6 +209,7 @@ static const struct pci_matchid amdgpu_devices[] = {
|
|||
|
||||
/* GC 11.0.0, DCN 3.2.0, dGPU, "Navi 31" */
|
||||
{0x1002, 0x7448 }, /* Radeon Pro W7900 */
|
||||
{0x1002, 0x744a }, /* Radeon Pro W7900 Dual Slot */
|
||||
{0x1002, 0x744c }, /* Radeon RX 7900 XT/XTX/GRE, 7900M */
|
||||
{0x1002, 0x745e }, /* Radeon Pro W7800 */
|
||||
|
||||
|
|
@ -234,9 +235,13 @@ static const struct pci_matchid amdgpu_devices[] = {
|
|||
/* 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.1, APU, linux >= 6.9 */
|
||||
#ifdef notyet
|
||||
/* GC 11.5.0, DCN 3.5.0, APU, Ryzen AI 300, "Strix Point", linux 6.7 */
|
||||
{0x1002, 0x150e }, /* Radeon 880M / 890M */
|
||||
|
||||
/* GC 12.0.0, DCN 4.0.1, dGPU, linux ?, amd-staging-drm-next */
|
||||
/* GC 12.0.1, DCN 4.0.1, dGPU, linux ?, amd-staging-drm-next */
|
||||
/* GC 11.5.1, DCN 3.5.1, APU, linux 6.9 */
|
||||
|
||||
/* GC 12.0.0, DCN 4.0.1, dGPU, linux 6.11 */
|
||||
/* GC 12.0.1, DCN 4.0.1, dGPU, linux 6.11 */
|
||||
#endif
|
||||
};
|
||||
|
|
|
|||
|
|
@ -2027,7 +2027,7 @@ static int sdma_v4_0_process_trap_irq(struct amdgpu_device *adev,
|
|||
struct amdgpu_irq_src *source,
|
||||
struct amdgpu_iv_entry *entry)
|
||||
{
|
||||
uint32_t instance;
|
||||
int instance;
|
||||
|
||||
DRM_DEBUG("IH: SDMA trap\n");
|
||||
instance = sdma_v4_0_irq_id_to_seq(entry->client_id);
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
$OpenBSD: pcidevs,v 1.2079 2024/07/02 22:28:02 kettenis Exp $
|
||||
$OpenBSD: pcidevs,v 1.2080 2024/07/29 01:17:53 jsg Exp $
|
||||
/* $NetBSD: pcidevs,v 1.30 1997/06/24 06:20:24 thorpej Exp $ */
|
||||
|
||||
/*
|
||||
|
|
@ -1327,6 +1327,7 @@ 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 STRIX_POINT 0x150e Strix Point
|
||||
product ATI PHOENIX_1 0x15bf Phoenix
|
||||
product ATI PHOENIX_2 0x15c8 Phoenix
|
||||
product ATI PICASSO 0x15d8 Picasso
|
||||
|
|
@ -2149,6 +2150,7 @@ product ATI BEIGE_GOBY_4 0x7423 Navi 24
|
|||
product ATI BEIGE_GOBY_5 0x7424 Navi 24
|
||||
product ATI BEIGE_GOBY_6 0x743f Navi 24
|
||||
product ATI NAVI31_2 0x7448 Navi 31
|
||||
product ATI NAVI31_4 0x744a Navi 31
|
||||
product ATI NAVI31_1 0x744c Navi 31
|
||||
product ATI NAVI31_3 0x745e Navi 31
|
||||
product ATI NAVI32_1 0x7470 Navi 32
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
* THIS FILE AUTOMATICALLY GENERATED. DO NOT EDIT.
|
||||
*
|
||||
* generated from:
|
||||
* OpenBSD: pcidevs,v 1.2079 2024/07/02 22:28:02 kettenis Exp
|
||||
* OpenBSD: pcidevs,v 1.2080 2024/07/29 01:17:53 jsg Exp
|
||||
*/
|
||||
/* $NetBSD: pcidevs,v 1.30 1997/06/24 06:20:24 thorpej Exp $ */
|
||||
|
||||
|
|
@ -1332,6 +1332,7 @@
|
|||
#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_STRIX_POINT 0x150e /* Strix Point */
|
||||
#define PCI_PRODUCT_ATI_PHOENIX_1 0x15bf /* Phoenix */
|
||||
#define PCI_PRODUCT_ATI_PHOENIX_2 0x15c8 /* Phoenix */
|
||||
#define PCI_PRODUCT_ATI_PICASSO 0x15d8 /* Picasso */
|
||||
|
|
@ -2154,6 +2155,7 @@
|
|||
#define PCI_PRODUCT_ATI_BEIGE_GOBY_5 0x7424 /* Navi 24 */
|
||||
#define PCI_PRODUCT_ATI_BEIGE_GOBY_6 0x743f /* Navi 24 */
|
||||
#define PCI_PRODUCT_ATI_NAVI31_2 0x7448 /* Navi 31 */
|
||||
#define PCI_PRODUCT_ATI_NAVI31_4 0x744a /* Navi 31 */
|
||||
#define PCI_PRODUCT_ATI_NAVI31_1 0x744c /* Navi 31 */
|
||||
#define PCI_PRODUCT_ATI_NAVI31_3 0x745e /* Navi 31 */
|
||||
#define PCI_PRODUCT_ATI_NAVI32_1 0x7470 /* Navi 32 */
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
* THIS FILE AUTOMATICALLY GENERATED. DO NOT EDIT.
|
||||
*
|
||||
* generated from:
|
||||
* OpenBSD: pcidevs,v 1.2079 2024/07/02 22:28:02 kettenis Exp
|
||||
* OpenBSD: pcidevs,v 1.2080 2024/07/29 01:17:53 jsg Exp
|
||||
*/
|
||||
|
||||
/* $NetBSD: pcidevs,v 1.30 1997/06/24 06:20:24 thorpej Exp $ */
|
||||
|
|
@ -3435,6 +3435,10 @@ static const struct pci_known_product pci_known_products[] = {
|
|||
PCI_VENDOR_ATI, PCI_PRODUCT_ATI_MENDOCINO,
|
||||
"Mendocino",
|
||||
},
|
||||
{
|
||||
PCI_VENDOR_ATI, PCI_PRODUCT_ATI_STRIX_POINT,
|
||||
"Strix Point",
|
||||
},
|
||||
{
|
||||
PCI_VENDOR_ATI, PCI_PRODUCT_ATI_PHOENIX_1,
|
||||
"Phoenix",
|
||||
|
|
@ -6723,6 +6727,10 @@ static const struct pci_known_product pci_known_products[] = {
|
|||
PCI_VENDOR_ATI, PCI_PRODUCT_ATI_NAVI31_2,
|
||||
"Navi 31",
|
||||
},
|
||||
{
|
||||
PCI_VENDOR_ATI, PCI_PRODUCT_ATI_NAVI31_4,
|
||||
"Navi 31",
|
||||
},
|
||||
{
|
||||
PCI_VENDOR_ATI, PCI_PRODUCT_ATI_NAVI31_1,
|
||||
"Navi 31",
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue