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

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

details:   https://anonhg.NetBSD.org/src/rev/d1ec8b6f6b90
branches:  trunk
changeset: 835138:d1ec8b6f6b90
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Mon Aug 27 07:42:24 2018 +0000

description:
Ifdef out pci_device_enable/disable that pmf handles for us.

diffstat:

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

diffs (41 lines):

diff -r 7c65b0f93feb -r d1ec8b6f6b90 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        Mon Aug 27 07:42:13 2018 +0000
+++ b/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/engine/device/nouveau_nvkm_engine_device_pci.c        Mon Aug 27 07:42:24 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: nouveau_nvkm_engine_device_pci.c,v 1.3 2018/08/27 07:42:13 riastradh Exp $     */
+/*     $NetBSD: nouveau_nvkm_engine_device_pci.c,v 1.4 2018/08/27 07:42:24 riastradh 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.3 2018/08/27 07:42:13 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nouveau_nvkm_engine_device_pci.c,v 1.4 2018/08/27 07:42:24 riastradh Exp $");
 
 #include <core/pci.h>
 #include "priv.h"
@@ -1607,7 +1607,9 @@
 {
        struct nvkm_device_pci *pdev = nvkm_device_pci(device);
        if (suspend) {
+#ifndef __NetBSD__             /* XXX pmf takes care of this for us.  */
                pci_disable_device(pdev->pdev);
+#endif
                pdev->suspend = true;
        }
 }
@@ -1617,10 +1619,12 @@
 {
        struct nvkm_device_pci *pdev = nvkm_device_pci(device);
        if (pdev->suspend) {
+#ifndef __NetBSD__             /* XXX pmf takes care of this for us.  */
                int ret = pci_enable_device(pdev->pdev);
                if (ret)
                        return ret;
                pci_set_master(pdev->pdev);
+#endif
                pdev->suspend = false;
        }
        return 0;