Module Name: src
Committed By: riastradh
Date: Sun Dec 19 11:54:11 UTC 2021
Modified Files:
src/sys/external/bsd/drm2/dist/drm/i915: i915_drv.c
src/sys/external/bsd/drm2/i915drm: i915_pci_autoconf.c
Log Message:
i915: Omit needless reachover of i915_drm_driver.
To generate a diff of this commit:
cvs rdiff -u -r1.41 -r1.42 src/sys/external/bsd/drm2/dist/drm/i915/i915_drv.c
cvs rdiff -u -r1.8 -r1.9 \
src/sys/external/bsd/drm2/i915drm/i915_pci_autoconf.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_drv.c
diff -u src/sys/external/bsd/drm2/dist/drm/i915/i915_drv.c:1.41 src/sys/external/bsd/drm2/dist/drm/i915/i915_drv.c:1.42
--- src/sys/external/bsd/drm2/dist/drm/i915/i915_drv.c:1.41 Sun Dec 19 11:54:03 2021
+++ src/sys/external/bsd/drm2/dist/drm/i915/i915_drv.c Sun Dec 19 11:54:10 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: i915_drv.c,v 1.41 2021/12/19 11:54:03 riastradh Exp $ */
+/* $NetBSD: i915_drv.c,v 1.42 2021/12/19 11:54:10 riastradh Exp $ */
/* i915_drv.c -- i830,i845,i855,i865,i915 driver -*- linux-c -*-
*/
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: i915_drv.c,v 1.41 2021/12/19 11:54:03 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: i915_drv.c,v 1.42 2021/12/19 11:54:10 riastradh Exp $");
#include <linux/acpi.h>
#include <linux/device.h>
@@ -102,10 +102,6 @@ __KERNEL_RCSID(0, "$NetBSD: i915_drv.c,v
static struct drm_driver driver;
-#ifdef __NetBSD__
-/* XXX Kludge to expose this to NetBSD driver attachment goop. */
-struct drm_driver *const i915_drm_driver = &driver;
-#endif
struct vlv_s0ix_state {
/* GAM */
u32 wr_watermark;
Index: src/sys/external/bsd/drm2/i915drm/i915_pci_autoconf.c
diff -u src/sys/external/bsd/drm2/i915drm/i915_pci_autoconf.c:1.8 src/sys/external/bsd/drm2/i915drm/i915_pci_autoconf.c:1.9
--- src/sys/external/bsd/drm2/i915drm/i915_pci_autoconf.c:1.8 Sun Dec 19 11:54:03 2021
+++ src/sys/external/bsd/drm2/i915drm/i915_pci_autoconf.c Sun Dec 19 11:54:10 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: i915_pci_autoconf.c,v 1.8 2021/12/19 11:54:03 riastradh Exp $ */
+/* $NetBSD: i915_pci_autoconf.c,v 1.9 2021/12/19 11:54:10 riastradh Exp $ */
/*-
* Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: i915_pci_autoconf.c,v 1.8 2021/12/19 11:54:03 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: i915_pci_autoconf.c,v 1.9 2021/12/19 11:54:10 riastradh Exp $");
#include <sys/types.h>
#include <sys/queue.h>
@@ -80,8 +80,7 @@ static void i915drmkms_task_work(struct
CFATTACH_DECL_NEW(i915drmkms, sizeof(struct i915drmkms_softc),
i915drmkms_match, i915drmkms_attach, i915drmkms_detach, NULL);
-/* XXX Kludge to get these from i915_drv.c. */
-extern struct drm_driver *const i915_drm_driver;
+/* XXX Kludge to get these from i915_pci.c. */
extern const struct pci_device_id *const i915_device_ids;
extern const size_t i915_n_device_ids;
