Module Name: src
Committed By: riastradh
Date: Sun Dec 19 09:48:22 UTC 2021
Modified Files:
src/sys/external/bsd/drm2/dist/drm: drm_mode_config.c
src/sys/external/bsd/drm2/include/drm: drm_os_netbsd.h
Log Message:
nbsd-namespace, and provide CONFIG_LOCKDEP (disabled)
Author: Maya Rashish <m...@netbsd.org>
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/external/bsd/drm2/dist/drm/drm_mode_config.c
cvs rdiff -u -r1.17 -r1.18 \
src/sys/external/bsd/drm2/include/drm/drm_os_netbsd.h
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_mode_config.c
diff -u src/sys/external/bsd/drm2/dist/drm/drm_mode_config.c:1.2 src/sys/external/bsd/drm2/dist/drm/drm_mode_config.c:1.3
--- src/sys/external/bsd/drm2/dist/drm/drm_mode_config.c:1.2 Sat Dec 18 23:44:57 2021
+++ src/sys/external/bsd/drm2/dist/drm/drm_mode_config.c Sun Dec 19 09:48:22 2021
@@ -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 @@ __KERNEL_RCSID(0, "$NetBSD: drm_mode_con
#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;
Index: src/sys/external/bsd/drm2/include/drm/drm_os_netbsd.h
diff -u src/sys/external/bsd/drm2/include/drm/drm_os_netbsd.h:1.17 src/sys/external/bsd/drm2/include/drm/drm_os_netbsd.h:1.18
--- src/sys/external/bsd/drm2/include/drm/drm_os_netbsd.h:1.17 Fri Feb 14 04:36:56 2020
+++ src/sys/external/bsd/drm2/include/drm/drm_os_netbsd.h Sun Dec 19 09:48:22 2021
@@ -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"
