Module Name: src
Committed By: riastradh
Date: Sun Dec 19 09:52:00 UTC 2021
Modified Files:
src/sys/external/bsd/drm2/dist/drm: drm_internal.h
src/sys/external/bsd/drm2/dist/include/drm: drm_pci.h
src/sys/external/bsd/drm2/drm: drm_agp_hook.c drm_cache.c drm_cdevsw.c
drm_file.c drm_gem_cma_helper.c drm_gem_vm.c drm_lock.c
drm_memory.c drm_module.c
Log Message:
Make ourselves less dependent on drmP.h, removed upstream.
This causes some trouble as CONFIG_* lines might not be appropriately
defined. A few declarations remain in drmP.h so it's not gone.
Author: Maya Rashish <m...@netbsd.org>
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/sys/external/bsd/drm2/dist/drm/drm_internal.h
cvs rdiff -u -r1.2 -r1.3 src/sys/external/bsd/drm2/dist/include/drm/drm_pci.h
cvs rdiff -u -r1.5 -r1.6 src/sys/external/bsd/drm2/drm/drm_agp_hook.c
cvs rdiff -u -r1.15 -r1.16 src/sys/external/bsd/drm2/drm/drm_cache.c
cvs rdiff -u -r1.22 -r1.23 src/sys/external/bsd/drm2/drm/drm_cdevsw.c \
src/sys/external/bsd/drm2/drm/drm_module.c
cvs rdiff -u -r1.3 -r1.4 src/sys/external/bsd/drm2/drm/drm_file.c
cvs rdiff -u -r1.12 -r1.13 src/sys/external/bsd/drm2/drm/drm_gem_cma_helper.c
cvs rdiff -u -r1.13 -r1.14 src/sys/external/bsd/drm2/drm/drm_gem_vm.c \
src/sys/external/bsd/drm2/drm/drm_memory.c
cvs rdiff -u -r1.11 -r1.12 src/sys/external/bsd/drm2/drm/drm_lock.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_internal.h
diff -u src/sys/external/bsd/drm2/dist/drm/drm_internal.h:1.9 src/sys/external/bsd/drm2/dist/drm/drm_internal.h:1.10
--- src/sys/external/bsd/drm2/dist/drm/drm_internal.h:1.9 Sun Dec 19 01:03:22 2021
+++ src/sys/external/bsd/drm2/dist/drm/drm_internal.h Sun Dec 19 09:52:00 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: drm_internal.h,v 1.9 2021/12/19 01:03:22 riastradh Exp $ */
+/* $NetBSD: drm_internal.h,v 1.10 2021/12/19 09:52:00 riastradh Exp $ */
/*
* Copyright © 2014 Intel Corporation
@@ -23,6 +23,7 @@
* OTHER DEALINGS IN THE SOFTWARE.
*/
+#include <linux/kernel.h>
#include <drm/drm_ioctl.h>
#define DRM_IF_MAJOR 1
Index: src/sys/external/bsd/drm2/dist/include/drm/drm_pci.h
diff -u src/sys/external/bsd/drm2/dist/include/drm/drm_pci.h:1.2 src/sys/external/bsd/drm2/dist/include/drm/drm_pci.h:1.3
--- src/sys/external/bsd/drm2/dist/include/drm/drm_pci.h:1.2 Sat Dec 18 23:45:46 2021
+++ src/sys/external/bsd/drm2/dist/include/drm/drm_pci.h Sun Dec 19 09:52:00 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: drm_pci.h,v 1.2 2021/12/18 23:45:46 riastradh Exp $ */
+/* $NetBSD: drm_pci.h,v 1.3 2021/12/19 09:52:00 riastradh Exp $ */
/*
* Internal Header for the Direct Rendering Manager
@@ -35,6 +35,7 @@
#define _DRM_PCI_H_
#include <linux/pci.h>
+#include <drm/drm_os_netbsd.h>
struct drm_dma_handle;
struct drm_device;
Index: src/sys/external/bsd/drm2/drm/drm_agp_hook.c
diff -u src/sys/external/bsd/drm2/drm/drm_agp_hook.c:1.5 src/sys/external/bsd/drm2/drm/drm_agp_hook.c:1.6
--- src/sys/external/bsd/drm2/drm/drm_agp_hook.c:1.5 Sun Dec 19 00:48:45 2021
+++ src/sys/external/bsd/drm2/drm/drm_agp_hook.c Sun Dec 19 09:52:00 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: drm_agp_hook.c,v 1.5 2021/12/19 00:48:45 riastradh Exp $ */
+/* $NetBSD: drm_agp_hook.c,v 1.6 2021/12/19 09:52:00 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.5 2021/12/19 00:48:45 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: drm_agp_hook.c,v 1.6 2021/12/19 09:52:00 riastradh Exp $");
#include <sys/types.h>
#include <sys/condvar.h>
@@ -38,8 +38,8 @@ __KERNEL_RCSID(0, "$NetBSD: drm_agp_hook
#include <sys/mutex.h>
#include <sys/once.h>
-#include <drm/drmP.h>
-
+#include <drm/drm_agpsupport.h>
+#include <drm/drm_drv.h>
#include "../dist/drm/drm_internal.h"
static struct {
Index: src/sys/external/bsd/drm2/drm/drm_cache.c
diff -u src/sys/external/bsd/drm2/drm/drm_cache.c:1.15 src/sys/external/bsd/drm2/drm/drm_cache.c:1.16
--- src/sys/external/bsd/drm2/drm/drm_cache.c:1.15 Sun Dec 19 00:49:36 2021
+++ src/sys/external/bsd/drm2/drm/drm_cache.c Sun Dec 19 09:52:00 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: drm_cache.c,v 1.15 2021/12/19 00:49:36 riastradh Exp $ */
+/* $NetBSD: drm_cache.c,v 1.16 2021/12/19 09:52:00 riastradh Exp $ */
/*-
* Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: drm_cache.c,v 1.15 2021/12/19 00:49:36 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: drm_cache.c,v 1.16 2021/12/19 09:52:00 riastradh Exp $");
#include <sys/param.h>
#include <sys/types.h>
@@ -38,9 +38,9 @@ __KERNEL_RCSID(0, "$NetBSD: drm_cache.c,
#include <uvm/uvm_extern.h>
+#include <linux/highmem.h>
#include <linux/mm_types.h>
-#include <drm/drmP.h>
#include <drm/drm_cache.h>
#if !defined(__arm__) && !defined(__aarch64__)
Index: src/sys/external/bsd/drm2/drm/drm_cdevsw.c
diff -u src/sys/external/bsd/drm2/drm/drm_cdevsw.c:1.22 src/sys/external/bsd/drm2/drm/drm_cdevsw.c:1.23
--- src/sys/external/bsd/drm2/drm/drm_cdevsw.c:1.22 Sun Dec 19 01:59:34 2021
+++ src/sys/external/bsd/drm2/drm/drm_cdevsw.c Sun Dec 19 09:52:00 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: drm_cdevsw.c,v 1.22 2021/12/19 01:59:34 riastradh Exp $ */
+/* $NetBSD: drm_cdevsw.c,v 1.23 2021/12/19 09:52:00 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.22 2021/12/19 01:59:34 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: drm_cdevsw.c,v 1.23 2021/12/19 09:52:00 riastradh Exp $");
#include <sys/param.h>
#include <sys/types.h>
@@ -60,6 +60,7 @@ __KERNEL_RCSID(0, "$NetBSD: drm_cdevsw.c
#include <drm/drmP.h>
#include <drm/drm_drv.h>
#include <drm/drm_file.h>
+#include <drm/drm_irq.h>
#include <drm/drm_legacy.h>
#include "../dist/drm/drm_internal.h"
Index: src/sys/external/bsd/drm2/drm/drm_module.c
diff -u src/sys/external/bsd/drm2/drm/drm_module.c:1.22 src/sys/external/bsd/drm2/drm/drm_module.c:1.23
--- src/sys/external/bsd/drm2/drm/drm_module.c:1.22 Sun Dec 19 09:50:42 2021
+++ src/sys/external/bsd/drm2/drm/drm_module.c Sun Dec 19 09:52:00 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: drm_module.c,v 1.22 2021/12/19 09:50:42 riastradh Exp $ */
+/* $NetBSD: drm_module.c,v 1.23 2021/12/19 09:52:00 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.22 2021/12/19 09:50:42 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: drm_module.c,v 1.23 2021/12/19 09:52:00 riastradh Exp $");
#include <sys/types.h>
#include <sys/condvar.h>
@@ -45,10 +45,13 @@ __KERNEL_RCSID(0, "$NetBSD: drm_module.c
#include <linux/mutex.h>
#include <drm/drmP.h>
+#include <drm/drm_agpsupport.h>
#include <drm/drm_bridge.h>
#include <drm/drm_encoder_slave.h>
+#include <drm/drm_global.h>
#include <drm/drm_sysctl.h>
#include <drm/drm_panel.h>
+#include <drm/drm_print.h>
#include "../dist/drm/drm_crtc_internal.h"
#include "../dist/drm/drm_internal.h"
@@ -119,7 +122,7 @@ drm_init(void)
#endif
if (ISSET(boothowto, AB_DEBUG))
- drm_debug = DRM_UT_CORE | DRM_UT_DRIVER | DRM_UT_KMS;
+ __drm_debug = DRM_UT_CORE | DRM_UT_DRIVER | DRM_UT_KMS;
spin_lock_init(&drm_minor_lock);
idr_init(&drm_minors_idr);
Index: src/sys/external/bsd/drm2/drm/drm_file.c
diff -u src/sys/external/bsd/drm2/drm/drm_file.c:1.3 src/sys/external/bsd/drm2/drm/drm_file.c:1.4
--- src/sys/external/bsd/drm2/drm/drm_file.c:1.3 Sun Dec 19 09:46:40 2021
+++ src/sys/external/bsd/drm2/drm/drm_file.c Sun Dec 19 09:52:00 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: drm_file.c,v 1.3 2021/12/19 09:46:40 riastradh Exp $ */
+/* $NetBSD: drm_file.c,v 1.4 2021/12/19 09:52:00 riastradh Exp $ */
/*-
* Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -30,12 +30,13 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: drm_file.c,v 1.3 2021/12/19 09:46:40 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: drm_file.c,v 1.4 2021/12/19 09:52:00 riastradh Exp $");
#include <sys/param.h>
#include <sys/select.h>
-#include <drm/drmP.h>
+#include <linux/capability.h>
+
#include <drm/drm_drv.h>
#include <drm/drm_legacy.h>
#include <drm/drm_file.h>
Index: src/sys/external/bsd/drm2/drm/drm_gem_cma_helper.c
diff -u src/sys/external/bsd/drm2/drm/drm_gem_cma_helper.c:1.12 src/sys/external/bsd/drm2/drm/drm_gem_cma_helper.c:1.13
--- src/sys/external/bsd/drm2/drm/drm_gem_cma_helper.c:1.12 Sun Dec 19 09:49:08 2021
+++ src/sys/external/bsd/drm2/drm/drm_gem_cma_helper.c Sun Dec 19 09:52:00 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: drm_gem_cma_helper.c,v 1.12 2021/12/19 09:49:08 riastradh Exp $ */
+/* $NetBSD: drm_gem_cma_helper.c,v 1.13 2021/12/19 09:52:00 riastradh Exp $ */
/*-
* Copyright (c) 2015-2017 Jared McNeill <jmcne...@invisible.ca>
@@ -27,9 +27,12 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: drm_gem_cma_helper.c,v 1.12 2021/12/19 09:49:08 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: drm_gem_cma_helper.c,v 1.13 2021/12/19 09:52:00 riastradh Exp $");
-#include <drm/drmP.h>
+#include <linux/err.h>
+
+#include <drm/drm_drv.h>
+#include <drm/drm_print.h>
#include <drm/drm_gem_cma_helper.h>
#include <drm/bus_dma_hacks.h>
Index: src/sys/external/bsd/drm2/drm/drm_gem_vm.c
diff -u src/sys/external/bsd/drm2/drm/drm_gem_vm.c:1.13 src/sys/external/bsd/drm2/drm/drm_gem_vm.c:1.14
--- src/sys/external/bsd/drm2/drm/drm_gem_vm.c:1.13 Sun Dec 19 09:49:31 2021
+++ src/sys/external/bsd/drm2/drm/drm_gem_vm.c Sun Dec 19 09:52:00 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: drm_gem_vm.c,v 1.13 2021/12/19 09:49:31 riastradh Exp $ */
+/* $NetBSD: drm_gem_vm.c,v 1.14 2021/12/19 09:52:00 riastradh Exp $ */
/*-
* Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -30,14 +30,14 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: drm_gem_vm.c,v 1.13 2021/12/19 09:49:31 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: drm_gem_vm.c,v 1.14 2021/12/19 09:52:00 riastradh Exp $");
#include <sys/types.h>
#include <sys/file.h>
+#include <sys/mman.h>
#include <uvm/uvm_extern.h>
-#include <drm/drmP.h>
#include <drm/drm_drv.h>
#include <drm/drm_gem.h>
#include <drm/drm_legacy.h>
Index: src/sys/external/bsd/drm2/drm/drm_memory.c
diff -u src/sys/external/bsd/drm2/drm/drm_memory.c:1.13 src/sys/external/bsd/drm2/drm/drm_memory.c:1.14
--- src/sys/external/bsd/drm2/drm/drm_memory.c:1.13 Mon Aug 27 15:32:06 2018
+++ src/sys/external/bsd/drm2/drm/drm_memory.c Sun Dec 19 09:52:00 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: drm_memory.c,v 1.13 2018/08/27 15:32:06 riastradh Exp $ */
+/* $NetBSD: drm_memory.c,v 1.14 2021/12/19 09:52:00 riastradh Exp $ */
/*-
* Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: drm_memory.c,v 1.13 2018/08/27 15:32:06 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: drm_memory.c,v 1.14 2021/12/19 09:52:00 riastradh Exp $");
#if defined(__i386__) || defined(__x86_64__)
@@ -71,8 +71,10 @@ __KERNEL_RCSID(0, "$NetBSD: drm_memory.c
#include <dev/wsfb/genfbvar.h>
#endif
-#include <drm/drmP.h>
+#include <drm/drm_drv.h>
#include <drm/drm_legacy.h>
+#include <drm/drm_pci.h>
+#include <drm/drmP.h>
/*
* XXX drm_bus_borrow is a horrible kludge!
Index: src/sys/external/bsd/drm2/drm/drm_lock.c
diff -u src/sys/external/bsd/drm2/drm/drm_lock.c:1.11 src/sys/external/bsd/drm2/drm/drm_lock.c:1.12
--- src/sys/external/bsd/drm2/drm/drm_lock.c:1.11 Sun Dec 19 09:49:24 2021
+++ src/sys/external/bsd/drm2/drm/drm_lock.c Sun Dec 19 09:52:00 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: drm_lock.c,v 1.11 2021/12/19 09:49:24 riastradh Exp $ */
+/* $NetBSD: drm_lock.c,v 1.12 2021/12/19 09:52:00 riastradh Exp $ */
/*-
* Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -46,15 +46,14 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: drm_lock.c,v 1.11 2021/12/19 09:49:24 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: drm_lock.c,v 1.12 2021/12/19 09:52:00 riastradh Exp $");
#include <sys/types.h>
#include <sys/errno.h>
#include <sys/file.h>
#include <sys/systm.h>
-#include <drm/drmP.h>
-
+#include <drm/drm_print.h>
#include "../dist/drm/drm_internal.h"
#include "../dist/drm/drm_legacy.h"
