Module Name: src
Committed By: riastradh
Date: Mon Aug 27 07:57:34 UTC 2018
Modified Files:
src/sys/external/bsd/drm2/dist/drm/nouveau: nouveau_fbcon.c
Log Message:
Ifdef out drm_fb_helper_set_suspend calls.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 \
src/sys/external/bsd/drm2/dist/drm/nouveau/nouveau_fbcon.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/nouveau_fbcon.c
diff -u src/sys/external/bsd/drm2/dist/drm/nouveau/nouveau_fbcon.c:1.4 src/sys/external/bsd/drm2/dist/drm/nouveau/nouveau_fbcon.c:1.5
--- src/sys/external/bsd/drm2/dist/drm/nouveau/nouveau_fbcon.c:1.4 Mon Aug 27 07:36:48 2018
+++ src/sys/external/bsd/drm2/dist/drm/nouveau/nouveau_fbcon.c Mon Aug 27 07:57:34 2018
@@ -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 @@ nouveau_fbcon_set_suspend(struct drm_dev
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();
