Module Name: src
Committed By: riastradh
Date: Mon Aug 27 14:11:22 UTC 2018
Modified Files:
src/sys/external/bsd/drm2/amdgpu: amdgpu_pci.c
src/sys/external/bsd/drm2/i915drm: i915_pci.c
src/sys/external/bsd/drm2/nouveau: nouveau_pci.c
src/sys/external/bsd/drm2/pci: drm_pci.c
src/sys/external/bsd/drm2/radeon: radeon_pci.c
Log Message:
Move linux_pci_dev_init into callers of drm_pci_attach.
The order in nouveau has to be
- linux_pci_dev_init
- nvkm_device_pci_new
- rest of drm_pci_attach
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/external/bsd/drm2/amdgpu/amdgpu_pci.c
cvs rdiff -u -r1.17 -r1.18 src/sys/external/bsd/drm2/i915drm/i915_pci.c
cvs rdiff -u -r1.15 -r1.16 src/sys/external/bsd/drm2/nouveau/nouveau_pci.c
cvs rdiff -u -r1.24 -r1.25 src/sys/external/bsd/drm2/pci/drm_pci.c
cvs rdiff -u -r1.10 -r1.11 src/sys/external/bsd/drm2/radeon/radeon_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/amdgpu/amdgpu_pci.c
diff -u src/sys/external/bsd/drm2/amdgpu/amdgpu_pci.c:1.1 src/sys/external/bsd/drm2/amdgpu/amdgpu_pci.c:1.2
--- src/sys/external/bsd/drm2/amdgpu/amdgpu_pci.c:1.1 Mon Aug 27 14:02:32 2018
+++ src/sys/external/bsd/drm2/amdgpu/amdgpu_pci.c Mon Aug 27 14:11:21 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: amdgpu_pci.c,v 1.1 2018/08/27 14:02:32 riastradh Exp $ */
+/* $NetBSD: amdgpu_pci.c,v 1.2 2018/08/27 14:11:21 riastradh Exp $ */
/*-
* Copyright (c) 2018 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: amdgpu_pci.c,v 1.1 2018/08/27 14:02:32 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: amdgpu_pci.c,v 1.2 2018/08/27 14:11:21 riastradh Exp $");
#include <sys/types.h>
#include <sys/queue.h>
@@ -156,6 +156,9 @@ amdgpu_attach_real(device_t self)
sc->sc_task_state = AMDGPU_TASK_ATTACH;
SIMPLEQ_INIT(&sc->sc_task_u.attach);
+ /* Initialize the Linux PCI device descriptor. */
+ linux_pci_dev_init(&sc->sc_pci_dev, self, pa, 0);
+
/* XXX errno Linux->NetBSD */
error = -drm_pci_attach(self, pa, &sc->sc_pci_dev, amdgpu_drm_driver,
flags, &sc->sc_drm_dev);
Index: src/sys/external/bsd/drm2/i915drm/i915_pci.c
diff -u src/sys/external/bsd/drm2/i915drm/i915_pci.c:1.17 src/sys/external/bsd/drm2/i915drm/i915_pci.c:1.18
--- src/sys/external/bsd/drm2/i915drm/i915_pci.c:1.17 Mon Aug 27 13:40:03 2018
+++ src/sys/external/bsd/drm2/i915drm/i915_pci.c Mon Aug 27 14:11:21 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: i915_pci.c,v 1.17 2018/08/27 13:40:03 riastradh Exp $ */
+/* $NetBSD: i915_pci.c,v 1.18 2018/08/27 14:11:21 riastradh Exp $ */
/*-
* Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: i915_pci.c,v 1.17 2018/08/27 13:40:03 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: i915_pci.c,v 1.18 2018/08/27 14:11:21 riastradh Exp $");
#include <sys/types.h>
#include <sys/queue.h>
@@ -174,6 +174,9 @@ i915drmkms_attach_real(device_t self)
sc->sc_task_state = I915DRMKMS_TASK_ATTACH;
SIMPLEQ_INIT(&sc->sc_task_u.attach);
+ /* Initialize the Linux PCI device descriptor. */
+ linux_pci_dev_init(&sc->sc_pci_dev, self, pa, 0);
+
/* XXX errno Linux->NetBSD */
error = -drm_pci_attach(self, pa, &sc->sc_pci_dev, i915_drm_driver,
cookie, &sc->sc_drm_dev);
Index: src/sys/external/bsd/drm2/nouveau/nouveau_pci.c
diff -u src/sys/external/bsd/drm2/nouveau/nouveau_pci.c:1.15 src/sys/external/bsd/drm2/nouveau/nouveau_pci.c:1.16
--- src/sys/external/bsd/drm2/nouveau/nouveau_pci.c:1.15 Mon Aug 27 13:39:07 2018
+++ src/sys/external/bsd/drm2/nouveau/nouveau_pci.c Mon Aug 27 14:11:21 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: nouveau_pci.c,v 1.15 2018/08/27 13:39:07 riastradh Exp $ */
+/* $NetBSD: nouveau_pci.c,v 1.16 2018/08/27 14:11:21 riastradh Exp $ */
/*-
* Copyright (c) 2015 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nouveau_pci.c,v 1.15 2018/08/27 13:39:07 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nouveau_pci.c,v 1.16 2018/08/27 14:11:21 riastradh Exp $");
#include <sys/types.h>
#include <sys/device.h>
@@ -139,6 +139,9 @@ nouveau_pci_attach(device_t parent, devi
sc->sc_dev = self;
+ /* Initialize the Linux PCI device descriptor. */
+ linux_pci_dev_init(&sc->sc_pci_dev, self, pa, 0);
+
if (!pmf_device_register(self, &nouveau_pci_suspend,
&nouveau_pci_resume))
aprint_error_dev(self, "unable to establish power handler\n");
Index: src/sys/external/bsd/drm2/pci/drm_pci.c
diff -u src/sys/external/bsd/drm2/pci/drm_pci.c:1.24 src/sys/external/bsd/drm2/pci/drm_pci.c:1.25
--- src/sys/external/bsd/drm2/pci/drm_pci.c:1.24 Mon Aug 27 07:55:59 2018
+++ src/sys/external/bsd/drm2/pci/drm_pci.c Mon Aug 27 14:11:21 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: drm_pci.c,v 1.24 2018/08/27 07:55:59 riastradh Exp $ */
+/* $NetBSD: drm_pci.c,v 1.25 2018/08/27 14:11:21 riastradh Exp $ */
/*-
* Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: drm_pci.c,v 1.24 2018/08/27 07:55:59 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: drm_pci.c,v 1.25 2018/08/27 14:11:21 riastradh Exp $");
#include <sys/types.h>
#include <sys/errno.h>
@@ -82,9 +82,6 @@ drm_pci_attach(device_t self, const stru
if (ret)
goto fail0;
- /* Initialize the Linux PCI device descriptor. */
- linux_pci_dev_init(pdev, self, pa, 0);
-
/* Create a DRM device. */
dev = drm_dev_alloc(driver, self);
if (dev == NULL) {
Index: src/sys/external/bsd/drm2/radeon/radeon_pci.c
diff -u src/sys/external/bsd/drm2/radeon/radeon_pci.c:1.10 src/sys/external/bsd/drm2/radeon/radeon_pci.c:1.11
--- src/sys/external/bsd/drm2/radeon/radeon_pci.c:1.10 Fri May 29 05:48:46 2015
+++ src/sys/external/bsd/drm2/radeon/radeon_pci.c Mon Aug 27 14:11:22 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: radeon_pci.c,v 1.10 2015/05/29 05:48:46 mrg Exp $ */
+/* $NetBSD: radeon_pci.c,v 1.11 2018/08/27 14:11:22 riastradh Exp $ */
/*-
* Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: radeon_pci.c,v 1.10 2015/05/29 05:48:46 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: radeon_pci.c,v 1.11 2018/08/27 14:11:22 riastradh Exp $");
#ifdef _KERNEL_OPT
#include "vga.h"
@@ -228,6 +228,9 @@ radeon_attach_real(device_t self)
sc->sc_task_state = RADEON_TASK_ATTACH;
SIMPLEQ_INIT(&sc->sc_task_u.attach);
+ /* Initialize the Linux PCI device descriptor. */
+ linux_pci_dev_init(&sc->sc_pci_dev, self, pa, 0);
+
/* XXX errno Linux->NetBSD */
error = -drm_pci_attach(self, pa, &sc->sc_pci_dev, radeon_drm_driver,
flags, &sc->sc_drm_dev);
