Module Name: src
Committed By: riastradh
Date: Sun Dec 19 00:28:20 UTC 2021
Modified Files:
src/sys/external/bsd/drm2/drm: drm_agp_hook.c drm_cdevsw.c drm_lock.c
drm_module.c drm_scatter.c drm_sysfs.c
Log Message:
Include drm_internal.h by "../dist/drm/drm_internal.h".
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/external/bsd/drm2/drm/drm_agp_hook.c
cvs rdiff -u -r1.16 -r1.17 src/sys/external/bsd/drm2/drm/drm_cdevsw.c
cvs rdiff -u -r1.8 -r1.9 src/sys/external/bsd/drm2/drm/drm_lock.c
cvs rdiff -u -r1.17 -r1.18 src/sys/external/bsd/drm2/drm/drm_module.c
cvs rdiff -u -r1.5 -r1.6 src/sys/external/bsd/drm2/drm/drm_scatter.c
cvs rdiff -u -r1.4 -r1.5 src/sys/external/bsd/drm2/drm/drm_sysfs.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/drm/drm_agp_hook.c
diff -u src/sys/external/bsd/drm2/drm/drm_agp_hook.c:1.3 src/sys/external/bsd/drm2/drm/drm_agp_hook.c:1.4
--- src/sys/external/bsd/drm2/drm/drm_agp_hook.c:1.3 Thu Aug 30 22:39:54 2018
+++ src/sys/external/bsd/drm2/drm/drm_agp_hook.c Sun Dec 19 00:28:20 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: drm_agp_hook.c,v 1.3 2018/08/30 22:39:54 mrg Exp $ */
+/* $NetBSD: drm_agp_hook.c,v 1.4 2021/12/19 00:28:20 riastradh Exp $ */
/*-
* Copyright (c) 2018 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: drm_agp_hook.c,v 1.3 2018/08/30 22:39:54 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: drm_agp_hook.c,v 1.4 2021/12/19 00:28:20 riastradh Exp $");
#include <sys/types.h>
#include <sys/condvar.h>
@@ -39,7 +39,8 @@ __KERNEL_RCSID(0, "$NetBSD: drm_agp_hook
#include <sys/once.h>
#include <drm/drmP.h>
-#include <drm/drm_internal.h>
+
+#include "../dist/drm/drm_internal.h"
static struct {
kmutex_t lock;
Index: src/sys/external/bsd/drm2/drm/drm_cdevsw.c
diff -u src/sys/external/bsd/drm2/drm/drm_cdevsw.c:1.16 src/sys/external/bsd/drm2/drm/drm_cdevsw.c:1.17
--- src/sys/external/bsd/drm2/drm/drm_cdevsw.c:1.16 Sun Sep 26 01:16:10 2021
+++ src/sys/external/bsd/drm2/drm/drm_cdevsw.c Sun Dec 19 00:28:20 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: drm_cdevsw.c,v 1.16 2021/09/26 01:16:10 thorpej Exp $ */
+/* $NetBSD: drm_cdevsw.c,v 1.17 2021/12/19 00:28:20 riastradh Exp $ */
/*-
* Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: drm_cdevsw.c,v 1.16 2021/09/26 01:16:10 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: drm_cdevsw.c,v 1.17 2021/12/19 00:28:20 riastradh Exp $");
#include <sys/param.h>
#include <sys/types.h>
@@ -58,7 +58,8 @@ __KERNEL_RCSID(0, "$NetBSD: drm_cdevsw.c
#include <linux/pm.h>
#include <drm/drmP.h>
-#include <drm/drm_internal.h>
+
+#include "../dist/drm/drm_internal.h"
#include "../dist/drm/drm_legacy.h"
static dev_type_open(drm_open);
Index: src/sys/external/bsd/drm2/drm/drm_lock.c
diff -u src/sys/external/bsd/drm2/drm/drm_lock.c:1.8 src/sys/external/bsd/drm2/drm/drm_lock.c:1.9
--- src/sys/external/bsd/drm2/drm/drm_lock.c:1.8 Sat May 23 23:42:43 2020
+++ src/sys/external/bsd/drm2/drm/drm_lock.c Sun Dec 19 00:28:20 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: drm_lock.c,v 1.8 2020/05/23 23:42:43 ad Exp $ */
+/* $NetBSD: drm_lock.c,v 1.9 2021/12/19 00:28:20 riastradh Exp $ */
/*-
* Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -46,14 +46,15 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: drm_lock.c,v 1.8 2020/05/23 23:42:43 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: drm_lock.c,v 1.9 2021/12/19 00:28:20 riastradh Exp $");
#include <sys/types.h>
#include <sys/errno.h>
#include <sys/systm.h>
#include <drm/drmP.h>
-#include <drm/drm_internal.h>
+
+#include "../dist/drm/drm_internal.h"
#include "../dist/drm/drm_legacy.h"
static bool drm_lock_acquire(struct drm_lock_data *, int);
Index: src/sys/external/bsd/drm2/drm/drm_module.c
diff -u src/sys/external/bsd/drm2/drm/drm_module.c:1.17 src/sys/external/bsd/drm2/drm/drm_module.c:1.18
--- src/sys/external/bsd/drm2/drm/drm_module.c:1.17 Fri Jan 3 21:01:16 2020
+++ src/sys/external/bsd/drm2/drm/drm_module.c Sun Dec 19 00:28:20 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: drm_module.c,v 1.17 2020/01/03 21:01:16 jmcneill Exp $ */
+/* $NetBSD: drm_module.c,v 1.18 2021/12/19 00:28:20 riastradh Exp $ */
/*-
* Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: drm_module.c,v 1.17 2020/01/03 21:01:16 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: drm_module.c,v 1.18 2021/12/19 00:28:20 riastradh Exp $");
#include <sys/types.h>
#include <sys/condvar.h>
@@ -46,10 +46,11 @@ __KERNEL_RCSID(0, "$NetBSD: drm_module.c
#include <drm/drmP.h>
#include <drm/drm_encoder_slave.h>
-#include <drm/drm_internal.h>
#include <drm/drm_sysctl.h>
#include <drm/drm_panel.h>
+#include "../dist/drm/drm_internal.h"
+
/*
* XXX This is stupid.
*
Index: src/sys/external/bsd/drm2/drm/drm_scatter.c
diff -u src/sys/external/bsd/drm2/drm/drm_scatter.c:1.5 src/sys/external/bsd/drm2/drm/drm_scatter.c:1.6
--- src/sys/external/bsd/drm2/drm/drm_scatter.c:1.5 Mon Aug 27 07:02:06 2018
+++ src/sys/external/bsd/drm2/drm/drm_scatter.c Sun Dec 19 00:28:20 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: drm_scatter.c,v 1.5 2018/08/27 07:02:06 riastradh Exp $ */
+/* $NetBSD: drm_scatter.c,v 1.6 2021/12/19 00:28:20 riastradh Exp $ */
/*-
* Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: drm_scatter.c,v 1.5 2018/08/27 07:02:06 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: drm_scatter.c,v 1.6 2021/12/19 00:28:20 riastradh Exp $");
#include <sys/types.h>
#include <sys/bus.h>
@@ -40,7 +40,8 @@ __KERNEL_RCSID(0, "$NetBSD: drm_scatter.
#include <linux/slab.h>
#include <drm/drmP.h>
-#include <drm/drm_internal.h>
+
+#include "../dist/drm/drm_internal.h"
#include "../dist/drm/drm_legacy.h"
static int drm_sg_alloc_mem(struct drm_device *, size_t,
Index: src/sys/external/bsd/drm2/drm/drm_sysfs.c
diff -u src/sys/external/bsd/drm2/drm/drm_sysfs.c:1.4 src/sys/external/bsd/drm2/drm/drm_sysfs.c:1.5
--- src/sys/external/bsd/drm2/drm/drm_sysfs.c:1.4 Mon Aug 27 07:00:09 2018
+++ src/sys/external/bsd/drm2/drm/drm_sysfs.c Sun Dec 19 00:28:20 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: drm_sysfs.c,v 1.4 2018/08/27 07:00:09 riastradh Exp $ */
+/* $NetBSD: drm_sysfs.c,v 1.5 2021/12/19 00:28:20 riastradh Exp $ */
/*-
* Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -30,10 +30,11 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: drm_sysfs.c,v 1.4 2018/08/27 07:00:09 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: drm_sysfs.c,v 1.5 2021/12/19 00:28:20 riastradh Exp $");
#include <drm/drmP.h>
-#include <drm/drm_internal.h>
+
+#include "../dist/drm/drm_internal.h"
int
drm_sysfs_connector_add(struct drm_connector *connector __unused)
