sync with OpenBSD -current
This commit is contained in:
parent
f4dadbf64a
commit
be37d2a32b
GPG key ID:
F42C07F07E2E35B7
13 changed files with 143 additions and 28 deletions
|
|
@ -141,10 +141,6 @@ static const struct pci_matchid amdgpu_devices[] = {
|
|||
{0x1002, 0x73AF },
|
||||
{0x1002, 0x73BF },
|
||||
|
||||
/* Van Gogh */
|
||||
{0x1002, 0x1435 }, /* Custom GPU 0932 */
|
||||
{0x1002, 0x163F }, /* Custom GPU 0405 */
|
||||
|
||||
/* Yellow Carp */
|
||||
{0x1002, 0x164D },
|
||||
{0x1002, 0x1681 },
|
||||
|
|
@ -197,6 +193,14 @@ static const struct pci_matchid amdgpu_devices[] = {
|
|||
* display/dc/core/dc_resource.c resource_parse_asic_id()
|
||||
*/
|
||||
|
||||
/* GC 9.4.3, APU/dGPU, "Aqua Vanjaram" */
|
||||
{0x1002, 0x74a0 }, /* Instinct MI300A APU */
|
||||
{0x1002, 0x74a1 }, /* Instinct MI300X dGPU */
|
||||
|
||||
/* GC 10.3.1, DCN 3.0.1, APU, "Van Gogh" */
|
||||
{0x1002, 0x1435 }, /* Custom GPU 0932 */
|
||||
{0x1002, 0x163f }, /* Custom GPU 0405 */
|
||||
|
||||
/* GC 10.3.6, DCN 3.1.5, APU, Ryzen 7000 "Raphael" */
|
||||
{0x1002, 0x164e }, /* Radeon 610M */
|
||||
|
||||
|
|
@ -213,7 +217,7 @@ static const struct pci_matchid amdgpu_devices[] = {
|
|||
|
||||
/* GC 11.0.2, DCN 3.2.1, dGPU, "Navi 33" */
|
||||
{0x1002, 0x7480 }, /* Radeon RX 7600S, 7700S, 7600M XT,
|
||||
7600, Pro W7600 */
|
||||
7600, 7600 XT, Pro W7600 */
|
||||
{0x1002, 0x7483 }, /* Radeon RX 7600M */
|
||||
{0x1002, 0x7489 }, /* Radeon Pro W7500 */
|
||||
|
||||
|
|
@ -225,4 +229,5 @@ static const struct pci_matchid amdgpu_devices[] = {
|
|||
{0x1002, 0x15c8 }, /* 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 */
|
||||
};
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $OpenBSD: if_ix.c,v 1.209 2024/02/15 10:56:53 mglocker Exp $ */
|
||||
/* $OpenBSD: if_ix.c,v 1.211 2024/03/07 17:09:02 jan Exp $ */
|
||||
|
||||
/******************************************************************************
|
||||
|
||||
|
|
@ -1932,7 +1932,9 @@ ixgbe_setup_interface(struct ix_softc *sc)
|
|||
|
||||
ifp->if_capabilities |= IFCAP_TSOv4 | IFCAP_TSOv6;
|
||||
if (sc->hw.mac.type != ixgbe_mac_82598EB) {
|
||||
#ifndef __sparc64__
|
||||
ifp->if_xflags |= IFXF_LRO;
|
||||
#endif
|
||||
ifp->if_capabilities |= IFCAP_LRO;
|
||||
}
|
||||
|
||||
|
|
@ -3174,10 +3176,10 @@ ixgbe_rxeof(struct rx_ring *rxr)
|
|||
if (staterr & IXGBE_RXDADV_ERR_FRAME_ERR_MASK) {
|
||||
if (rxbuf->fmp) {
|
||||
m_freem(rxbuf->fmp);
|
||||
rxbuf->fmp = NULL;
|
||||
} else {
|
||||
m_freem(mp);
|
||||
}
|
||||
|
||||
m_freem(mp);
|
||||
rxbuf->fmp = NULL;
|
||||
rxbuf->buf = NULL;
|
||||
goto next_desc;
|
||||
}
|
||||
|
|
@ -3224,6 +3226,8 @@ ixgbe_rxeof(struct rx_ring *rxr)
|
|||
sendmp = mp;
|
||||
sendmp->m_pkthdr.len = 0;
|
||||
sendmp->m_pkthdr.ph_mss = 0;
|
||||
} else {
|
||||
mp->m_flags &= ~M_PKTHDR;
|
||||
}
|
||||
sendmp->m_pkthdr.len += mp->m_len;
|
||||
/*
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
$OpenBSD: pcidevs,v 1.2067 2024/03/06 00:05:18 jsg Exp $
|
||||
$OpenBSD: pcidevs,v 1.2068 2024/03/06 07:01:24 jsg Exp $
|
||||
/* $NetBSD: pcidevs,v 1.30 1997/06/24 06:20:24 thorpej Exp $ */
|
||||
|
||||
/*
|
||||
|
|
@ -2151,6 +2151,8 @@ product ATI NAVI32_2 0x747e Navi 32
|
|||
product ATI NAVI33_1 0x7480 Navi 33
|
||||
product ATI NAVI33_2 0x7483 Navi 33
|
||||
product ATI NAVI33_3 0x7489 Navi 33
|
||||
product ATI MI300A 0x74a0 MI300A
|
||||
product ATI MI300X 0x74a1 MI300X
|
||||
product ATI RADEON_9000IGP 0x7834 Radeon 9000/9100 IGP
|
||||
product ATI RADEON_RS350IGP 0x7835 Radeon RS350IGP
|
||||
product ATI RS690_HB 0x7910 RS690 Host
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
* THIS FILE AUTOMATICALLY GENERATED. DO NOT EDIT.
|
||||
*
|
||||
* generated from:
|
||||
* OpenBSD: pcidevs,v 1.2067 2024/03/06 00:05:18 jsg Exp
|
||||
* OpenBSD: pcidevs,v 1.2068 2024/03/06 07:01:24 jsg Exp
|
||||
*/
|
||||
/* $NetBSD: pcidevs,v 1.30 1997/06/24 06:20:24 thorpej Exp $ */
|
||||
|
||||
|
|
@ -2156,6 +2156,8 @@
|
|||
#define PCI_PRODUCT_ATI_NAVI33_1 0x7480 /* Navi 33 */
|
||||
#define PCI_PRODUCT_ATI_NAVI33_2 0x7483 /* Navi 33 */
|
||||
#define PCI_PRODUCT_ATI_NAVI33_3 0x7489 /* Navi 33 */
|
||||
#define PCI_PRODUCT_ATI_MI300A 0x74a0 /* MI300A */
|
||||
#define PCI_PRODUCT_ATI_MI300X 0x74a1 /* MI300X */
|
||||
#define PCI_PRODUCT_ATI_RADEON_9000IGP 0x7834 /* Radeon 9000/9100 IGP */
|
||||
#define PCI_PRODUCT_ATI_RADEON_RS350IGP 0x7835 /* Radeon RS350IGP */
|
||||
#define PCI_PRODUCT_ATI_RS690_HB 0x7910 /* RS690 Host */
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
* THIS FILE AUTOMATICALLY GENERATED. DO NOT EDIT.
|
||||
*
|
||||
* generated from:
|
||||
* OpenBSD: pcidevs,v 1.2067 2024/03/06 00:05:18 jsg Exp
|
||||
* OpenBSD: pcidevs,v 1.2068 2024/03/06 07:01:24 jsg Exp
|
||||
*/
|
||||
|
||||
/* $NetBSD: pcidevs,v 1.30 1997/06/24 06:20:24 thorpej Exp $ */
|
||||
|
|
@ -6743,6 +6743,14 @@ static const struct pci_known_product pci_known_products[] = {
|
|||
PCI_VENDOR_ATI, PCI_PRODUCT_ATI_NAVI33_3,
|
||||
"Navi 33",
|
||||
},
|
||||
{
|
||||
PCI_VENDOR_ATI, PCI_PRODUCT_ATI_MI300A,
|
||||
"MI300A",
|
||||
},
|
||||
{
|
||||
PCI_VENDOR_ATI, PCI_PRODUCT_ATI_MI300X,
|
||||
"MI300X",
|
||||
},
|
||||
{
|
||||
PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_9000IGP,
|
||||
"Radeon 9000/9100 IGP",
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue