[src/trunk]: src/sys/external/bsd/drm2 nbsd-namespace, and provide CONFIG_LOC...

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

details:   https://anonhg.NetBSD.org/src/rev/eab8b2184942
branches:  trunk
changeset: 1028197:eab8b2184942
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Sun Dec 19 09:48:22 2021 +0000

description:
nbsd-namespace, and provide CONFIG_LOCKDEP (disabled)


Author: Maya Rashish <maya%NetBSD.org@localhost>

diffstat:

 sys/external/bsd/drm2/dist/drm/drm_mode_config.c  |  9 +++++++--
 sys/external/bsd/drm2/include/drm/drm_os_netbsd.h |  4 +++-
 2 files changed, 10 insertions(+), 3 deletions(-)

diffs (53 lines):

diff -r fc6caa70b66e -r eab8b2184942 sys/external/bsd/drm2/dist/drm/drm_mode_config.c
--- a/sys/external/bsd/drm2/dist/drm/drm_mode_config.c  Sun Dec 19 09:48:14 2021 +0000
+++ b/sys/external/bsd/drm2/dist/drm/drm_mode_config.c  Sun Dec 19 09:48:22 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: drm_mode_config.c,v 1.2 2021/12/18 23:44:57 riastradh Exp $    */
+/*     $NetBSD: drm_mode_config.c,v 1.3 2021/12/19 09:48:22 riastradh Exp $    */
 
 /*
  * Copyright (c) 2016 Intel Corporation
@@ -23,7 +23,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: drm_mode_config.c,v 1.2 2021/12/18 23:44:57 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: drm_mode_config.c,v 1.3 2021/12/19 09:48:22 riastradh Exp $");
 
 #include <linux/uaccess.h>
 
@@ -32,11 +32,16 @@
 #include <drm/drm_file.h>
 #include <drm/drm_mode_config.h>
 #include <drm/drm_print.h>
+#ifdef __NetBSD__
+#include <drm/drm_os_netbsd.h>
+#endif
 #include <linux/dma-resv.h>
 
 #include "drm_crtc_internal.h"
 #include "drm_internal.h"
 
+#include <linux/nbsd-namespace.h>
+
 int drm_modeset_register_all(struct drm_device *dev)
 {
        int ret;
diff -r fc6caa70b66e -r eab8b2184942 sys/external/bsd/drm2/include/drm/drm_os_netbsd.h
--- a/sys/external/bsd/drm2/include/drm/drm_os_netbsd.h Sun Dec 19 09:48:14 2021 +0000
+++ b/sys/external/bsd/drm2/include/drm/drm_os_netbsd.h Sun Dec 19 09:48:22 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: drm_os_netbsd.h,v 1.17 2020/02/14 04:36:56 riastradh Exp $     */
+/*     $NetBSD: drm_os_netbsd.h,v 1.18 2021/12/19 09:48:22 riastradh Exp $     */
 
 /*-
  * Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -55,6 +55,8 @@
  */
 #define        CONFIG_PCI      1
 
+#define        CONFIG_LOCKDEP  0
+
 #ifdef notyet
 #if defined(__i386__)
 #include "pnpbios.h"