[src/trunk]: src/sys/external/bsd/drm2/dist/drm Fix bad merge and ifdef out l...

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

details:   https://anonhg.NetBSD.org/src/rev/b19722b51cda
branches:  trunk
changeset: 366124:b19722b51cda
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Mon Aug 27 07:54:41 2018 +0000

description:
Fix bad merge and ifdef out linux fb stuff.

diffstat:

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

diffs (54 lines):

diff -r 724e8459fbfc -r b19722b51cda sys/external/bsd/drm2/dist/drm/drm_fb_helper.c
--- a/sys/external/bsd/drm2/dist/drm/drm_fb_helper.c    Mon Aug 27 07:54:28 2018 +0000
+++ b/sys/external/bsd/drm2/dist/drm/drm_fb_helper.c    Mon Aug 27 07:54:41 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: drm_fb_helper.c,v 1.9 2018/08/27 04:58:19 riastradh Exp $      */
+/*     $NetBSD: drm_fb_helper.c,v 1.10 2018/08/27 07:54:41 riastradh Exp $     */
 
 /*
  * Copyright (c) 2006-2009 Red Hat Inc.
@@ -30,7 +30,7 @@
  *      Jesse Barnes <jesse.barnes%intel.com@localhost>
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: drm_fb_helper.c,v 1.9 2018/08/27 04:58:19 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: drm_fb_helper.c,v 1.10 2018/08/27 07:54:41 riastradh Exp $");
 
 #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
 
@@ -287,7 +287,6 @@
 drm_fb_helper_debug_enter_fb(struct drm_fb_helper *helper)
 {
        const struct drm_crtc_helper_funcs *funcs;
-       struct drm_crtc_helper_funcs *funcs;
        int i;
 
        list_for_each_entry(helper, &kernel_fb_helper_list, kernel_fb_list) {
@@ -762,6 +761,8 @@
 }
 EXPORT_SYMBOL(drm_fb_helper_init);
 
+#ifndef __NetBSD__             /* XXX fb info */
+
 /**
  * drm_fb_helper_alloc_fbi - allocate fb_info and some of its members
  * @fb_helper: driver-allocated fbdev helper
@@ -842,6 +843,8 @@
 }
 EXPORT_SYMBOL(drm_fb_helper_release_fbi);
 
+#endif /* __NetBSD__ */
+
 void drm_fb_helper_fini(struct drm_fb_helper *fb_helper)
 {
        if (!drm_fbdev_emulation)
@@ -850,7 +853,9 @@
        if (!list_empty(&fb_helper->kernel_fb_list)) {
                list_del(&fb_helper->kernel_fb_list);
                if (list_empty(&kernel_fb_helper_list)) {
+#ifndef __NetBSD__             /* XXX drm sysrq */
                        unregister_sysrq_key('v', &sysrq_drm_fb_helper_restore_op);
+#endif
                }
        }