[src/trunk]: src/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/engine/device En...

[jmcneill <jmcneill%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/7d0f1db01836
branches:  trunk
changeset: 467208:7d0f1db01836
user:      jmcneill <jmcneill%NetBSD.org@localhost>
date:      Fri Jan 17 19:13:25 2020 +0000

description:
Enable the device on NetBSD too (don't rely on firmware to do it for us).

diffstat:

 sys/external/bsd/drm2/dist/drm/nouveau/nvkm/engine/device/nouveau_nvkm_engine_device_pci.c |  10 +++-------
 1 files changed, 3 insertions(+), 7 deletions(-)

diffs (35 lines):

diff -r 8f566f2503a1 -r 7d0f1db01836 sys/external/bsd/drm2/dist/drm/nouveau/nvkm/engine/device/nouveau_nvkm_engine_device_pci.c
--- a/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/engine/device/nouveau_nvkm_engine_device_pci.c        Fri Jan 17 17:06:32 2020 +0000
+++ b/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/engine/device/nouveau_nvkm_engine_device_pci.c        Fri Jan 17 19:13:25 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: nouveau_nvkm_engine_device_pci.c,v 1.8 2018/08/27 14:17:36 riastradh Exp $     */
+/*     $NetBSD: nouveau_nvkm_engine_device_pci.c,v 1.9 2020/01/17 19:13:25 jmcneill Exp $      */
 
 /*
  * Copyright 2015 Red Hat Inc.
@@ -24,7 +24,7 @@
  * Authors: Ben Skeggs <bskeggs%redhat.com@localhost>
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nouveau_nvkm_engine_device_pci.c,v 1.8 2018/08/27 14:17:36 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nouveau_nvkm_engine_device_pci.c,v 1.9 2020/01/17 19:13:25 jmcneill Exp $");
 
 #include <core/pci.h>
 #include "priv.h"
@@ -1673,15 +1673,11 @@
        const struct nvkm_device_pci_vendor *pciv;
        const char *name = NULL;
        struct nvkm_device_pci *pdev;
-#ifndef __NetBSD__
        int ret;
-#endif
 
-#ifndef __NetBSD__
-       ret = pci_enable_device(pci_dev);
+       ret = linux_pci_enable_device(pci_dev);
        if (ret)
                return ret;
-#endif
 
        switch (pci_dev->vendor) {
        case 0x10de: pcid = nvkm_device_pci_10de; break;