The branch stable/15 has been updated by wulf:

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

commit b85fe129b8647c3a06c16dd1ad4afb9b33b2d5c5
Author:     Vladimir Kondratyev <[email protected]>
AuthorDate: 2026-09-17 07:42:48 +0000
Commit:     Vladimir Kondratyev <[email protected]>
CommitDate: 2026-09-22 15:47:03 +0000

    LinuxKPI: Add PCI_EXP_TYPE_UPSTREAM and PCI_VENDOR_ID_AMD defines
    
    Required by drm-kmod v6.12.105
    
    Reviewed by:    bz, emaste
    MFC after:      1 week
    Differential Revision:  https://reviews.freebsd.org/D59734
    
    (cherry picked from commit 52d1a0c62be1b4bd8e78ee57c86288246d948046)
---
 sys/compat/linuxkpi/common/include/linux/pci.h     | 1 +
 sys/compat/linuxkpi/common/include/linux/pci_ids.h | 1 +
 2 files changed, 2 insertions(+)

diff --git a/sys/compat/linuxkpi/common/include/linux/pci.h 
b/sys/compat/linuxkpi/common/include/linux/pci.h
index ab564538fb3b..a73d7d4ef515 100644
--- a/sys/compat/linuxkpi/common/include/linux/pci.h
+++ b/sys/compat/linuxkpi/common/include/linux/pci.h
@@ -147,6 +147,7 @@ 
MODULE_PNP_INFO("U32:vendor;U32:device;V32:subvendor;V32:subdevice",        \
 #define        PCI_EXP_TYPE_ROOT_PORT  PCIEM_TYPE_ROOT_PORT            /* Root 
Port */
 #define        PCI_EXP_TYPE_ENDPOINT   PCIEM_TYPE_ENDPOINT             /* 
Express Endpoint */
 #define        PCI_EXP_TYPE_LEG_END    PCIEM_TYPE_LEGACY_ENDPOINT      /* 
Legacy Endpoint */
+#define        PCI_EXP_TYPE_UPSTREAM   PCIEM_TYPE_UPSTREAM_PORT        /* 
Upstream Port */
 #define        PCI_EXP_TYPE_DOWNSTREAM PCIEM_TYPE_DOWNSTREAM_PORT      /* 
Downstream Port */
 #define        PCI_EXP_FLAGS_SLOT      PCIEM_FLAGS_SLOT                /* Slot 
implemented */
 #define        PCI_EXP_TYPE_RC_EC      PCIEM_TYPE_ROOT_EC              /* Root 
Complex Event Collector */
diff --git a/sys/compat/linuxkpi/common/include/linux/pci_ids.h 
b/sys/compat/linuxkpi/common/include/linux/pci_ids.h
index e318f6f75ce7..7ec898927224 100644
--- a/sys/compat/linuxkpi/common/include/linux/pci_ids.h
+++ b/sys/compat/linuxkpi/common/include/linux/pci_ids.h
@@ -44,6 +44,7 @@
 
 /* XXX We should really generate these and use them throughout the tree. */
 
+#define        PCI_VENDOR_ID_AMD               0x1022
 #define        PCI_VENDOR_ID_APPLE             0x106b
 #define        PCI_VENDOR_ID_ASUSTEK           0x1043
 #define        PCI_VENDOR_ID_ASMEDIA           0x1b21

Reply via email to