Module Name: src
Committed By: riastradh
Date: Sun Dec 19 10:47:30 UTC 2021
Modified Files:
src/sys/external/bsd/drm2/dist/drm: drm_mode_config.c
src/sys/external/bsd/drm2/dist/drm/nouveau/include/nvif: os.h
src/sys/external/bsd/drm2/dist/drm/ttm: ttm_bo_util.c
src/sys/external/bsd/drm2/dist/include/drm: drm_cache.h drm_pci.h
Removed Files:
src/sys/external/bsd/drm2/include/drm: drm_os_netbsd.h
Log Message:
drm_os_netbsd.h is no more
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/external/bsd/drm2/dist/drm/drm_mode_config.c
cvs rdiff -u -r1.7 -r1.8 \
src/sys/external/bsd/drm2/dist/drm/nouveau/include/nvif/os.h
cvs rdiff -u -r1.24 -r1.25 \
src/sys/external/bsd/drm2/dist/drm/ttm/ttm_bo_util.c
cvs rdiff -u -r1.7 -r1.8 \
src/sys/external/bsd/drm2/dist/include/drm/drm_cache.h
cvs rdiff -u -r1.4 -r1.5 src/sys/external/bsd/drm2/dist/include/drm/drm_pci.h
cvs rdiff -u -r1.20 -r0 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.3 src/sys/external/bsd/drm2/dist/drm/drm_mode_config.c:1.4
--- src/sys/external/bsd/drm2/dist/drm/drm_mode_config.c:1.3 Sun Dec 19 09:48:22 2021
+++ src/sys/external/bsd/drm2/dist/drm/drm_mode_config.c Sun Dec 19 10:47:29 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: drm_mode_config.c,v 1.3 2021/12/19 09:48:22 riastradh Exp $ */
+/* $NetBSD: drm_mode_config.c,v 1.4 2021/12/19 10:47:29 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.3 2021/12/19 09:48:22 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: drm_mode_config.c,v 1.4 2021/12/19 10:47:29 riastradh Exp $");
#include <linux/uaccess.h>
@@ -32,9 +32,6 @@ __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"
Index: src/sys/external/bsd/drm2/dist/drm/nouveau/include/nvif/os.h
diff -u src/sys/external/bsd/drm2/dist/drm/nouveau/include/nvif/os.h:1.7 src/sys/external/bsd/drm2/dist/drm/nouveau/include/nvif/os.h:1.8
--- src/sys/external/bsd/drm2/dist/drm/nouveau/include/nvif/os.h:1.7 Sun Dec 19 00:47:24 2021
+++ src/sys/external/bsd/drm2/dist/drm/nouveau/include/nvif/os.h Sun Dec 19 10:47:30 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: os.h,v 1.7 2021/12/19 00:47:24 riastradh Exp $ */
+/* $NetBSD: os.h,v 1.8 2021/12/19 10:47:30 riastradh Exp $ */
/* SPDX-License-Identifier: MIT */
#ifndef __NOUVEAU_OS_H__
@@ -55,7 +55,8 @@
#include <soc/tegra/pmc.h>
#ifdef __NetBSD__
-#include <drm/drm_os_netbsd.h> /* drm_waitqueue_t, IRQ_HANDLED */
+#include <drm/drm_irq_netbsd.h>
+#include <drm/drm_wait_netbsd.h>
#endif
#endif
Index: src/sys/external/bsd/drm2/dist/drm/ttm/ttm_bo_util.c
diff -u src/sys/external/bsd/drm2/dist/drm/ttm/ttm_bo_util.c:1.24 src/sys/external/bsd/drm2/dist/drm/ttm/ttm_bo_util.c:1.25
--- src/sys/external/bsd/drm2/dist/drm/ttm/ttm_bo_util.c:1.24 Sun Dec 19 09:57:51 2021
+++ src/sys/external/bsd/drm2/dist/drm/ttm/ttm_bo_util.c Sun Dec 19 10:47:30 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: ttm_bo_util.c,v 1.24 2021/12/19 09:57:51 riastradh Exp $ */
+/* $NetBSD: ttm_bo_util.c,v 1.25 2021/12/19 10:47:30 riastradh Exp $ */
/* SPDX-License-Identifier: GPL-2.0 OR MIT */
/**************************************************************************
@@ -32,12 +32,11 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ttm_bo_util.c,v 1.24 2021/12/19 09:57:51 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ttm_bo_util.c,v 1.25 2021/12/19 10:47:30 riastradh Exp $");
#include <drm/ttm/ttm_bo_driver.h>
#include <drm/ttm/ttm_placement.h>
#include <drm/drm_vma_manager.h>
-#include <drm/drm_os_netbsd.h>
#include <linux/io.h>
#include <linux/highmem.h>
#include <linux/wait.h>
Index: src/sys/external/bsd/drm2/dist/include/drm/drm_cache.h
diff -u src/sys/external/bsd/drm2/dist/include/drm/drm_cache.h:1.7 src/sys/external/bsd/drm2/dist/include/drm/drm_cache.h:1.8
--- src/sys/external/bsd/drm2/dist/include/drm/drm_cache.h:1.7 Sun Dec 19 01:49:44 2021
+++ src/sys/external/bsd/drm2/dist/include/drm/drm_cache.h Sun Dec 19 10:47:30 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: drm_cache.h,v 1.7 2021/12/19 01:49:44 riastradh Exp $ */
+/* $NetBSD: drm_cache.h,v 1.8 2021/12/19 10:47:30 riastradh Exp $ */
/**************************************************************************
*
@@ -35,9 +35,6 @@
#ifndef _DRM_CACHE_H_
#define _DRM_CACHE_H_
-#ifdef __NetBSD__
-#include <drm/drm_os_netbsd.h>
-#endif
#include <linux/scatterlist.h>
struct page;
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.4 src/sys/external/bsd/drm2/dist/include/drm/drm_pci.h:1.5
--- src/sys/external/bsd/drm2/dist/include/drm/drm_pci.h:1.4 Sun Dec 19 09:54:38 2021
+++ src/sys/external/bsd/drm2/dist/include/drm/drm_pci.h Sun Dec 19 10:47:30 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: drm_pci.h,v 1.4 2021/12/19 09:54:38 riastradh Exp $ */
+/* $NetBSD: drm_pci.h,v 1.5 2021/12/19 10:47:30 riastradh Exp $ */
/*
* Internal Header for the Direct Rendering Manager
@@ -35,7 +35,6 @@
#define _DRM_PCI_H_
#include <linux/pci.h>
-#include <drm/drm_os_netbsd.h>
struct drm_dma_handle;
struct drm_device;
