[src/trunk]: src/sys/external/bsd/drm2/dist/drm/nouveau Ifdef out some stuff ...

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

details:   https://anonhg.NetBSD.org/src/rev/cf41b5026ee3
branches:  trunk
changeset: 992734:cf41b5026ee3
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Mon Aug 27 07:38:10 2018 +0000

description:
Ifdef out some stuff we don't need.

diffstat:

 sys/external/bsd/drm2/dist/drm/nouveau/nouveau_drm.c |  8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

diffs (44 lines):

diff -r 5d22cb73aa36 -r cf41b5026ee3 sys/external/bsd/drm2/dist/drm/nouveau/nouveau_drm.c
--- a/sys/external/bsd/drm2/dist/drm/nouveau/nouveau_drm.c      Mon Aug 27 07:37:58 2018 +0000
+++ b/sys/external/bsd/drm2/dist/drm/nouveau/nouveau_drm.c      Mon Aug 27 07:38:10 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: nouveau_drm.c,v 1.10 2018/08/27 07:03:26 riastradh Exp $       */
+/*     $NetBSD: nouveau_drm.c,v 1.11 2018/08/27 07:38:10 riastradh Exp $       */
 
 /*
  * Copyright 2012 Red Hat Inc.
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nouveau_drm.c,v 1.10 2018/08/27 07:03:26 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nouveau_drm.c,v 1.11 2018/08/27 07:38:10 riastradh Exp $");
 
 #include <linux/console.h>
 #include <linux/delay.h>
@@ -711,8 +711,8 @@
 #ifndef __NetBSD__
        struct pci_dev *pdev = to_pci_dev(dev);
        struct drm_device *drm_dev = pci_get_drvdata(pdev);
+       int ret;
 #endif
-       int ret;
 
        if (drm_dev->switch_power_state == DRM_SWITCH_POWER_OFF ||
            drm_dev->switch_power_state == DRM_SWITCH_POWER_DYNAMIC_OFF)
@@ -1074,6 +1074,7 @@
 };
 #endif
 
+#ifndef __NetBSD__
 static void nouveau_display_options(void)
 {
        DRM_DEBUG_DRIVER("Loading Nouveau with parameters:\n");
@@ -1090,6 +1091,7 @@
        DRM_DEBUG_DRIVER("... vram_pushbuf : %d\n", nouveau_vram_pushbuf);
        DRM_DEBUG_DRIVER("... pstate       : %d\n", nouveau_pstate);
 }
+#endif
 
 #ifndef __NetBSD__             /* XXX nouveau pm */
 static const struct dev_pm_ops nouveau_pm_ops = {