Sun Feb 27 14:23:08 2022 UTC ()
linux: Define PCI_CLASS_DISPLAY_OTHER, wanted by radeon/amdgpu.


(riastradh)
diff -r1.52 -r1.53 src/sys/external/bsd/drm2/include/linux/pci.h
cvs diff -r1.52 -r1.53 src/sys/external/bsd/drm2/include/linux/pci.h (expand / switch to unified diff)

--- src/sys/external/bsd/drm2/include/linux/pci.h 2022/02/27 14:22:29 1.52
+++ src/sys/external/bsd/drm2/include/linux/pci.h 2022/02/27 14:23:08 1.53
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: pci.h,v 1.52 2022/02/27 14:22:29 riastradh Exp $ */ 1/* $NetBSD: pci.h,v 1.53 2022/02/27 14:23:08 riastradh Exp $ */
2 2
3/*- 3/*-
4 * Copyright (c) 2013 The NetBSD Foundation, Inc. 4 * Copyright (c) 2013 The NetBSD Foundation, Inc.
5 * All rights reserved. 5 * All rights reserved.
6 * 6 *
7 * This code is derived from software contributed to The NetBSD Foundation 7 * This code is derived from software contributed to The NetBSD Foundation
8 * by Taylor R. Campbell. 8 * by Taylor R. Campbell.
9 * 9 *
10 * Redistribution and use in source and binary forms, with or without 10 * Redistribution and use in source and binary forms, with or without
11 * modification, are permitted provided that the following conditions 11 * modification, are permitted provided that the following conditions
12 * are met: 12 * are met:
13 * 1. Redistributions of source code must retain the above copyright 13 * 1. Redistributions of source code must retain the above copyright
14 * notice, this list of conditions and the following disclaimer. 14 * notice, this list of conditions and the following disclaimer.
@@ -80,26 +80,32 @@ struct pci_device_id { @@ -80,26 +80,32 @@ struct pci_device_id {
80 unsigned long driver_data; 80 unsigned long driver_data;
81}; 81};
82 82
83#define PCI_DEVICE(VENDOR, DEVICE) \ 83#define PCI_DEVICE(VENDOR, DEVICE) \
84 .vendor = (VENDOR), \ 84 .vendor = (VENDOR), \
85 .device = (DEVICE) 85 .device = (DEVICE)
86 86
87#define PCI_ANY_ID (~0) 87#define PCI_ANY_ID (~0)
88 88
89#define PCI_BASE_CLASS_DISPLAY PCI_CLASS_DISPLAY 89#define PCI_BASE_CLASS_DISPLAY PCI_CLASS_DISPLAY
90 90
91#define PCI_CLASS_DISPLAY_VGA \ 91#define PCI_CLASS_DISPLAY_VGA \
92 ((PCI_CLASS_DISPLAY << 8) | PCI_SUBCLASS_DISPLAY_VGA) 92 ((PCI_CLASS_DISPLAY << 8) | PCI_SUBCLASS_DISPLAY_VGA)
 93CTASSERT(PCI_CLASS_DISPLAY_VGA == 0x0300);
 94
 95#define PCI_CLASS_DISPLAY_OTHER \
 96 ((PCI_CLASS_DISPLAY << 8) | PCI_SUBCLASS_DISPLAY_MISC)
 97CTASSERT(PCI_CLASS_DISPLAY_OTHER == 0x0380);
 98
93#define PCI_CLASS_BRIDGE_ISA \ 99#define PCI_CLASS_BRIDGE_ISA \
94 ((PCI_CLASS_BRIDGE << 8) | PCI_SUBCLASS_BRIDGE_ISA) 100 ((PCI_CLASS_BRIDGE << 8) | PCI_SUBCLASS_BRIDGE_ISA)
95CTASSERT(PCI_CLASS_BRIDGE_ISA == 0x0601); 101CTASSERT(PCI_CLASS_BRIDGE_ISA == 0x0601);
96 102
97/* XXX This is getting silly... */ 103/* XXX This is getting silly... */
98#define PCI_VENDOR_ID_APPLE PCI_VENDOR_APPLE 104#define PCI_VENDOR_ID_APPLE PCI_VENDOR_APPLE
99#define PCI_VENDOR_ID_ASUSTEK PCI_VENDOR_ASUSTEK 105#define PCI_VENDOR_ID_ASUSTEK PCI_VENDOR_ASUSTEK
100#define PCI_VENDOR_ID_ATI PCI_VENDOR_ATI 106#define PCI_VENDOR_ID_ATI PCI_VENDOR_ATI
101#define PCI_VENDOR_ID_DELL PCI_VENDOR_DELL 107#define PCI_VENDOR_ID_DELL PCI_VENDOR_DELL
102#define PCI_VENDOR_ID_IBM PCI_VENDOR_IBM 108#define PCI_VENDOR_ID_IBM PCI_VENDOR_IBM
103#define PCI_VENDOR_ID_HP PCI_VENDOR_HP 109#define PCI_VENDOR_ID_HP PCI_VENDOR_HP
104#define PCI_VENDOR_ID_INTEL PCI_VENDOR_INTEL 110#define PCI_VENDOR_ID_INTEL PCI_VENDOR_INTEL
105#define PCI_VENDOR_ID_NVIDIA PCI_VENDOR_NVIDIA 111#define PCI_VENDOR_ID_NVIDIA PCI_VENDOR_NVIDIA