Module Name: src
Committed By: riastradh
Date: Sun Dec 19 01:44:49 UTC 2021
Modified Files:
src/sys/external/bsd/drm2/dist/drm/i915: i915_pci.c
Log Message:
Ifdef out Linux PCI attachment goop; we'll provide our own.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/external/bsd/drm2/dist/drm/i915/i915_pci.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/external/bsd/drm2/dist/drm/i915/i915_pci.c
diff -u src/sys/external/bsd/drm2/dist/drm/i915/i915_pci.c:1.3 src/sys/external/bsd/drm2/dist/drm/i915/i915_pci.c:1.4
--- src/sys/external/bsd/drm2/dist/drm/i915/i915_pci.c:1.3 Sun Dec 19 01:43:51 2021
+++ src/sys/external/bsd/drm2/dist/drm/i915/i915_pci.c Sun Dec 19 01:44:49 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: i915_pci.c,v 1.3 2021/12/19 01:43:51 riastradh Exp $ */
+/* $NetBSD: i915_pci.c,v 1.4 2021/12/19 01:44:49 riastradh Exp $ */
/*
* Copyright © 2016 Intel Corporation
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: i915_pci.c,v 1.3 2021/12/19 01:43:51 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: i915_pci.c,v 1.4 2021/12/19 01:44:49 riastradh Exp $");
#include <linux/console.h>
#include <linux/vga_switcheroo.h>
@@ -913,6 +913,13 @@ static const struct pci_device_id pciidl
};
MODULE_DEVICE_TABLE(pci, pciidlist);
+#ifdef __NetBSD__
+
+/* XXX Kludge to expose this to NetBSD driver attachment goop. */
+const struct pci_device_id *const i915_device_ids = pciidlist;
+const size_t i915_n_device_ids = __arraycount(pciidlist);
+
+#else
static void i915_pci_remove(struct pci_dev *pdev)
{
struct drm_i915_private *i915;
@@ -1084,6 +1091,8 @@ static void __exit i915_exit(void)
module_init(i915_init);
module_exit(i915_exit);
+#endif
+
MODULE_AUTHOR("Tungsten Graphics, Inc.");
MODULE_AUTHOR("Intel Corporation");
