Module Name: src
Committed By: riastradh
Date: Mon Aug 27 07:54:42 UTC 2018
Modified Files:
src/sys/external/bsd/drm2/dist/drm: drm_fb_helper.c
Log Message:
Fix bad merge and ifdef out linux fb stuff.
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/sys/external/bsd/drm2/dist/drm/drm_fb_helper.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/drm_fb_helper.c
diff -u src/sys/external/bsd/drm2/dist/drm/drm_fb_helper.c:1.9 src/sys/external/bsd/drm2/dist/drm/drm_fb_helper.c:1.10
--- src/sys/external/bsd/drm2/dist/drm/drm_fb_helper.c:1.9 Mon Aug 27 04:58:19 2018
+++ src/sys/external/bsd/drm2/dist/drm/drm_fb_helper.c Mon Aug 27 07:54:41 2018
@@ -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 <[email protected]>
*/
#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 @@ int
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 @@ out_free:
}
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 @@ void drm_fb_helper_release_fbi(struct dr
}
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 @@ void drm_fb_helper_fini(struct drm_fb_he
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
}
}
