Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/external/bsd/drm2/nouveau Clarify nvkm_device_pci_create...



details:   https://anonhg.NetBSD.org/src/rev/d13a154f820f
branches:  trunk
changeset: 366269:d13a154f820f
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Mon Aug 27 14:18:54 2018 +0000

description:
Clarify nvkm_device_pci_create arguments.  Use bogus parent for match prints.

diffstat:

 sys/external/bsd/drm2/nouveau/nouveau_pci.c |  13 +++++++------
 1 files changed, 7 insertions(+), 6 deletions(-)

diffs (41 lines):

diff -r 417c93f348e3 -r d13a154f820f sys/external/bsd/drm2/nouveau/nouveau_pci.c
--- a/sys/external/bsd/drm2/nouveau/nouveau_pci.c       Mon Aug 27 14:18:43 2018 +0000
+++ b/sys/external/bsd/drm2/nouveau/nouveau_pci.c       Mon Aug 27 14:18:54 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: nouveau_pci.c,v 1.19 2018/08/27 14:12:29 riastradh Exp $       */
+/*     $NetBSD: nouveau_pci.c,v 1.20 2018/08/27 14:18:54 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.19 2018/08/27 14:12:29 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nouveau_pci.c,v 1.20 2018/08/27 14:18:54 riastradh Exp $");
 
 #include <sys/types.h>
 #include <sys/device.h>
@@ -125,9 +125,9 @@
                return 0;
 #undef IS_BETWEEN
 
-       linux_pci_dev_init(&pdev, NULL, parent, pa, 0);
-       ret = nvkm_device_pci_new(&pdev, NULL, "error", true, false, 0,
-           &device);
+       linux_pci_dev_init(&pdev, parent /* XXX bogus */, parent, pa, 0);
+       ret = nvkm_device_pci_new(&pdev, NULL, "error",
+           /* detect */ true, /* mmio */ false, /* subdev_mask */ 0, &device);
        if (ret == 0)           /* don't want to hang onto it */
                nvkm_device_del(&device);
        linux_pci_dev_destroy(&pdev);
@@ -163,7 +163,8 @@
 
        /* XXX errno Linux->NetBSD */
        error = -nvkm_device_pci_new(&sc->sc_pci_dev,
-           nouveau_config, nouveau_debug, true, true, ~0ULL,
+           nouveau_config, nouveau_debug,
+           /* detect */ true, /* mmio */ true, /* subdev_mask */ ~0ULL,
            &sc->sc_nv_dev);
        if (error) {
                aprint_error_dev(self, "unable to create nouveau device: %d\n",



Home | Main Index | Thread Index | Old Index