[src/trunk]: src/sys/external/bsd/drm2 drm_os_netbsd.h is no more

[riastradh <riastradh%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/aa164be39bef
branches:  trunk
changeset: 1028353:aa164be39bef
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Sun Dec 19 10:47:29 2021 +0000

description:
drm_os_netbsd.h is no more

diffstat:

 sys/external/bsd/drm2/dist/drm/drm_mode_config.c         |  7 ++-----
 sys/external/bsd/drm2/dist/drm/nouveau/include/nvif/os.h |  5 +++--
 sys/external/bsd/drm2/dist/drm/ttm/ttm_bo_util.c         |  5 ++---
 sys/external/bsd/drm2/dist/include/drm/drm_cache.h       |  5 +----
 sys/external/bsd/drm2/dist/include/drm/drm_pci.h         |  3 +--
 5 files changed, 9 insertions(+), 16 deletions(-)

diffs (106 lines):

diff -r 0162c3dadd2a -r aa164be39bef sys/external/bsd/drm2/dist/drm/drm_mode_config.c
--- a/sys/external/bsd/drm2/dist/drm/drm_mode_config.c  Sun Dec 19 10:47:19 2021 +0000
+++ b/sys/external/bsd/drm2/dist/drm/drm_mode_config.c  Sun Dec 19 10:47:29 2021 +0000
@@ -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 @@
 #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"
diff -r 0162c3dadd2a -r aa164be39bef sys/external/bsd/drm2/dist/drm/nouveau/include/nvif/os.h
--- a/sys/external/bsd/drm2/dist/drm/nouveau/include/nvif/os.h  Sun Dec 19 10:47:19 2021 +0000
+++ b/sys/external/bsd/drm2/dist/drm/nouveau/include/nvif/os.h  Sun Dec 19 10:47:29 2021 +0000
@@ -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
diff -r 0162c3dadd2a -r aa164be39bef sys/external/bsd/drm2/dist/drm/ttm/ttm_bo_util.c
--- a/sys/external/bsd/drm2/dist/drm/ttm/ttm_bo_util.c  Sun Dec 19 10:47:19 2021 +0000
+++ b/sys/external/bsd/drm2/dist/drm/ttm/ttm_bo_util.c  Sun Dec 19 10:47:29 2021 +0000
@@ -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>
diff -r 0162c3dadd2a -r aa164be39bef sys/external/bsd/drm2/dist/include/drm/drm_cache.h
--- a/sys/external/bsd/drm2/dist/include/drm/drm_cache.h        Sun Dec 19 10:47:19 2021 +0000
+++ b/sys/external/bsd/drm2/dist/include/drm/drm_cache.h        Sun Dec 19 10:47:29 2021 +0000
@@ -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;
diff -r 0162c3dadd2a -r aa164be39bef sys/external/bsd/drm2/dist/include/drm/drm_pci.h
--- a/sys/external/bsd/drm2/dist/include/drm/drm_pci.h  Sun Dec 19 10:47:19 2021 +0000
+++ b/sys/external/bsd/drm2/dist/include/drm/drm_pci.h  Sun Dec 19 10:47:29 2021 +0000
@@ -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;