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

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

details:   https://anonhg.NetBSD.org/src/rev/48e93f609bf6
branches:  trunk
changeset: 835220:48e93f609bf6
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Mon Aug 27 07:57:34 2018 +0000

description:
Ifdef out drm_fb_helper_set_suspend calls.

diffstat:

 sys/external/bsd/drm2/dist/drm/nouveau/nouveau_fbcon.c |  6 ++----
 1 files changed, 2 insertions(+), 4 deletions(-)

diffs (28 lines):

diff -r 4863d4629033 -r 48e93f609bf6 sys/external/bsd/drm2/dist/drm/nouveau/nouveau_fbcon.c
--- a/sys/external/bsd/drm2/dist/drm/nouveau/nouveau_fbcon.c    Mon Aug 27 07:57:22 2018 +0000
+++ b/sys/external/bsd/drm2/dist/drm/nouveau/nouveau_fbcon.c    Mon Aug 27 07:57:34 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: nouveau_fbcon.c,v 1.4 2018/08/27 07:36:48 riastradh Exp $      */
+/*     $NetBSD: nouveau_fbcon.c,v 1.5 2018/08/27 07:57:34 riastradh Exp $      */
 
 /*
  * Copyright © 2007 David Airlie
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nouveau_fbcon.c,v 1.4 2018/08/27 07:36:48 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nouveau_fbcon.c,v 1.5 2018/08/27 07:57:34 riastradh Exp $");
 
 #include <linux/module.h>
 #include <linux/kernel.h>
@@ -579,9 +579,7 @@
                console_lock();
                if (state == FBINFO_STATE_RUNNING)
                        nouveau_fbcon_accel_restore(dev);
-#endif
                drm_fb_helper_set_suspend(&drm->fbcon->helper, state);
-#ifndef __NetBSD__
                if (state != FBINFO_STATE_RUNNING)
                        nouveau_fbcon_accel_save_disable(dev);
                console_unlock();