Module Name: src
Committed By: riastradh
Date: Sun Dec 19 10:29:16 UTC 2021
Modified Files:
src/sys/external/bsd/drm2/dist/include/drm: drm_device.h
src/sys/external/bsd/drm2/include/drm: drm_gem_cma_helper.h
drm_os_netbsd.h
Log Message:
Fix up includes of <sys/vmem.h>.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 \
src/sys/external/bsd/drm2/dist/include/drm/drm_device.h
cvs rdiff -u -r1.1 -r1.2 \
src/sys/external/bsd/drm2/include/drm/drm_gem_cma_helper.h
cvs rdiff -u -r1.18 -r1.19 \
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/include/drm/drm_device.h
diff -u src/sys/external/bsd/drm2/dist/include/drm/drm_device.h:1.6 src/sys/external/bsd/drm2/dist/include/drm/drm_device.h:1.7
--- src/sys/external/bsd/drm2/dist/include/drm/drm_device.h:1.6 Sun Dec 19 10:29:01 2021
+++ src/sys/external/bsd/drm2/dist/include/drm/drm_device.h Sun Dec 19 10:29:16 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: drm_device.h,v 1.6 2021/12/19 10:29:01 riastradh Exp $ */
+/* $NetBSD: drm_device.h,v 1.7 2021/12/19 10:29:16 riastradh Exp $ */
#ifndef _DRM_DEVICE_H_
#define _DRM_DEVICE_H_
@@ -29,6 +29,7 @@ struct drm_fb_helper;
struct pci_dev;
struct pci_controller;
+typedef struct vmem vmem_t;
/**
* enum drm_switch_power - power state of drm device
Index: src/sys/external/bsd/drm2/include/drm/drm_gem_cma_helper.h
diff -u src/sys/external/bsd/drm2/include/drm/drm_gem_cma_helper.h:1.1 src/sys/external/bsd/drm2/include/drm/drm_gem_cma_helper.h:1.2
--- src/sys/external/bsd/drm2/include/drm/drm_gem_cma_helper.h:1.1 Sun Dec 19 10:24:33 2021
+++ src/sys/external/bsd/drm2/include/drm/drm_gem_cma_helper.h Sun Dec 19 10:29:16 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: drm_gem_cma_helper.h,v 1.1 2021/12/19 10:24:33 riastradh Exp $ */
+/* $NetBSD: drm_gem_cma_helper.h,v 1.2 2021/12/19 10:29:16 riastradh Exp $ */
/* SPDX-License-Identifier: GPL-2.0 */
#ifndef __DRM_GEM_CMA_HELPER_H__
@@ -8,6 +8,8 @@
#include <drm/drm_ioctl.h>
#include <drm/drm_gem.h>
+#include <sys/vmem.h>
+
struct drm_mode_create_dumb;
/**
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.18 src/sys/external/bsd/drm2/include/drm/drm_os_netbsd.h:1.19
--- src/sys/external/bsd/drm2/include/drm/drm_os_netbsd.h:1.18 Sun Dec 19 09:48:22 2021
+++ src/sys/external/bsd/drm2/include/drm/drm_os_netbsd.h Sun Dec 19 10:29:16 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: drm_os_netbsd.h,v 1.18 2021/12/19 09:48:22 riastradh Exp $ */
+/* $NetBSD: drm_os_netbsd.h,v 1.19 2021/12/19 10:29:16 riastradh Exp $ */
/*-
* Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -81,6 +81,4 @@
#include <drm/drm_irq_netbsd.h>
#include <drm/drm_wait_netbsd.h>
-#include <sys/vmem.h>
-
#endif /* _DRM_DRM_OS_NETBSD_H_ */
