Module Name: src
Committed By: riastradh
Date: Sun Dec 19 11:53:51 UTC 2021
Modified Files:
src/sys/external/bsd/drm2/amdgpu: amdgpu_pci.c
src/sys/external/bsd/drm2/dist/include/drm: drm_pci.h
src/sys/external/bsd/drm2/i915drm: i915_pci_autoconf.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:
drm: Omit needless pci_attach_args from our drm_pci_attach.
Can already get it from the struct pci_dev, and this way we can more
easily call it from patched upstream code as i915 will need to do.
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/sys/external/bsd/drm2/amdgpu/amdgpu_pci.c
cvs rdiff -u -r1.8 -r1.9 src/sys/external/bsd/drm2/dist/include/drm/drm_pci.h
cvs rdiff -u -r1.6 -r1.7 \
src/sys/external/bsd/drm2/i915drm/i915_pci_autoconf.c
cvs rdiff -u -r1.32 -r1.33 src/sys/external/bsd/drm2/nouveau/nouveau_pci.c
cvs rdiff -u -r1.45 -r1.46 src/sys/external/bsd/drm2/pci/drm_pci.c
cvs rdiff -u -r1.18 -r1.19 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.7 src/sys/external/bsd/drm2/amdgpu/amdgpu_pci.c:1.8
--- src/sys/external/bsd/drm2/amdgpu/amdgpu_pci.c:1.7 Sun Dec 19 11:05:12 2021
+++ src/sys/external/bsd/drm2/amdgpu/amdgpu_pci.c Sun Dec 19 11:53:50 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: amdgpu_pci.c,v 1.7 2021/12/19 11:05:12 riastradh Exp $ */
+/* $NetBSD: amdgpu_pci.c,v 1.8 2021/12/19 11:53:50 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.7 2021/12/19 11:05:12 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: amdgpu_pci.c,v 1.8 2021/12/19 11:53:50 riastradh Exp $");
#include <sys/types.h>
#include <sys/queue.h>
@@ -170,7 +170,7 @@ amdgpu_attach_real(device_t self)
}
/* XXX errno Linux->NetBSD */
- error = -drm_pci_attach(sc->sc_drm_dev, pa, &sc->sc_pci_dev);
+ error = -drm_pci_attach(sc->sc_drm_dev, &sc->sc_pci_dev);
if (error) {
aprint_error_dev(self, "unable to attach drm: %d\n", error);
goto out;
Index: src/sys/external/bsd/drm2/dist/include/drm/drm_pci.h
diff -u src/sys/external/bsd/drm2/dist/include/drm/drm_pci.h:1.8 src/sys/external/bsd/drm2/dist/include/drm/drm_pci.h:1.9
--- src/sys/external/bsd/drm2/dist/include/drm/drm_pci.h:1.8 Sun Dec 19 11:09:47 2021
+++ src/sys/external/bsd/drm2/dist/include/drm/drm_pci.h Sun Dec 19 11:53:50 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: drm_pci.h,v 1.8 2021/12/19 11:09:47 riastradh Exp $ */
+/* $NetBSD: drm_pci.h,v 1.9 2021/12/19 11:53:50 riastradh Exp $ */
/*
* Internal Header for the Direct Rendering Manager
@@ -76,8 +76,7 @@ static inline int drm_get_pci_dev(struct
#ifdef __NetBSD__
int drm_pci_request_irq(struct drm_device *, int);
void drm_pci_free_irq(struct drm_device *);
-int drm_pci_attach(struct drm_device *, const struct pci_attach_args *,
- struct pci_dev *);
+int drm_pci_attach(struct drm_device *, struct pci_dev *);
void drm_pci_detach(struct drm_device *);
#endif
Index: src/sys/external/bsd/drm2/i915drm/i915_pci_autoconf.c
diff -u src/sys/external/bsd/drm2/i915drm/i915_pci_autoconf.c:1.6 src/sys/external/bsd/drm2/i915drm/i915_pci_autoconf.c:1.7
--- src/sys/external/bsd/drm2/i915drm/i915_pci_autoconf.c:1.6 Sun Dec 19 11:53:02 2021
+++ src/sys/external/bsd/drm2/i915drm/i915_pci_autoconf.c Sun Dec 19 11:53:51 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: i915_pci_autoconf.c,v 1.6 2021/12/19 11:53:02 riastradh Exp $ */
+/* $NetBSD: i915_pci_autoconf.c,v 1.7 2021/12/19 11:53:51 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.6 2021/12/19 11:53:02 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: i915_pci_autoconf.c,v 1.7 2021/12/19 11:53:51 riastradh Exp $");
#include <sys/types.h>
#include <sys/queue.h>
@@ -189,7 +189,7 @@ i915drmkms_attach_real(device_t self)
}
/* XXX errno Linux->NetBSD */
- error = -drm_pci_attach(sc->sc_drm_dev, pa, &sc->sc_pci_dev);
+ error = -drm_pci_attach(sc->sc_drm_dev, &sc->sc_pci_dev);
if (error) {
aprint_error_dev(self, "unable to attach drm: %d\n", error);
return;
Index: src/sys/external/bsd/drm2/nouveau/nouveau_pci.c
diff -u src/sys/external/bsd/drm2/nouveau/nouveau_pci.c:1.32 src/sys/external/bsd/drm2/nouveau/nouveau_pci.c:1.33
--- src/sys/external/bsd/drm2/nouveau/nouveau_pci.c:1.32 Sun Dec 19 11:09:48 2021
+++ src/sys/external/bsd/drm2/nouveau/nouveau_pci.c Sun Dec 19 11:53:51 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: nouveau_pci.c,v 1.32 2021/12/19 11:09:48 riastradh Exp $ */
+/* $NetBSD: nouveau_pci.c,v 1.33 2021/12/19 11:53:51 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.32 2021/12/19 11:09:48 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nouveau_pci.c,v 1.33 2021/12/19 11:53:51 riastradh Exp $");
#ifdef _KERNEL_OPT
#if defined(__arm__) || defined(__aarch64__)
@@ -215,7 +215,7 @@ nouveau_pci_attach_real(device_t self)
}
/* XXX errno Linux->NetBSD */
- error = -drm_pci_attach(sc->sc_drm_dev, pa, &sc->sc_pci_dev);
+ error = -drm_pci_attach(sc->sc_drm_dev, &sc->sc_pci_dev);
if (error) {
aprint_error_dev(self, "unable to attach drm: %d\n", error);
return;
Index: src/sys/external/bsd/drm2/pci/drm_pci.c
diff -u src/sys/external/bsd/drm2/pci/drm_pci.c:1.45 src/sys/external/bsd/drm2/pci/drm_pci.c:1.46
--- src/sys/external/bsd/drm2/pci/drm_pci.c:1.45 Sun Dec 19 11:09:48 2021
+++ src/sys/external/bsd/drm2/pci/drm_pci.c Sun Dec 19 11:53:51 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: drm_pci.c,v 1.45 2021/12/19 11:09:48 riastradh Exp $ */
+/* $NetBSD: drm_pci.c,v 1.46 2021/12/19 11:53:51 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.45 2021/12/19 11:09:48 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: drm_pci.c,v 1.46 2021/12/19 11:53:51 riastradh Exp $");
#include <sys/types.h>
#include <sys/errno.h>
@@ -59,10 +59,10 @@ drm_pci_attach_args(struct drm_device *d
}
int
-drm_pci_attach(struct drm_device *dev, const struct pci_attach_args *pa,
- struct pci_dev *pdev)
+drm_pci_attach(struct drm_device *dev, struct pci_dev *pdev)
{
device_t self = dev->dev;
+ const struct pci_attach_args *pa = &pdev->pd_pa;
unsigned int unit;
int ret;
Index: src/sys/external/bsd/drm2/radeon/radeon_pci.c
diff -u src/sys/external/bsd/drm2/radeon/radeon_pci.c:1.18 src/sys/external/bsd/drm2/radeon/radeon_pci.c:1.19
--- src/sys/external/bsd/drm2/radeon/radeon_pci.c:1.18 Sun Dec 19 11:05:13 2021
+++ src/sys/external/bsd/drm2/radeon/radeon_pci.c Sun Dec 19 11:53:51 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: radeon_pci.c,v 1.18 2021/12/19 11:05:13 riastradh Exp $ */
+/* $NetBSD: radeon_pci.c,v 1.19 2021/12/19 11:53:51 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.18 2021/12/19 11:05:13 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: radeon_pci.c,v 1.19 2021/12/19 11:53:51 riastradh Exp $");
#ifdef _KERNEL_OPT
#include "vga.h"
@@ -260,7 +260,7 @@ radeon_attach_real(device_t self)
}
/* XXX errno Linux->NetBSD */
- error = -drm_pci_attach(sc->sc_drm_dev, pa, &sc->sc_pci_dev);
+ error = -drm_pci_attach(sc->sc_drm_dev, &sc->sc_pci_dev);
if (error) {
aprint_error_dev(self, "unable to attach drm: %d\n", error);
goto out;
