Module Name: src Committed By: riastradh Date: Mon Aug 27 07:42:24 UTC 2018
Modified Files: src/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/engine/device: nouveau_nvkm_engine_device_pci.c Log Message: Ifdef out pci_device_enable/disable that pmf handles for us. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 \ src/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/engine/device/nouveau_nvkm_engine_device_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/dist/drm/nouveau/nvkm/engine/device/nouveau_nvkm_engine_device_pci.c diff -u src/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/engine/device/nouveau_nvkm_engine_device_pci.c:1.3 src/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/engine/device/nouveau_nvkm_engine_device_pci.c:1.4 --- src/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/engine/device/nouveau_nvkm_engine_device_pci.c:1.3 Mon Aug 27 07:42:13 2018 +++ src/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/engine/device/nouveau_nvkm_engine_device_pci.c Mon Aug 27 07:42:24 2018 @@ -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 <bske...@redhat.com> */ #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 @@ nvkm_device_pci_fini(struct nvkm_device { 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 @@ nvkm_device_pci_preinit(struct nvkm_devi { 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;