[src/trunk]: src/sys/external/bsd/drm2/include/drm Empty out drm_os_netbsd.h.

To: source-changes-hg%NetBSD.org@localhost
Subject: [src/trunk]: src/sys/external/bsd/drm2/include/drm Empty out drm_os_netbsd.h.
From: riastradh <riastradh%NetBSD.org@localhost>
Date: Sun, 19 Dec 2021 22:49:49 +0000
details:   https://anonhg.NetBSD.org/src/rev/5e0fa2deb1c6
branches:  trunk
changeset: 1028302:5e0fa2deb1c6
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Sun Dec 19 10:32:47 2021 +0000

description:
Empty out drm_os_netbsd.h.

diffstat:

 sys/external/bsd/drm2/dist/drm/i915/i915_drv.c    |  15 +++-
 sys/external/bsd/drm2/dist/include/drm/drm_irq.h  |   6 +-
 sys/external/bsd/drm2/dist/include/drm/drm_util.h |   6 +-
 sys/external/bsd/drm2/drm/files.drmkms            |  20 ++++-
 sys/external/bsd/drm2/include/drm/drmP.h          |   3 +-
 sys/external/bsd/drm2/include/drm/drm_os_netbsd.h |  84 -----------------------
 6 files changed, 40 insertions(+), 94 deletions(-)

diffs (229 lines):

diff -r 42491577395a -r 5e0fa2deb1c6 sys/external/bsd/drm2/dist/drm/i915/i915_drv.c
--- a/sys/external/bsd/drm2/dist/drm/i915/i915_drv.c    Sun Dec 19 10:29:16 2021 +0000
+++ b/sys/external/bsd/drm2/dist/drm/i915/i915_drv.c    Sun Dec 19 10:32:47 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: i915_drv.c,v 1.25 2021/12/19 10:28:31 riastradh Exp $  */
+/*     $NetBSD: i915_drv.c,v 1.26 2021/12/19 10:32:47 riastradh Exp $  */
 
 /* i915_drv.c -- i830,i845,i855,i865,i915 driver -*- linux-c -*-
  */
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: i915_drv.c,v 1.25 2021/12/19 10:28:31 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: i915_drv.c,v 1.26 2021/12/19 10:32:47 riastradh Exp $");
 
 #include <linux/acpi.h>
 #include <linux/device.h>
@@ -87,6 +87,17 @@
 #include "intel_memory_region.h"
 #include "intel_pm.h"
 
+#ifdef __NetBSD__
+#ifdef notyet
+#if defined(__i386__)
+#include "pnpbios.h"
+#endif
+#if NPNPBIOS > 0
+#define CONFIG_PNP
+#endif
+#endif
+#endif
+
 static struct drm_driver driver;
 
 #ifdef __NetBSD__
diff -r 42491577395a -r 5e0fa2deb1c6 sys/external/bsd/drm2/dist/include/drm/drm_irq.h
--- a/sys/external/bsd/drm2/dist/include/drm/drm_irq.h  Sun Dec 19 10:29:16 2021 +0000
+++ b/sys/external/bsd/drm2/dist/include/drm/drm_irq.h  Sun Dec 19 10:32:47 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: drm_irq.h,v 1.3 2021/12/19 09:49:01 riastradh Exp $    */
+/*     $NetBSD: drm_irq.h,v 1.4 2021/12/19 10:32:47 riastradh Exp $    */
 
 /*
  * Copyright 2016 Intel Corp.
@@ -26,6 +26,10 @@
 #ifndef _DRM_IRQ_H_
 #define _DRM_IRQ_H_
 
+#ifdef __NetBSD__
+#include <drm/drm_irq_netbsd.h>
+#endif
+
 struct drm_device;
 
 #ifdef __NetBSD__
diff -r 42491577395a -r 5e0fa2deb1c6 sys/external/bsd/drm2/dist/include/drm/drm_util.h
--- a/sys/external/bsd/drm2/dist/include/drm/drm_util.h Sun Dec 19 10:29:16 2021 +0000
+++ b/sys/external/bsd/drm2/dist/include/drm/drm_util.h Sun Dec 19 10:32:47 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: drm_util.h,v 1.3 2021/12/19 01:56:00 riastradh Exp $   */
+/*     $NetBSD: drm_util.h,v 1.4 2021/12/19 10:32:47 riastradh Exp $   */
 
 /*
  * Internal Header for the Direct Rendering Manager
@@ -39,6 +39,10 @@
 #include <linux/preempt.h>
 #include <linux/smp.h>
 
+#ifdef __NetBSD__
+#include <drm/drm_wait_netbsd.h>
+#endif
+
 /*
  * Use EXPORT_SYMBOL_FOR_TESTS_ONLY() for functions that shall
  * only be visible for drmselftests.
diff -r 42491577395a -r 5e0fa2deb1c6 sys/external/bsd/drm2/drm/files.drmkms
--- a/sys/external/bsd/drm2/drm/files.drmkms    Sun Dec 19 10:29:16 2021 +0000
+++ b/sys/external/bsd/drm2/drm/files.drmkms    Sun Dec 19 10:32:47 2021 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: files.drmkms,v 1.56 2021/12/19 10:21:18 riastradh Exp $
+#      $NetBSD: files.drmkms,v 1.57 2021/12/19 10:32:47 riastradh Exp $
 
 version        20180827
 
@@ -12,8 +12,6 @@
 
 define drmkms: drmkms_linux, drmkms_i2c, linux
 
-defflag                opt_drmkms.h    DRMKMS_DEBUG
-
 # This code comes from the Linux kernel, which assumes signed
 # overflow is OK.
 makeoptions    drmkms  "COPTS.drmkms"+="-fwrapv"
@@ -29,14 +27,28 @@
 makeoptions    drmkms  CPPFLAGS+="-I$S/external/bsd/drm2/dist/include/drm"
 makeoptions    drmkms  CPPFLAGS+="-I$S/external/bsd/drm2/dist/include/uapi"
 
-# XXX Should probably be in a header file.  opt_drmkms.h?
 makeoptions    drmkms  CPPFLAGS+="-D__KERNEL__"
 
+ifdef i386
+makeoptions    drmkms  CPPFLAGS+="-DCONFIG_X86"
+makeoptions    drmkms  CPPFLAGS+="-DCONFIG_X86_PAT"
+elifdef amd64
+makeoptions    drmkms  CPPFLAGS+="-DCONFIG_X86"
+makeoptions    drmkms  CPPFLAGS+="-DCONFIG_X86_64"
+makeoptions    drmkms  CPPFLAGS+="-DCONFIG_X86_PAT"
+elifdef arm
+makeoptions    drmkms  CPPFLAGS+="-DCONFIG_ARM"
+elifdef aarch64
+makeoptions    drmkms  CPPFLAGS+="-DCONFIG_AARCH64"
+endif
+
 makeoptions    drmkms  CPPFLAGS+="-DCONFIG_BACKLIGHT_CLASS_DEVICE=0"
 makeoptions    drmkms  CPPFLAGS+="-DCONFIG_BACKLIGHT_CLASS_DEVICE_MODULE=0"
 makeoptions    drmkms  CPPFLAGS+="-DCONFIG_DRM_FBDEV_EMULATION=1"
 makeoptions    drmkms  CPPFLAGS+="-DCONFIG_DRM_FBDEV_OVERALLOC=100"
 makeoptions    drmkms  CPPFLAGS+="-DCONFIG_FB=0"
+makeoptions    drmkms  CPPFLAGS+="-DCONFIG_LOCKDEP=0"
+makeoptions    drmkms  CPPFLAGS+="-DCONFIG_PCI=1"
 
 makeoptions    drmkms  "CWARNFLAGS.drmkms"+="-Wno-missing-field-initializers"
 
diff -r 42491577395a -r 5e0fa2deb1c6 sys/external/bsd/drm2/include/drm/drmP.h
--- a/sys/external/bsd/drm2/include/drm/drmP.h  Sun Dec 19 10:29:16 2021 +0000
+++ b/sys/external/bsd/drm2/include/drm/drmP.h  Sun Dec 19 10:32:47 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: drmP.h,v 1.3 2021/12/19 10:29:01 riastradh Exp $       */
+/*     $NetBSD: drmP.h,v 1.4 2021/12/19 10:32:47 riastradh Exp $       */
 
 /*
  * Internal Header for the Direct Rendering Manager
@@ -67,7 +67,6 @@
 #include <uapi/drm/drm_mode.h>
 
 #ifdef __NetBSD__
-#include <drm/drm_os_netbsd.h>
 #include <asm/barrier.h>
 #include <asm/bug.h>
 #include <linux/atomic.h>
diff -r 42491577395a -r 5e0fa2deb1c6 sys/external/bsd/drm2/include/drm/drm_os_netbsd.h
--- a/sys/external/bsd/drm2/include/drm/drm_os_netbsd.h Sun Dec 19 10:29:16 2021 +0000
+++ b/sys/external/bsd/drm2/include/drm/drm_os_netbsd.h Sun Dec 19 10:32:47 2021 +0000
@@ -1,84 +0,0 @@
-/*     $NetBSD: drm_os_netbsd.h,v 1.19 2021/12/19 10:29:16 riastradh Exp $     */
-
-/*-
- * Copyright (c) 2013 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Taylor R. Campbell.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef _DRM_DRM_OS_NETBSD_H_
-#define _DRM_DRM_OS_NETBSD_H_
-
-#if defined(_KERNEL_OPT)
-#include "opt_drmkms.h"
-#endif
-
-#if defined(__i386__) || defined(__x86_64__)
-#define        CONFIG_X86      1
-#define        CONFIG_X86_PAT  1
-#endif
-
-#if defined(__arm__)
-#define CONFIG_ARM     1
-#endif
-
-#if defined(__aarch64__)
-#define CONFIG_ARM64   1
-#endif
-
-/*
- * Nothing meaningfully depends on this; defining this avoids patching
- * away some conditionalization in drmP.h.
- */
-#define        CONFIG_PCI      1
-
-#define        CONFIG_LOCKDEP  0
-
-#ifdef notyet
-#if defined(__i386__)
-#include "pnpbios.h"
-#endif
-
-#if NPNPBIOS > 0
-#define CONFIG_PNP
-#endif
-#endif
-
-#if defined(__i386__) || defined(__x86_64__)
-#if defined(_KERNEL_OPT)
-#include "opt_mtrr.h"
-#endif
-#endif
-
-#ifdef MTRR
-#define        CONFIG_MTRR     1
-#endif
-
-#include <drm/drm_agp_netbsd.h>
-#include <drm/drm_irq_netbsd.h>
-#include <drm/drm_wait_netbsd.h>
-
-#endif  /* _DRM_DRM_OS_NETBSD_H_ */
Prev by Date: [src/trunk]: src/sys/external/bsd/drm2/include/drm Fix up includes of <sys/vm...
Next by Date: [src/trunk]: src/sys/external/bsd/drm2 Remove last users of drmP.h.
Previous by Thread: [src/trunk]: src/sys/external/bsd/drm2/include/drm Fix up includes of <sys/vm...
Next by Thread: [src/trunk]: src/sys/external/bsd/drm2 Remove last users of drmP.h.
Indexes:
Home | Main Index | Thread Index | Old Index