summaryrefslogtreecommitdiff
path: root/sys/external
diff options
context:
space:
mode:
authormaya <maya@NetBSD.org>2020-02-14 14:34:57 +0000
committermaya <maya@NetBSD.org>2020-02-14 14:34:57 +0000
commit1b0774804d8a445a122b0d4293d2cbe95e7cf151 (patch)
tree8d9ae447283dc331819f4aa334c35b1f4702613d /sys/external
parent084f788a2f6609b1b9d7b2dbbbcd66b9dbc6bf1e (diff)
Reduce diffs by side-loading some header files like Linux.
From riastradh
Diffstat (limited to 'sys/external')
-rw-r--r--sys/external/bsd/common/include/linux/kernel.h7
-rw-r--r--sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_atom.c5
-rw-r--r--sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_atombios.c5
-rw-r--r--sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_atombios_crtc.c5
-rw-r--r--sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_atombios_dp.c5
-rw-r--r--sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_atombios_encoders.c5
-rw-r--r--sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_atombios_i2c.c5
-rw-r--r--sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_cgs.c5
-rw-r--r--sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_ci_dpm.c6
-rw-r--r--sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_ci_smc.c5
-rw-r--r--sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_cik_ih.c6
-rw-r--r--sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_cik_sdma.c7
-rw-r--r--sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_cz_dpm.c5
-rw-r--r--sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_cz_ih.c6
-rw-r--r--sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_cz_smc.c5
-rw-r--r--sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_dpm.c5
-rw-r--r--sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_fence.c5
-rw-r--r--sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_fiji_dpm.c5
-rw-r--r--sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_fiji_smc.c5
-rw-r--r--sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_gfx_v7_0.c7
-rw-r--r--sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_gfx_v8_0.c7
-rw-r--r--sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_gmc_v7_0.c6
-rw-r--r--sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_gmc_v8_0.c6
-rw-r--r--sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_i2c.c5
-rw-r--r--sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_iceland_dpm.c5
-rw-r--r--sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_iceland_ih.c7
-rw-r--r--sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_iceland_smc.c5
-rw-r--r--sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_ih.c5
-rw-r--r--sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_kv_dpm.c5
-rw-r--r--sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_object.h3
-rw-r--r--sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_ring.c6
-rw-r--r--sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_sdma_v2_4.c7
-rw-r--r--sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_sdma_v3_0.c7
-rw-r--r--sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_tonga_dpm.c5
-rw-r--r--sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_tonga_ih.c6
-rw-r--r--sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_tonga_smc.c5
-rw-r--r--sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_ucode.c5
-rw-r--r--sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_uvd.c5
-rw-r--r--sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_uvd_v4_2.c5
-rw-r--r--sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_uvd_v5_0.c5
-rw-r--r--sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_uvd_v6_0.c5
-rw-r--r--sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_vce.c5
-rw-r--r--sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_vce_v3_0.c5
-rw-r--r--sys/external/bsd/drm2/dist/drm/drm_agpsupport.c6
-rw-r--r--sys/external/bsd/drm2/dist/drm/drm_atomic.c6
-rw-r--r--sys/external/bsd/drm2/dist/drm/drm_atomic_helper.c5
-rw-r--r--sys/external/bsd/drm2/dist/drm/drm_bufs.c8
-rw-r--r--sys/external/bsd/drm2/dist/drm/drm_context.c6
-rw-r--r--sys/external/bsd/drm2/dist/drm/drm_crtc.c8
-rw-r--r--sys/external/bsd/drm2/dist/drm/drm_crtc_helper.c7
-rw-r--r--sys/external/bsd/drm2/dist/drm/drm_dp_helper.c7
-rw-r--r--sys/external/bsd/drm2/dist/drm/drm_dp_mst_topology.c7
-rw-r--r--sys/external/bsd/drm2/dist/drm/drm_drv.c7
-rw-r--r--sys/external/bsd/drm2/dist/drm/drm_edid.c11
-rw-r--r--sys/external/bsd/drm2/dist/drm/drm_fb_helper.c10
-rw-r--r--sys/external/bsd/drm2/dist/drm/drm_flip_work.c6
-rw-r--r--sys/external/bsd/drm2/dist/drm/drm_gem.c7
-rw-r--r--sys/external/bsd/drm2/dist/drm/drm_global.c6
-rw-r--r--sys/external/bsd/drm2/dist/drm/drm_irq.c14
-rw-r--r--sys/external/bsd/drm2/dist/drm/drm_mm.c7
-rw-r--r--sys/external/bsd/drm2/dist/drm/drm_modeset_lock.c6
-rw-r--r--sys/external/bsd/drm2/dist/drm/drm_plane_helper.c5
-rw-r--r--sys/external/bsd/drm2/dist/drm/drm_probe_helper.c5
-rw-r--r--sys/external/bsd/drm2/dist/drm/i915/i915_cmd_parser.c5
-rw-r--r--sys/external/bsd/drm2/dist/drm/i915/i915_drv.c6
-rw-r--r--sys/external/bsd/drm2/dist/drm/i915/i915_gem.c10
-rw-r--r--sys/external/bsd/drm2/dist/drm/i915/i915_gem_context.c5
-rw-r--r--sys/external/bsd/drm2/dist/drm/i915/i915_gem_execbuffer.c6
-rw-r--r--sys/external/bsd/drm2/dist/drm/i915/i915_gem_gtt.c5
-rw-r--r--sys/external/bsd/drm2/dist/drm/i915/i915_gem_stolen.c6
-rw-r--r--sys/external/bsd/drm2/dist/drm/i915/i915_gpu_error.c6
-rw-r--r--sys/external/bsd/drm2/dist/drm/i915/i915_irq.c10
-rw-r--r--sys/external/bsd/drm2/dist/drm/i915/i915_params.c6
-rw-r--r--sys/external/bsd/drm2/dist/drm/i915/intel_csr.c5
-rw-r--r--sys/external/bsd/drm2/dist/drm/i915/intel_display.c10
-rw-r--r--sys/external/bsd/drm2/dist/drm/i915/intel_dp.c9
-rw-r--r--sys/external/bsd/drm2/dist/drm/i915/intel_drv.h4
-rw-r--r--sys/external/bsd/drm2/dist/drm/i915/intel_fbdev.c5
-rw-r--r--sys/external/bsd/drm2/dist/drm/i915/intel_guc_loader.c5
-rw-r--r--sys/external/bsd/drm2/dist/drm/i915/intel_hdmi.c5
-rw-r--r--sys/external/bsd/drm2/dist/drm/i915/intel_i2c.c5
-rw-r--r--sys/external/bsd/drm2/dist/drm/i915/intel_lvds.c6
-rw-r--r--sys/external/bsd/drm2/dist/drm/i915/intel_opregion.c6
-rw-r--r--sys/external/bsd/drm2/dist/drm/i915/intel_overlay.c6
-rw-r--r--sys/external/bsd/drm2/dist/drm/i915/intel_panel.c7
-rw-r--r--sys/external/bsd/drm2/dist/drm/i915/intel_pm.c9
-rw-r--r--sys/external/bsd/drm2/dist/drm/i915/intel_ringbuffer.c5
-rw-r--r--sys/external/bsd/drm2/dist/drm/i915/intel_ringbuffer.h3
-rw-r--r--sys/external/bsd/drm2/dist/drm/i915/intel_sdvo.c7
-rw-r--r--sys/external/bsd/drm2/dist/drm/i915/intel_uncore.c5
-rw-r--r--sys/external/bsd/drm2/dist/drm/nouveau/dispnv04/nouveau_dispnv04_disp.c6
-rw-r--r--sys/external/bsd/drm2/dist/drm/nouveau/dispnv04/nouveau_dispnv04_tvmodesnv17.c5
-rw-r--r--sys/external/bsd/drm2/dist/drm/nouveau/dispnv04/nouveau_dispnv04_tvnv04.c6
-rw-r--r--sys/external/bsd/drm2/dist/drm/nouveau/include/nvkm/core/device.h3
-rw-r--r--sys/external/bsd/drm2/dist/drm/nouveau/nouveau_bios.h4
-rw-r--r--sys/external/bsd/drm2/dist/drm/nouveau/nouveau_connector.c6
-rw-r--r--sys/external/bsd/drm2/dist/drm/nouveau/nouveau_display.c6
-rw-r--r--sys/external/bsd/drm2/dist/drm/nouveau/nouveau_fence.c5
-rw-r--r--sys/external/bsd/drm2/dist/drm/nouveau/nouveau_gem.c6
-rw-r--r--sys/external/bsd/drm2/dist/drm/nouveau/nouveau_nv50_display.c5
-rw-r--r--sys/external/bsd/drm2/dist/drm/nouveau/nvkm/engine/disp/nouveau_nvkm_engine_disp_gf119.c6
-rw-r--r--sys/external/bsd/drm2/dist/drm/nouveau/nvkm/engine/disp/nouveau_nvkm_engine_disp_nv50.c7
-rw-r--r--sys/external/bsd/drm2/dist/drm/nouveau/nvkm/engine/gr/nouveau_nvkm_engine_gr_gf100.c6
-rw-r--r--sys/external/bsd/drm2/dist/drm/radeon/radeon.h8
-rw-r--r--sys/external/bsd/drm2/dist/drm/radeon/radeon_bios.c5
-rw-r--r--sys/external/bsd/drm2/dist/drm/radeon/radeon_cik_sdma.c5
-rw-r--r--sys/external/bsd/drm2/dist/drm/radeon/radeon_device.c5
-rw-r--r--sys/external/bsd/drm2/dist/drm/radeon/radeon_display.c5
-rw-r--r--sys/external/bsd/drm2/dist/drm/radeon/radeon_drv.c5
-rw-r--r--sys/external/bsd/drm2/dist/drm/radeon/radeon_evergreen.c5
-rw-r--r--sys/external/bsd/drm2/dist/drm/radeon/radeon_i2c.c5
-rw-r--r--sys/external/bsd/drm2/dist/drm/radeon/radeon_r600.c5
-rw-r--r--sys/external/bsd/drm2/dist/drm/radeon/radeon_ring.c5
-rw-r--r--sys/external/bsd/drm2/dist/drm/radeon/radeon_si_dpm.c5
-rw-r--r--sys/external/bsd/drm2/dist/drm/ttm/ttm_bo.c7
-rw-r--r--sys/external/bsd/drm2/dist/drm/ttm/ttm_bo_manager.c5
-rw-r--r--sys/external/bsd/drm2/dist/drm/ttm/ttm_bo_util.c6
-rw-r--r--sys/external/bsd/drm2/dist/drm/ttm/ttm_execbuf_util.c5
-rw-r--r--sys/external/bsd/drm2/dist/drm/ttm/ttm_memory.c6
-rw-r--r--sys/external/bsd/drm2/dist/drm/ttm/ttm_tt.c5
-rw-r--r--sys/external/bsd/drm2/dist/drm/via/via_dma.c6
-rw-r--r--sys/external/bsd/drm2/dist/drm/via/via_dmablit.c5
-rw-r--r--sys/external/bsd/drm2/dist/include/drm/drmP.h22
-rw-r--r--sys/external/bsd/drm2/include/linux/atomic.h4
-rw-r--r--sys/external/bsd/drm2/include/linux/fs.h3
-rw-r--r--sys/external/bsd/drm2/include/linux/interrupt.h4
-rw-r--r--sys/external/bsd/drm2/include/linux/jiffies.h6
-rw-r--r--sys/external/bsd/drm2/include/linux/ktime.h3
-rw-r--r--sys/external/bsd/drm2/include/linux/mm_types.h4
-rw-r--r--sys/external/bsd/drm2/include/linux/mutex.h5
-rw-r--r--sys/external/bsd/drm2/include/linux/pci.h5
-rw-r--r--sys/external/bsd/drm2/include/linux/pm_qos.h4
-rw-r--r--sys/external/bsd/drm2/include/linux/pm_runtime.h4
133 files changed, 288 insertions, 495 deletions
diff --git a/sys/external/bsd/common/include/linux/kernel.h b/sys/external/bsd/common/include/linux/kernel.h
index 88ddcf01060..a58c50b936f 100644
--- a/sys/external/bsd/common/include/linux/kernel.h
+++ b/sys/external/bsd/common/include/linux/kernel.h
@@ -1,4 +1,4 @@
-/* $NetBSD: kernel.h,v 1.24 2020/02/14 04:38:36 riastradh Exp $ */
+/* $NetBSD: kernel.h,v 1.25 2020/02/14 14:34:57 maya Exp $ */
/*-
* Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -38,7 +38,12 @@
#include <sys/systm.h>
#include <lib/libkern/libkern.h>
+
+#include <asm/byteorder.h>
+#include <asm/div64.h>
+
#include <linux/bitops.h>
+#include <linux/log2.h>
#include <linux/printk.h>
#include <linux/slab.h>
diff --git a/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_atom.c b/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_atom.c
index ffae4d564bc..3cb530e1b8f 100644
--- a/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_atom.c
+++ b/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_atom.c
@@ -1,4 +1,4 @@
-/* $NetBSD: amdgpu_atom.c,v 1.2 2020/02/14 04:30:04 riastradh Exp $ */
+/* $NetBSD: amdgpu_atom.c,v 1.3 2020/02/14 14:34:57 maya Exp $ */
/*
* Copyright 2008 Advanced Micro Devices, Inc.
@@ -25,13 +25,12 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: amdgpu_atom.c,v 1.2 2020/02/14 04:30:04 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: amdgpu_atom.c,v 1.3 2020/02/14 14:34:57 maya Exp $");
#include <linux/module.h>
#include <linux/sched.h>
#include <linux/slab.h>
#include <asm/unaligned.h>
-#include <asm/byteorder.h>
#define ATOM_DEBUG
diff --git a/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_atombios.c b/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_atombios.c
index c482cf45d88..d0b9e37d31c 100644
--- a/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_atombios.c
+++ b/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_atombios.c
@@ -1,4 +1,4 @@
-/* $NetBSD: amdgpu_atombios.c,v 1.4 2020/02/14 04:30:04 riastradh Exp $ */
+/* $NetBSD: amdgpu_atombios.c,v 1.5 2020/02/14 14:34:57 maya Exp $ */
/*
* Copyright 2007-8 Advanced Micro Devices, Inc.
@@ -26,9 +26,8 @@
* Alex Deucher
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: amdgpu_atombios.c,v 1.4 2020/02/14 04:30:04 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: amdgpu_atombios.c,v 1.5 2020/02/14 14:34:57 maya Exp $");
-#include <asm/byteorder.h>
#include <drm/drmP.h>
#include <drm/amdgpu_drm.h>
#include "amdgpu.h"
diff --git a/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_atombios_crtc.c b/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_atombios_crtc.c
index c0adfa1b066..73dd1b994a6 100644
--- a/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_atombios_crtc.c
+++ b/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_atombios_crtc.c
@@ -1,4 +1,4 @@
-/* $NetBSD: amdgpu_atombios_crtc.c,v 1.1 2018/08/27 14:10:14 riastradh Exp $ */
+/* $NetBSD: amdgpu_atombios_crtc.c,v 1.2 2020/02/14 14:34:57 maya Exp $ */
/*
* Copyright 2007-8 Advanced Micro Devices, Inc.
@@ -26,13 +26,12 @@
* Alex Deucher
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: amdgpu_atombios_crtc.c,v 1.1 2018/08/27 14:10:14 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: amdgpu_atombios_crtc.c,v 1.2 2020/02/14 14:34:57 maya Exp $");
#include <drm/drmP.h>
#include <drm/drm_crtc_helper.h>
#include <drm/amdgpu_drm.h>
#include <drm/drm_fixed.h>
-#include <asm/byteorder.h>
#include "amdgpu.h"
#include "atom.h"
#include "atom-bits.h"
diff --git a/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_atombios_dp.c b/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_atombios_dp.c
index d046a7259e3..b89b893ac1c 100644
--- a/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_atombios_dp.c
+++ b/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_atombios_dp.c
@@ -1,4 +1,4 @@
-/* $NetBSD: amdgpu_atombios_dp.c,v 1.2 2019/01/01 08:07:47 maya Exp $ */
+/* $NetBSD: amdgpu_atombios_dp.c,v 1.3 2020/02/14 14:34:57 maya Exp $ */
/*
* Copyright 2007-8 Advanced Micro Devices, Inc.
@@ -27,11 +27,10 @@
* Jerome Glisse
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: amdgpu_atombios_dp.c,v 1.2 2019/01/01 08:07:47 maya Exp $");
+__KERNEL_RCSID(0, "$NetBSD: amdgpu_atombios_dp.c,v 1.3 2020/02/14 14:34:57 maya Exp $");
#include <drm/drmP.h>
#include <drm/amdgpu_drm.h>
-#include <asm/byteorder.h>
#include "amdgpu.h"
#include "atom.h"
diff --git a/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_atombios_encoders.c b/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_atombios_encoders.c
index aa78f7b64ff..1f3e2048089 100644
--- a/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_atombios_encoders.c
+++ b/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_atombios_encoders.c
@@ -1,4 +1,4 @@
-/* $NetBSD: amdgpu_atombios_encoders.c,v 1.2 2020/02/14 04:30:04 riastradh Exp $ */
+/* $NetBSD: amdgpu_atombios_encoders.c,v 1.3 2020/02/14 14:34:57 maya Exp $ */
/*
* Copyright 2007-11 Advanced Micro Devices, Inc.
@@ -26,7 +26,7 @@
* Alex Deucher
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: amdgpu_atombios_encoders.c,v 1.2 2020/02/14 04:30:04 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: amdgpu_atombios_encoders.c,v 1.3 2020/02/14 14:34:57 maya Exp $");
#include <drm/drmP.h>
#include <drm/drm_crtc_helper.h>
@@ -37,7 +37,6 @@ __KERNEL_RCSID(0, "$NetBSD: amdgpu_atombios_encoders.c,v 1.2 2020/02/14 04:30:04
#include "atombios_encoders.h"
#include "atombios_dp.h"
#include <linux/backlight.h>
-#include <asm/byteorder.h>
#include "bif/bif_4_1_d.h"
static u8
diff --git a/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_atombios_i2c.c b/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_atombios_i2c.c
index e8dc6c4aa0f..1ab845c5db1 100644
--- a/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_atombios_i2c.c
+++ b/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_atombios_i2c.c
@@ -1,4 +1,4 @@
-/* $NetBSD: amdgpu_atombios_i2c.c,v 1.1 2018/08/27 14:10:14 riastradh Exp $ */
+/* $NetBSD: amdgpu_atombios_i2c.c,v 1.2 2020/02/14 14:34:57 maya Exp $ */
/*
* Copyright 2011 Advanced Micro Devices, Inc.
@@ -25,11 +25,10 @@
*
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: amdgpu_atombios_i2c.c,v 1.1 2018/08/27 14:10:14 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: amdgpu_atombios_i2c.c,v 1.2 2020/02/14 14:34:57 maya Exp $");
#include <drm/drmP.h>
#include <drm/amdgpu_drm.h>
-#include <asm/byteorder.h>
#include "amdgpu.h"
#include "atom.h"
#include "amdgpu_atombios.h"
diff --git a/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_cgs.c b/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_cgs.c
index 1dc4fc353a4..1715470d82f 100644
--- a/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_cgs.c
+++ b/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_cgs.c
@@ -1,4 +1,4 @@
-/* $NetBSD: amdgpu_cgs.c,v 1.4 2018/08/27 15:26:33 riastradh Exp $ */
+/* $NetBSD: amdgpu_cgs.c,v 1.5 2020/02/14 14:34:57 maya Exp $ */
/*
* Copyright 2015 Advanced Micro Devices, Inc.
@@ -24,9 +24,8 @@
*
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: amdgpu_cgs.c,v 1.4 2018/08/27 15:26:33 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: amdgpu_cgs.c,v 1.5 2020/02/14 14:34:57 maya Exp $");
-#include <asm/byteorder.h>
#include <linux/list.h>
#include <linux/slab.h>
#include <linux/pci.h>
diff --git a/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_ci_dpm.c b/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_ci_dpm.c
index 83b86cc5abe..84a2bce3386 100644
--- a/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_ci_dpm.c
+++ b/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_ci_dpm.c
@@ -1,4 +1,4 @@
-/* $NetBSD: amdgpu_ci_dpm.c,v 1.4 2020/02/14 04:30:04 riastradh Exp $ */
+/* $NetBSD: amdgpu_ci_dpm.c,v 1.5 2020/02/14 14:34:57 maya Exp $ */
/*
* Copyright 2013 Advanced Micro Devices, Inc.
@@ -24,11 +24,9 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: amdgpu_ci_dpm.c,v 1.4 2020/02/14 04:30:04 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: amdgpu_ci_dpm.c,v 1.5 2020/02/14 14:34:57 maya Exp $");
#include <linux/firmware.h>
-#include <linux/module.h>
-#include <asm/byteorder.h>
#include "drmP.h"
#include "amdgpu.h"
#include "amdgpu_pm.h"
diff --git a/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_ci_smc.c b/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_ci_smc.c
index 1b52806bf2c..1e8f1ab3b93 100644
--- a/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_ci_smc.c
+++ b/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_ci_smc.c
@@ -1,4 +1,4 @@
-/* $NetBSD: amdgpu_ci_smc.c,v 1.2 2018/08/27 14:24:03 riastradh Exp $ */
+/* $NetBSD: amdgpu_ci_smc.c,v 1.3 2020/02/14 14:34:57 maya Exp $ */
/*
* Copyright 2011 Advanced Micro Devices, Inc.
@@ -25,10 +25,9 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: amdgpu_ci_smc.c,v 1.2 2018/08/27 14:24:03 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: amdgpu_ci_smc.c,v 1.3 2020/02/14 14:34:57 maya Exp $");
#include <linux/firmware.h>
-#include <asm/byteorder.h>
#include "drmP.h"
#include "amdgpu.h"
#include "cikd.h"
diff --git a/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_cik_ih.c b/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_cik_ih.c
index 2c89101959a..36febb5e290 100644
--- a/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_cik_ih.c
+++ b/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_cik_ih.c
@@ -1,4 +1,4 @@
-/* $NetBSD: amdgpu_cik_ih.c,v 1.2 2018/08/27 14:24:03 riastradh Exp $ */
+/* $NetBSD: amdgpu_cik_ih.c,v 1.3 2020/02/14 14:34:57 maya Exp $ */
/*
* Copyright 2012 Advanced Micro Devices, Inc.
@@ -23,10 +23,8 @@
*
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: amdgpu_cik_ih.c,v 1.2 2018/08/27 14:24:03 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: amdgpu_cik_ih.c,v 1.3 2020/02/14 14:34:57 maya Exp $");
-#include <asm/byteorder.h>
-#include <linux/log2.h>
#include "drmP.h"
#include "amdgpu.h"
#include "amdgpu_ih.h"
diff --git a/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_cik_sdma.c b/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_cik_sdma.c
index f5d27441497..49f546f0024 100644
--- a/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_cik_sdma.c
+++ b/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_cik_sdma.c
@@ -1,4 +1,4 @@
-/* $NetBSD: amdgpu_cik_sdma.c,v 1.2 2018/08/27 14:24:03 riastradh Exp $ */
+/* $NetBSD: amdgpu_cik_sdma.c,v 1.3 2020/02/14 14:34:57 maya Exp $ */
/*
* Copyright 2013 Advanced Micro Devices, Inc.
@@ -24,12 +24,9 @@
* Authors: Alex Deucher
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: amdgpu_cik_sdma.c,v 1.2 2018/08/27 14:24:03 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: amdgpu_cik_sdma.c,v 1.3 2020/02/14 14:34:57 maya Exp $");
#include <linux/firmware.h>
-#include <linux/module.h>
-#include <linux/log2.h>
-#include <asm/byteorder.h>
#include <drm/drmP.h>
#include "amdgpu.h"
#include "amdgpu_ucode.h"
diff --git a/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_cz_dpm.c b/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_cz_dpm.c
index 33a76cf8a46..6fcb73349ef 100644
--- a/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_cz_dpm.c
+++ b/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_cz_dpm.c
@@ -1,4 +1,4 @@
-/* $NetBSD: amdgpu_cz_dpm.c,v 1.2 2020/02/14 04:30:04 riastradh Exp $ */
+/* $NetBSD: amdgpu_cz_dpm.c,v 1.3 2020/02/14 14:34:57 maya Exp $ */
/*
* Copyright 2014 Advanced Micro Devices, Inc.
@@ -24,11 +24,10 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: amdgpu_cz_dpm.c,v 1.2 2020/02/14 04:30:04 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: amdgpu_cz_dpm.c,v 1.3 2020/02/14 14:34:57 maya Exp $");
#include <linux/firmware.h>
#include <linux/seq_file.h>
-#include <asm/byteorder.h>
#include "drmP.h"
#include "amdgpu.h"
#include "amdgpu_pm.h"
diff --git a/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_cz_ih.c b/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_cz_ih.c
index 1f79eb4d165..f201ddd7b36 100644
--- a/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_cz_ih.c
+++ b/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_cz_ih.c
@@ -1,4 +1,4 @@
-/* $NetBSD: amdgpu_cz_ih.c,v 1.1 2018/08/27 14:10:14 riastradh Exp $ */
+/* $NetBSD: amdgpu_cz_ih.c,v 1.2 2020/02/14 14:34:57 maya Exp $ */
/*
* Copyright 2014 Advanced Micro Devices, Inc.
@@ -23,10 +23,8 @@
*
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: amdgpu_cz_ih.c,v 1.1 2018/08/27 14:10:14 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: amdgpu_cz_ih.c,v 1.2 2020/02/14 14:34:57 maya Exp $");
-#include <asm/byteorder.h>
-#include <linux/log2.h>
#include "drmP.h"
#include "amdgpu.h"
#include "amdgpu_ih.h"
diff --git a/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_cz_smc.c b/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_cz_smc.c
index 140a2c38eab..69ad79bd082 100644
--- a/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_cz_smc.c
+++ b/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_cz_smc.c
@@ -1,4 +1,4 @@
-/* $NetBSD: amdgpu_cz_smc.c,v 1.4 2020/02/14 04:35:19 riastradh Exp $ */
+/* $NetBSD: amdgpu_cz_smc.c,v 1.5 2020/02/14 14:34:57 maya Exp $ */
/*
* Copyright 2014 Advanced Micro Devices, Inc.
@@ -23,10 +23,9 @@
*
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: amdgpu_cz_smc.c,v 1.4 2020/02/14 04:35:19 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: amdgpu_cz_smc.c,v 1.5 2020/02/14 14:34:57 maya Exp $");
#include <linux/firmware.h>
-#include <asm/byteorder.h>
#include "drmP.h"
#include "amdgpu.h"
#include "smu8.h"
diff --git a/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_dpm.c b/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_dpm.c
index 3b6a4771469..a992b4f0c36 100644
--- a/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_dpm.c
+++ b/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_dpm.c
@@ -1,4 +1,4 @@
-/* $NetBSD: amdgpu_dpm.c,v 1.4 2020/02/14 04:30:04 riastradh Exp $ */
+/* $NetBSD: amdgpu_dpm.c,v 1.5 2020/02/14 14:34:57 maya Exp $ */
/*
* Copyright 2011 Advanced Micro Devices, Inc.
@@ -25,9 +25,8 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: amdgpu_dpm.c,v 1.4 2020/02/14 04:30:04 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: amdgpu_dpm.c,v 1.5 2020/02/14 14:34:57 maya Exp $");
-#include <asm/byteorder.h>
#include "drmP.h"
#include "amdgpu.h"
#include "amdgpu_atombios.h"
diff --git a/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_fence.c b/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_fence.c
index 50d3a8a9ce5..aa723bfc36e 100644
--- a/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_fence.c
+++ b/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_fence.c
@@ -1,4 +1,4 @@
-/* $NetBSD: amdgpu_fence.c,v 1.5 2020/02/14 04:35:19 riastradh Exp $ */
+/* $NetBSD: amdgpu_fence.c,v 1.6 2020/02/14 14:34:58 maya Exp $ */
/*
* Copyright 2009 Jerome Glisse.
@@ -31,9 +31,8 @@
* Dave Airlie
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: amdgpu_fence.c,v 1.5 2020/02/14 04:35:19 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: amdgpu_fence.c,v 1.6 2020/02/14 14:34:58 maya Exp $");
-#include <asm/byteorder.h>
#include <linux/seq_file.h>
#include <linux/atomic.h>
#include <linux/wait.h>
diff --git a/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_fiji_dpm.c b/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_fiji_dpm.c
index 2fe232e7402..12467cb04a9 100644
--- a/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_fiji_dpm.c
+++ b/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_fiji_dpm.c
@@ -1,4 +1,4 @@
-/* $NetBSD: amdgpu_fiji_dpm.c,v 1.1 2018/08/27 14:10:14 riastradh Exp $ */
+/* $NetBSD: amdgpu_fiji_dpm.c,v 1.2 2020/02/14 14:34:58 maya Exp $ */
/*
* Copyright 2014 Advanced Micro Devices, Inc.
@@ -24,10 +24,9 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: amdgpu_fiji_dpm.c,v 1.1 2018/08/27 14:10:14 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: amdgpu_fiji_dpm.c,v 1.2 2020/02/14 14:34:58 maya Exp $");
#include <linux/firmware.h>
-#include <linux/module.h>
#include "drmP.h"
#include "amdgpu.h"
#include "fiji_smumgr.h"
diff --git a/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_fiji_smc.c b/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_fiji_smc.c
index 6068a17b499..54b0dfa7816 100644
--- a/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_fiji_smc.c
+++ b/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_fiji_smc.c
@@ -1,4 +1,4 @@
-/* $NetBSD: amdgpu_fiji_smc.c,v 1.1 2018/08/27 14:10:14 riastradh Exp $ */
+/* $NetBSD: amdgpu_fiji_smc.c,v 1.2 2020/02/14 14:34:58 maya Exp $ */
/*
* Copyright 2014 Advanced Micro Devices, Inc.
@@ -24,10 +24,9 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: amdgpu_fiji_smc.c,v 1.1 2018/08/27 14:10:14 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: amdgpu_fiji_smc.c,v 1.2 2020/02/14 14:34:58 maya Exp $");
#include <linux/firmware.h>
-#include <asm/byteorder.h>
#include "drmP.h"
#include "amdgpu.h"
#include "fiji_ppsmc.h"
diff --git a/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_gfx_v7_0.c b/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_gfx_v7_0.c
index 2424f51947b..812299b4a01 100644
--- a/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_gfx_v7_0.c
+++ b/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_gfx_v7_0.c
@@ -1,4 +1,4 @@
-/* $NetBSD: amdgpu_gfx_v7_0.c,v 1.2 2018/08/27 14:24:03 riastradh Exp $ */
+/* $NetBSD: amdgpu_gfx_v7_0.c,v 1.3 2020/02/14 14:34:58 maya Exp $ */
/*
* Copyright 2014 Advanced Micro Devices, Inc.
@@ -23,12 +23,9 @@
*
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: amdgpu_gfx_v7_0.c,v 1.2 2018/08/27 14:24:03 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: amdgpu_gfx_v7_0.c,v 1.3 2020/02/14 14:34:58 maya Exp $");
#include <linux/firmware.h>
-#include <linux/module.h>
-#include <linux/log2.h>
-#include <asm/byteorder.h>
#include "drmP.h"
#include "amdgpu.h"
#include "amdgpu_ih.h"
diff --git a/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_gfx_v8_0.c b/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_gfx_v8_0.c
index 52de543b65d..2517698c651 100644
--- a/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_gfx_v8_0.c
+++ b/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_gfx_v8_0.c
@@ -1,4 +1,4 @@
-/* $NetBSD: amdgpu_gfx_v8_0.c,v 1.3 2020/02/14 04:35:19 riastradh Exp $ */
+/* $NetBSD: amdgpu_gfx_v8_0.c,v 1.4 2020/02/14 14:34:58 maya Exp $ */
/*
* Copyright 2014 Advanced Micro Devices, Inc.
@@ -23,12 +23,9 @@
*
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: amdgpu_gfx_v8_0.c,v 1.3 2020/02/14 04:35:19 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: amdgpu_gfx_v8_0.c,v 1.4 2020/02/14 14:34:58 maya Exp $");
#include <linux/firmware.h>
-#include <linux/module.h>
-#include <linux/log2.h>
-#include <asm/byteorder.h>
#include "drmP.h"
#include "amdgpu.h"
#include "amdgpu_gfx.h"
diff --git a/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_gmc_v7_0.c b/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_gmc_v7_0.c
index 48e6db5a5af..4b86766755a 100644
--- a/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_gmc_v7_0.c
+++ b/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_gmc_v7_0.c
@@ -1,4 +1,4 @@
-/* $NetBSD: amdgpu_gmc_v7_0.c,v 1.2 2020/02/14 04:30:04 riastradh Exp $ */
+/* $NetBSD: amdgpu_gmc_v7_0.c,v 1.3 2020/02/14 14:34:58 maya Exp $ */
/*
* Copyright 2014 Advanced Micro Devices, Inc.
@@ -23,11 +23,9 @@
*
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: amdgpu_gmc_v7_0.c,v 1.2 2020/02/14 04:30:04 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: amdgpu_gmc_v7_0.c,v 1.3 2020/02/14 14:34:58 maya Exp $");
#include <linux/firmware.h>
-#include <linux/module.h>
-#include <asm/byteorder.h>
#include "drmP.h"
#include "amdgpu.h"
#include "cikd.h"
diff --git a/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_gmc_v8_0.c b/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_gmc_v8_0.c
index 4f9f5081829..55d6d9bc256 100644
--- a/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_gmc_v8_0.c
+++ b/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_gmc_v8_0.c
@@ -1,4 +1,4 @@
-/* $NetBSD: amdgpu_gmc_v8_0.c,v 1.2 2020/02/14 04:30:04 riastradh Exp $ */
+/* $NetBSD: amdgpu_gmc_v8_0.c,v 1.3 2020/02/14 14:34:58 maya Exp $ */
/*
* Copyright 2014 Advanced Micro Devices, Inc.
@@ -23,11 +23,9 @@
*
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: amdgpu_gmc_v8_0.c,v 1.2 2020/02/14 04:30:04 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: amdgpu_gmc_v8_0.c,v 1.3 2020/02/14 14:34:58 maya Exp $");
#include <linux/firmware.h>
-#include <linux/module.h>
-#include <asm/byteorder.h>
#include "drmP.h"
#include "amdgpu.h"
#include "gmc_v8_0.h"
diff --git a/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_i2c.c b/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_i2c.c
index b1349afe110..d22ee976472 100644
--- a/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_i2c.c
+++ b/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_i2c.c
@@ -1,4 +1,4 @@
-/* $NetBSD: amdgpu_i2c.c,v 1.4 2020/02/14 04:35:19 riastradh Exp $ */
+/* $NetBSD: amdgpu_i2c.c,v 1.5 2020/02/14 14:34:58 maya Exp $ */
/*
* Copyright 2007-8 Advanced Micro Devices, Inc.
@@ -26,10 +26,9 @@
* Alex Deucher
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: amdgpu_i2c.c,v 1.4 2020/02/14 04:35:19 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: amdgpu_i2c.c,v 1.5 2020/02/14 14:34:58 maya Exp $");
#include <linux/export.h>
-#include <linux/module.h>
#include <drm/drmP.h>
#include <drm/drm_edid.h>
diff --git a/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_iceland_dpm.c b/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_iceland_dpm.c
index 3b26cac5c06..4d1be67573e 100644
--- a/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_iceland_dpm.c
+++ b/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_iceland_dpm.c
@@ -1,4 +1,4 @@
-/* $NetBSD: amdgpu_iceland_dpm.c,v 1.1 2018/08/27 14:10:14 riastradh Exp $ */
+/* $NetBSD: amdgpu_iceland_dpm.c,v 1.2 2020/02/14 14:34:58 maya Exp $ */
/*
* Copyright 2014 Advanced Micro Devices, Inc.
@@ -24,10 +24,9 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: amdgpu_iceland_dpm.c,v 1.1 2018/08/27 14:10:14 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: amdgpu_iceland_dpm.c,v 1.2 2020/02/14 14:34:58 maya Exp $");
#include <linux/firmware.h>
-#include <linux/module.h>
#include "drmP.h"
#include "amdgpu.h"
#include "iceland_smumgr.h"
diff --git a/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_iceland_ih.c b/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_iceland_ih.c
index e4c44cb8ab3..5d915403387 100644
--- a/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_iceland_ih.c
+++ b/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_iceland_ih.c
@@ -1,4 +1,4 @@
-/* $NetBSD: amdgpu_iceland_ih.c,v 1.1 2018/08/27 14:10:14 riastradh Exp $ */
+/* $NetBSD: amdgpu_iceland_ih.c,v 1.2 2020/02/14 14:34:58 maya Exp $ */
/*
* Copyright 2014 Advanced Micro Devices, Inc.
@@ -23,11 +23,8 @@
*
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: amdgpu_iceland_ih.c,v 1.1 2018/08/27 14:10:14 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: amdgpu_iceland_ih.c,v 1.2 2020/02/14 14:34:58 maya Exp $");
-#include <linux/module.h>
-#include <linux/log2.h>
-#include <asm/byteorder.h>
#include "drmP.h"
#include "amdgpu.h"
#include "amdgpu_ih.h"
diff --git a/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_iceland_smc.c b/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_iceland_smc.c
index 4a9f30043ab..df05a0ae790 100644
--- a/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_iceland_smc.c
+++ b/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_iceland_smc.c
@@ -1,4 +1,4 @@
-/* $NetBSD: amdgpu_iceland_smc.c,v 1.1 2018/08/27 14:10:14 riastradh Exp $ */
+/* $NetBSD: amdgpu_iceland_smc.c,v 1.2 2020/02/14 14:34:58 maya Exp $ */
/*
* Copyright 2014 Advanced Micro Devices, Inc.
@@ -24,10 +24,9 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: amdgpu_iceland_smc.c,v 1.1 2018/08/27 14:10:14 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: amdgpu_iceland_smc.c,v 1.2 2020/02/14 14:34:58 maya Exp $");
#include <linux/firmware.h>
-#include <asm/byteorder.h>
#include "drmP.h"
#include "amdgpu.h"
#include "ppsmc.h"
diff --git a/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_ih.c b/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_ih.c
index 8f02bdebd13..4ab9d2f7705 100644
--- a/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_ih.c
+++ b/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_ih.c
@@ -1,4 +1,4 @@
-/* $NetBSD: amdgpu_ih.c,v 1.3 2018/08/27 14:04:50 riastradh Exp $ */
+/* $NetBSD: amdgpu_ih.c,v 1.4 2020/02/14 14:34:58 maya Exp $ */
/*
* Copyright 2014 Advanced Micro Devices, Inc.
@@ -24,9 +24,8 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: amdgpu_ih.c,v 1.3 2018/08/27 14:04:50 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: amdgpu_ih.c,v 1.4 2020/02/14 14:34:58 maya Exp $");
-#include <linux/log2.h>
#include <drm/drmP.h>
#include "amdgpu.h"
#include "amdgpu_ih.h"
diff --git a/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_kv_dpm.c b/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_kv_dpm.c
index 10d2b568706..f83caf50c72 100644
--- a/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_kv_dpm.c
+++ b/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_kv_dpm.c
@@ -1,4 +1,4 @@
-/* $NetBSD: amdgpu_kv_dpm.c,v 1.3 2020/02/14 04:30:04 riastradh Exp $ */
+/* $NetBSD: amdgpu_kv_dpm.c,v 1.4 2020/02/14 14:34:58 maya Exp $ */
/*
* Copyright 2013 Advanced Micro Devices, Inc.
@@ -24,9 +24,8 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: amdgpu_kv_dpm.c,v 1.3 2020/02/14 04:30:04 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: amdgpu_kv_dpm.c,v 1.4 2020/02/14 14:34:58 maya Exp $");
-#include <asm/byteorder.h>
#include "drmP.h"
#include "amdgpu.h"
#include "amdgpu_pm.h"
diff --git a/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_object.h b/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_object.h
index d03c69de6b1..441f6203265 100644
--- a/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_object.h
+++ b/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_object.h
@@ -1,4 +1,4 @@
-/* $NetBSD: amdgpu_object.h,v 1.3 2018/08/27 14:04:50 riastradh Exp $ */
+/* $NetBSD: amdgpu_object.h,v 1.4 2020/02/14 14:34:58 maya Exp $ */
/*
* Copyright 2008 Advanced Micro Devices, Inc.
@@ -30,7 +30,6 @@
#ifndef __AMDGPU_OBJECT_H__
#define __AMDGPU_OBJECT_H__
-#include <linux/device.h>
#include <drm/amdgpu_drm.h>
#include "amdgpu.h"
diff --git a/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_ring.c b/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_ring.c
index c8083a8e01d..8c818c61888 100644
--- a/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_ring.c
+++ b/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_ring.c
@@ -1,4 +1,4 @@
-/* $NetBSD: amdgpu_ring.c,v 1.3 2018/08/27 14:04:50 riastradh Exp $ */
+/* $NetBSD: amdgpu_ring.c,v 1.4 2020/02/14 14:34:58 maya Exp $ */
/*
* Copyright 2008 Advanced Micro Devices, Inc.
@@ -29,10 +29,8 @@
* Christian König
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: amdgpu_ring.c,v 1.3 2018/08/27 14:04:50 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: amdgpu_ring.c,v 1.4 2020/02/14 14:34:58 maya Exp $");
-#include <asm/byteorder.h>
-#include <linux/log2.h>
#include <linux/seq_file.h>
#include <linux/slab.h>
#include <drm/drmP.h>
diff --git a/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_sdma_v2_4.c b/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_sdma_v2_4.c
index 324d8bf7c56..0a9e621a696 100644
--- a/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_sdma_v2_4.c
+++ b/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_sdma_v2_4.c
@@ -1,4 +1,4 @@
-/* $NetBSD: amdgpu_sdma_v2_4.c,v 1.2 2020/02/14 04:35:19 riastradh Exp $ */
+/* $NetBSD: amdgpu_sdma_v2_4.c,v 1.3 2020/02/14 14:34:58 maya Exp $ */
/*
* Copyright 2014 Advanced Micro Devices, Inc.
@@ -24,12 +24,9 @@
* Authors: Alex Deucher
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: amdgpu_sdma_v2_4.c,v 1.2 2020/02/14 04:35:19 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: amdgpu_sdma_v2_4.c,v 1.3 2020/02/14 14:34:58 maya Exp $");
#include <linux/firmware.h>
-#include <linux/module.h>
-#include <linux/log2.h>
-#include <asm/byteorder.h>
#include <drm/drmP.h>
#include "amdgpu.h"
#include "amdgpu_ucode.h"
diff --git a/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_sdma_v3_0.c b/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_sdma_v3_0.c
index 6c27c4128f9..566b619611d 100644
--- a/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_sdma_v3_0.c
+++ b/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_sdma_v3_0.c
@@ -1,4 +1,4 @@
-/* $NetBSD: amdgpu_sdma_v3_0.c,v 1.2 2020/02/14 04:35:19 riastradh Exp $ */
+/* $NetBSD: amdgpu_sdma_v3_0.c,v 1.3 2020/02/14 14:34:58 maya Exp $ */
/*
* Copyright 2014 Advanced Micro Devices, Inc.
@@ -24,12 +24,9 @@
* Authors: Alex Deucher
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: amdgpu_sdma_v3_0.c,v 1.2 2020/02/14 04:35:19 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: amdgpu_sdma_v3_0.c,v 1.3 2020/02/14 14:34:58 maya Exp $");
#include <linux/firmware.h>
-#include <linux/module.h>
-#include <linux/log2.h>
-#include <asm/byteorder.h>
#include <drm/drmP.h>
#include "amdgpu.h"
#include "amdgpu_ucode.h"
diff --git a/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_tonga_dpm.c b/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_tonga_dpm.c
index a6d7c8ec62e..4d207bc6ced 100644
--- a/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_tonga_dpm.c
+++ b/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_tonga_dpm.c
@@ -1,4 +1,4 @@
-/* $NetBSD: amdgpu_tonga_dpm.c,v 1.1 2018/08/27 14:10:14 riastradh Exp $ */
+/* $NetBSD: amdgpu_tonga_dpm.c,v 1.2 2020/02/14 14:34:58 maya Exp $ */
/*
* Copyright 2014 Advanced Micro Devices, Inc.
@@ -24,10 +24,9 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: amdgpu_tonga_dpm.c,v 1.1 2018/08/27 14:10:14 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: amdgpu_tonga_dpm.c,v 1.2 2020/02/14 14:34:58 maya Exp $");
#include <linux/firmware.h>
-#include <linux/module.h>
#include "drmP.h"
#include "amdgpu.h"
#include "tonga_smumgr.h"
diff --git a/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_tonga_ih.c b/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_tonga_ih.c
index ee6d4a1528c..5ddd0bce1b9 100644
--- a/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_tonga_ih.c
+++ b/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_tonga_ih.c
@@ -1,4 +1,4 @@
-/* $NetBSD: amdgpu_tonga_ih.c,v 1.1 2018/08/27 14:10:14 riastradh Exp $ */
+/* $NetBSD: amdgpu_tonga_ih.c,v 1.2 2020/02/14 14:34:58 maya Exp $ */
/*
* Copyright 2014 Advanced Micro Devices, Inc.
@@ -23,10 +23,8 @@
*
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: amdgpu_tonga_ih.c,v 1.1 2018/08/27 14:10:14 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: amdgpu_tonga_ih.c,v 1.2 2020/02/14 14:34:58 maya Exp $");
-#include <asm/byteorder.h>
-#include <linux/log2.h>
#include "drmP.h"
#include "amdgpu.h"
#include "amdgpu_ih.h"
diff --git a/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_tonga_smc.c b/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_tonga_smc.c
index 1e5f543222e..a28cd7e53b7 100644
--- a/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_tonga_smc.c
+++ b/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_tonga_smc.c
@@ -1,4 +1,4 @@
-/* $NetBSD: amdgpu_tonga_smc.c,v 1.1 2018/08/27 14:10:14 riastradh Exp $ */
+/* $NetBSD: amdgpu_tonga_smc.c,v 1.2 2020/02/14 14:34:58 maya Exp $ */
/*
* Copyright 2014 Advanced Micro Devices, Inc.
@@ -24,10 +24,9 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: amdgpu_tonga_smc.c,v 1.1 2018/08/27 14:10:14 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: amdgpu_tonga_smc.c,v 1.2 2020/02/14 14:34:58 maya Exp $");
#include <linux/firmware.h>
-#include <asm/byteorder.h>
#include "drmP.h"
#include "amdgpu.h"
#include "tonga_ppsmc.h"
diff --git a/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_ucode.c b/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_ucode.c
index d2aaa4c237d..517abbd0a7b 100644
--- a/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_ucode.c
+++ b/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_ucode.c
@@ -1,4 +1,4 @@
-/* $NetBSD: amdgpu_ucode.c,v 1.5 2020/02/14 04:35:19 riastradh Exp $ */
+/* $NetBSD: amdgpu_ucode.c,v 1.6 2020/02/14 14:34:58 maya Exp $ */
/*
* Copyright 2014 Advanced Micro Devices, Inc.
@@ -24,12 +24,11 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: amdgpu_ucode.c,v 1.5 2020/02/14 04:35:19 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: amdgpu_ucode.c,v 1.6 2020/02/14 14:34:58 maya Exp $");
#include <linux/firmware.h>
#include <linux/slab.h>
#include <linux/module.h>
-#include <asm/byteorder.h>
#include <drm/drmP.h>
#include "amdgpu.h"
#include "amdgpu_ucode.h"
diff --git a/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_uvd.c b/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_uvd.c
index 0ffb51b95ad..e5e1ab9f664 100644
--- a/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_uvd.c
+++ b/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_uvd.c
@@ -1,4 +1,4 @@
-/* $NetBSD: amdgpu_uvd.c,v 1.6 2020/02/14 04:35:19 riastradh Exp $ */
+/* $NetBSD: amdgpu_uvd.c,v 1.7 2020/02/14 14:34:58 maya Exp $ */
/*
* Copyright 2011 Advanced Micro Devices, Inc.
@@ -31,11 +31,10 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: amdgpu_uvd.c,v 1.6 2020/02/14 04:35:19 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: amdgpu_uvd.c,v 1.7 2020/02/14 14:34:58 maya Exp $");
#include <linux/firmware.h>
#include <linux/module.h>
-#include <asm/byteorder.h>
#include <drm/drmP.h>
#include <drm/drm.h>
diff --git a/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_uvd_v4_2.c b/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_uvd_v4_2.c
index bf8689f1c0d..462b83e4d1a 100644
--- a/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_uvd_v4_2.c
+++ b/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_uvd_v4_2.c
@@ -1,4 +1,4 @@
-/* $NetBSD: amdgpu_uvd_v4_2.c,v 1.2 2018/08/27 14:24:03 riastradh Exp $ */
+/* $NetBSD: amdgpu_uvd_v4_2.c,v 1.3 2020/02/14 14:34:58 maya Exp $ */
/*
* Copyright 2013 Advanced Micro Devices, Inc.
@@ -25,10 +25,9 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: amdgpu_uvd_v4_2.c,v 1.2 2018/08/27 14:24:03 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: amdgpu_uvd_v4_2.c,v 1.3 2020/02/14 14:34:58 maya Exp $");
#include <linux/firmware.h>
-#include <linux/log2.h>
#include <drm/drmP.h>
#include "amdgpu.h"
#include "amdgpu_uvd.h"
diff --git a/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_uvd_v5_0.c b/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_uvd_v5_0.c
index 26c4eaa1496..fe1ac224ed3 100644
--- a/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_uvd_v5_0.c
+++ b/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_uvd_v5_0.c
@@ -1,4 +1,4 @@
-/* $NetBSD: amdgpu_uvd_v5_0.c,v 1.1 2018/08/27 14:10:14 riastradh Exp $ */
+/* $NetBSD: amdgpu_uvd_v5_0.c,v 1.2 2020/02/14 14:34:58 maya Exp $ */
/*
* Copyright 2014 Advanced Micro Devices, Inc.
@@ -25,10 +25,9 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: amdgpu_uvd_v5_0.c,v 1.1 2018/08/27 14:10:14 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: amdgpu_uvd_v5_0.c,v 1.2 2020/02/14 14:34:58 maya Exp $");
#include <linux/firmware.h>
-#include <linux/log2.h>
#include <drm/drmP.h>
#include "amdgpu.h"
#include "amdgpu_uvd.h"
diff --git a/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_uvd_v6_0.c b/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_uvd_v6_0.c
index df6042683b6..dfa21c0b5e4 100644
--- a/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_uvd_v6_0.c
+++ b/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_uvd_v6_0.c
@@ -1,4 +1,4 @@
-/* $NetBSD: amdgpu_uvd_v6_0.c,v 1.1 2018/08/27 14:10:14 riastradh Exp $ */
+/* $NetBSD: amdgpu_uvd_v6_0.c,v 1.2 2020/02/14 14:34:58 maya Exp $ */
/*
* Copyright 2014 Advanced Micro Devices, Inc.
@@ -25,10 +25,9 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: amdgpu_uvd_v6_0.c,v 1.1 2018/08/27 14:10:14 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: amdgpu_uvd_v6_0.c,v 1.2 2020/02/14 14:34:58 maya Exp $");
#include <linux/firmware.h>
-#include <linux/log2.h>
#include <drm/drmP.h>
#include "amdgpu.h"
#include "amdgpu_uvd.h"
diff --git a/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_vce.c b/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_vce.c
index d0bec40fdbe..461ba59e7c9 100644
--- a/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_vce.c
+++ b/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_vce.c
@@ -1,4 +1,4 @@
-/* $NetBSD: amdgpu_vce.c,v 1.4 2019/01/01 08:07:47 maya Exp $ */
+/* $NetBSD: amdgpu_vce.c,v 1.5 2020/02/14 14:34:58 maya Exp $ */
/*
* Copyright 2013 Advanced Micro Devices, Inc.
@@ -28,11 +28,10 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: amdgpu_vce.c,v 1.4 2019/01/01 08:07:47 maya Exp $");
+__KERNEL_RCSID(0, "$NetBSD: amdgpu_vce.c,v 1.5 2020/02/14 14:34:58 maya Exp $");
#include <linux/firmware.h>
#include <linux/module.h>
-#include <asm/byteorder.h>
#include <drm/drmP.h>
#include <drm/drm.h>
diff --git a/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_vce_v3_0.c b/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_vce_v3_0.c
index b2f270f4791..2e762e0d342 100644
--- a/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_vce_v3_0.c
+++ b/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_vce_v3_0.c
@@ -1,4 +1,4 @@
-/* $NetBSD: amdgpu_vce_v3_0.c,v 1.1 2018/08/27 14:10:14 riastradh Exp $ */
+/* $NetBSD: amdgpu_vce_v3_0.c,v 1.2 2020/02/14 14:34:58 maya Exp $ */
/*
* Copyright 2014 Advanced Micro Devices, Inc.
@@ -28,10 +28,9 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: amdgpu_vce_v3_0.c,v 1.1 2018/08/27 14:10:14 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: amdgpu_vce_v3_0.c,v 1.2 2020/02/14 14:34:58 maya Exp $");
#include <linux/firmware.h>
-#include <asm/byteorder.h>
#include <drm/drmP.h>
#include "amdgpu.h"
#include "amdgpu_vce.h"
diff --git a/sys/external/bsd/drm2/dist/drm/drm_agpsupport.c b/sys/external/bsd/drm2/dist/drm/drm_agpsupport.c
index 139d5484f6d..4c1c24820e7 100644
--- a/sys/external/bsd/drm2/dist/drm/drm_agpsupport.c
+++ b/sys/external/bsd/drm2/dist/drm/drm_agpsupport.c
@@ -1,4 +1,4 @@
-/* $NetBSD: drm_agpsupport.c,v 1.10 2018/08/28 03:41:38 riastradh Exp $ */
+/* $NetBSD: drm_agpsupport.c,v 1.11 2020/02/14 14:34:57 maya Exp $ */
/**
* \file drm_agpsupport.c
@@ -34,11 +34,9 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: drm_agpsupport.c,v 1.10 2018/08/28 03:41:38 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: drm_agpsupport.c,v 1.11 2020/02/14 14:34:57 maya Exp $");
#include <drm/drmP.h>
-#include <linux/errno.h>
-#include <linux/export.h>
#include <linux/module.h>
#include <linux/slab.h>
#include "drm_legacy.h"
diff --git a/sys/external/bsd/drm2/dist/drm/drm_atomic.c b/sys/external/bsd/drm2/dist/drm/drm_atomic.c
index ba69906e998..ef14c50656b 100644
--- a/sys/external/bsd/drm2/dist/drm/drm_atomic.c
+++ b/sys/external/bsd/drm2/dist/drm/drm_atomic.c
@@ -1,4 +1,4 @@
-/* $NetBSD: drm_atomic.c,v 1.7 2018/08/27 07:45:55 riastradh Exp $ */
+/* $NetBSD: drm_atomic.c,v 1.8 2020/02/14 14:34:57 maya Exp $ */
/*
* Copyright (C) 2014 Red Hat
@@ -29,9 +29,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: drm_atomic.c,v 1.7 2018/08/27 07:45:55 riastradh Exp $");
-
-#include <linux/export.h>
+__KERNEL_RCSID(0, "$NetBSD: drm_atomic.c,v 1.8 2020/02/14 14:34:57 maya Exp $");
#include <drm/drmP.h>
#include <drm/drm_atomic.h>
diff --git a/sys/external/bsd/drm2/dist/drm/drm_atomic_helper.c b/sys/external/bsd/drm2/dist/drm/drm_atomic_helper.c
index ba1b823f7cf..fa4f56fcbe9 100644
--- a/sys/external/bsd/drm2/dist/drm/drm_atomic_helper.c
+++ b/sys/external/bsd/drm2/dist/drm/drm_atomic_helper.c
@@ -1,4 +1,4 @@
-/* $NetBSD: drm_atomic_helper.c,v 1.4 2018/08/27 06:50:45 riastradh Exp $ */
+/* $NetBSD: drm_atomic_helper.c,v 1.5 2020/02/14 14:34:57 maya Exp $ */
/*
* Copyright (C) 2014 Red Hat
@@ -28,14 +28,13 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: drm_atomic_helper.c,v 1.4 2018/08/27 06:50:45 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: drm_atomic_helper.c,v 1.5 2020/02/14 14:34:57 maya Exp $");
#include <drm/drmP.h>
#include <drm/drm_atomic.h>
#include <drm/drm_plane_helper.h>
#include <drm/drm_crtc_helper.h>
#include <drm/drm_atomic_helper.h>
-#include <linux/export.h>
#include <linux/fence.h>
/**
diff --git a/sys/external/bsd/drm2/dist/drm/drm_bufs.c b/sys/external/bsd/drm2/dist/drm/drm_bufs.c
index ee98e91520c..f34d2b24d4a 100644
--- a/sys/external/bsd/drm2/dist/drm/drm_bufs.c
+++ b/sys/external/bsd/drm2/dist/drm/drm_bufs.c
@@ -1,4 +1,4 @@
-/* $NetBSD: drm_bufs.c,v 1.11 2020/02/14 04:36:55 riastradh Exp $ */
+/* $NetBSD: drm_bufs.c,v 1.12 2020/02/14 14:34:57 maya Exp $ */
/*
* Legacy: Generic DRM Buffer Management
@@ -31,16 +31,12 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: drm_bufs.c,v 1.11 2020/02/14 04:36:55 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: drm_bufs.c,v 1.12 2020/02/14 14:34:57 maya Exp $");
#include <linux/vmalloc.h>
#include <linux/slab.h>
-#include <linux/sched.h>
#include <linux/log2.h>
#include <linux/export.h>
-#include <linux/mm.h>
-#include <asm/bug.h>
-#include <asm/io.h>
#include <asm/shmparam.h>
#include <drm/drmP.h>
#include "drm_legacy.h"
diff --git a/sys/external/bsd/drm2/dist/drm/drm_context.c b/sys/external/bsd/drm2/dist/drm/drm_context.c
index 1ad294227a8..05a76e33297 100644
--- a/sys/external/bsd/drm2/dist/drm/drm_context.c
+++ b/sys/external/bsd/drm2/dist/drm/drm_context.c
@@ -1,4 +1,4 @@
-/* $NetBSD: drm_context.c,v 1.5 2018/08/27 14:14:29 riastradh Exp $ */
+/* $NetBSD: drm_context.c,v 1.6 2020/02/14 14:34:57 maya Exp $ */
/*
* Legacy: Generic DRM Contexts
@@ -31,9 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: drm_context.c,v 1.5 2018/08/27 14:14:29 riastradh Exp $");
-
-#include <linux/err.h>
+__KERNEL_RCSID(0, "$NetBSD: drm_context.c,v 1.6 2020/02/14 14:34:57 maya Exp $");
#include <drm/drmP.h>
#include "drm_legacy.h"
diff --git a/sys/external/bsd/drm2/dist/drm/drm_crtc.c b/sys/external/bsd/drm2/dist/drm/drm_crtc.c
index d8641fcea07..6ae1a572ba5 100644
--- a/sys/external/bsd/drm2/dist/drm/drm_crtc.c
+++ b/sys/external/bsd/drm2/dist/drm/drm_crtc.c
@@ -1,4 +1,4 @@
-/* $NetBSD: drm_crtc.c,v 1.15 2020/02/14 04:37:27 riastradh Exp $ */
+/* $NetBSD: drm_crtc.c,v 1.16 2020/02/14 14:34:57 maya Exp $ */
/*
* Copyright (c) 2006-2008 Intel Corporation
@@ -32,16 +32,12 @@
* Jesse Barnes <jesse.barnes@intel.com>
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: drm_crtc.c,v 1.15 2020/02/14 04:37:27 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: drm_crtc.c,v 1.16 2020/02/14 14:34:57 maya Exp $");
-#include <linux/err.h>
-#include <linux/spinlock.h>
#include <linux/ctype.h>
#include <linux/list.h>
#include <linux/slab.h>
#include <linux/export.h>
-#include <linux/errno.h>
-#include <asm/bug.h>
#include <drm/drmP.h>
#include <drm/drm_crtc.h>
#include <drm/drm_edid.h>
diff --git a/sys/external/bsd/drm2/dist/drm/drm_crtc_helper.c b/sys/external/bsd/drm2/dist/drm/drm_crtc_helper.c
index 4e185a4565f..83f53473bda 100644
--- a/sys/external/bsd/drm2/dist/drm/drm_crtc_helper.c
+++ b/sys/external/bsd/drm2/dist/drm/drm_crtc_helper.c
@@ -1,4 +1,4 @@
-/* $NetBSD: drm_crtc_helper.c,v 1.5 2018/08/27 04:58:19 riastradh Exp $ */
+/* $NetBSD: drm_crtc_helper.c,v 1.6 2020/02/14 14:34:57 maya Exp $ */
/*
* Copyright (c) 2006-2008 Intel Corporation
@@ -32,14 +32,11 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: drm_crtc_helper.c,v 1.5 2018/08/27 04:58:19 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: drm_crtc_helper.c,v 1.6 2020/02/14 14:34:57 maya Exp $");
#include <linux/kernel.h>
#include <linux/export.h>
-#include <linux/module.h>
#include <linux/moduleparam.h>
-#include <asm/param.h>
-#include <asm/bug.h>
#include <drm/drmP.h>
#include <drm/drm_atomic.h>
diff --git a/sys/external/bsd/drm2/dist/drm/drm_dp_helper.c b/sys/external/bsd/drm2/dist/drm/drm_dp_helper.c
index 0ab38c3396f..62776e3c14a 100644
--- a/sys/external/bsd/drm2/dist/drm/drm_dp_helper.c
+++ b/sys/external/bsd/drm2/dist/drm/drm_dp_helper.c
@@ -1,4 +1,4 @@
-/* $NetBSD: drm_dp_helper.c,v 1.11 2020/02/14 09:38:51 riastradh Exp $ */
+/* $NetBSD: drm_dp_helper.c,v 1.12 2020/02/14 14:34:57 maya Exp $ */
/*
* Copyright © 2009 Keith Packard
@@ -23,18 +23,15 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: drm_dp_helper.c,v 1.11 2020/02/14 09:38:51 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: drm_dp_helper.c,v 1.12 2020/02/14 14:34:57 maya Exp $");
#include <linux/kernel.h>
#include <linux/module.h>
-#include <linux/moduleparam.h>
#include <linux/delay.h>
#include <linux/init.h>
#include <linux/errno.h>
#include <linux/sched.h>
#include <linux/i2c.h>
-#include <linux/export.h>
-#include <linux/device.h>
#include <drm/drm_dp_helper.h>
#include <drm/drmP.h>
diff --git a/sys/external/bsd/drm2/dist/drm/drm_dp_mst_topology.c b/sys/external/bsd/drm2/dist/drm/drm_dp_mst_topology.c
index d087db06688..3c4be888918 100644
--- a/sys/external/bsd/drm2/dist/drm/drm_dp_mst_topology.c
+++ b/sys/external/bsd/drm2/dist/drm/drm_dp_mst_topology.c
@@ -1,4 +1,4 @@
-/* $NetBSD: drm_dp_mst_topology.c,v 1.4 2020/02/14 04:35:19 riastradh Exp $ */
+/* $NetBSD: drm_dp_mst_topology.c,v 1.5 2020/02/14 14:34:57 maya Exp $ */
/*
* Copyright © 2014 Red Hat
@@ -23,7 +23,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: drm_dp_mst_topology.c,v 1.4 2020/02/14 04:35:19 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: drm_dp_mst_topology.c,v 1.5 2020/02/14 14:34:57 maya Exp $");
#include <linux/kernel.h>
#include <linux/delay.h>
@@ -32,9 +32,6 @@ __KERNEL_RCSID(0, "$NetBSD: drm_dp_mst_topology.c,v 1.4 2020/02/14 04:35:19 rias
#include <linux/sched.h>
#include <linux/seq_file.h>
#include <linux/i2c.h>
-#include <linux/device.h>
-#include <linux/export.h>
-#include <linux/module.h>
#include <drm/drm_dp_mst_helper.h>
#include <drm/drmP.h>
diff --git a/sys/external/bsd/drm2/dist/drm/drm_drv.c b/sys/external/bsd/drm2/dist/drm/drm_drv.c
index dfe666fe437..3731fb89189 100644
--- a/sys/external/bsd/drm2/dist/drm/drm_drv.c
+++ b/sys/external/bsd/drm2/dist/drm/drm_drv.c
@@ -1,4 +1,4 @@
-/* $NetBSD: drm_drv.c,v 1.11 2020/02/14 04:35:19 riastradh Exp $ */
+/* $NetBSD: drm_drv.c,v 1.12 2020/02/14 14:34:57 maya Exp $ */
/*
* Created: Fri Jan 19 10:48:35 2001 by faith@acm.org
@@ -29,16 +29,13 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: drm_drv.c,v 1.11 2020/02/14 04:35:19 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: drm_drv.c,v 1.12 2020/02/14 14:34:57 maya Exp $");
-#include <linux/err.h>
-#include <linux/export.h>
#include <linux/debugfs.h>
#include <linux/fs.h>
#include <linux/module.h>
#include <linux/moduleparam.h>
#include <linux/mount.h>
-#include <linux/printk.h>
#include <linux/slab.h>
#include <drm/drmP.h>
#include <drm/drm_core.h>
diff --git a/sys/external/bsd/drm2/dist/drm/drm_edid.c b/sys/external/bsd/drm2/dist/drm/drm_edid.c
index 4888a6e5d84..067780c58df 100644
--- a/sys/external/bsd/drm2/dist/drm/drm_edid.c
+++ b/sys/external/bsd/drm2/dist/drm/drm_edid.c
@@ -1,4 +1,4 @@
-/* $NetBSD: drm_edid.c,v 1.7 2020/02/14 04:38:48 riastradh Exp $ */
+/* $NetBSD: drm_edid.c,v 1.8 2020/02/14 14:34:57 maya Exp $ */
/*
* Copyright (c) 2006 Luc Verhaegen (quirks list)
@@ -30,20 +30,13 @@
* DEALINGS IN THE SOFTWARE.
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: drm_edid.c,v 1.7 2020/02/14 04:38:48 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: drm_edid.c,v 1.8 2020/02/14 14:34:57 maya Exp $");
#include <linux/kernel.h>
#include <linux/slab.h>
#include <linux/hdmi.h>
#include <linux/i2c.h>
#include <linux/module.h>
-#include <linux/moduleparam.h>
-#include <linux/export.h>
-#include <linux/printk.h>
-#include <linux/device.h>
-#include <linux/string.h>
-#include <linux/errno.h>
-#include <asm/byteorder.h>
#include <drm/drmP.h>
#include <drm/drm_edid.h>
#include <drm/drm_displayid.h>
diff --git a/sys/external/bsd/drm2/dist/drm/drm_fb_helper.c b/sys/external/bsd/drm2/dist/drm/drm_fb_helper.c
index ab839f96ca0..2b4dcbeb62b 100644
--- a/sys/external/bsd/drm2/dist/drm/drm_fb_helper.c
+++ b/sys/external/bsd/drm2/dist/drm/drm_fb_helper.c
@@ -1,4 +1,4 @@
-/* $NetBSD: drm_fb_helper.c,v 1.15 2020/02/14 04:37:27 riastradh Exp $ */
+/* $NetBSD: drm_fb_helper.c,v 1.16 2020/02/14 14:34:57 maya Exp $ */
/*
* Copyright (c) 2006-2009 Red Hat Inc.
@@ -30,7 +30,7 @@
* Jesse Barnes <jesse.barnes@intel.com>
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: drm_fb_helper.c,v 1.15 2020/02/14 04:37:27 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: drm_fb_helper.c,v 1.16 2020/02/14 14:34:57 maya Exp $");
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
@@ -39,13 +39,7 @@ __KERNEL_RCSID(0, "$NetBSD: drm_fb_helper.c,v 1.15 2020/02/14 04:37:27 riastradh
#include <linux/slab.h>
#include <linux/fb.h>
#include <linux/module.h>
-#include <linux/device.h>
-#include <linux/export.h>
-#include <linux/list.h>
-#include <linux/notifier.h>
-#include <linux/printk.h>
#include <linux/sysrq.h>
-#include <asm/bug.h>
#include <drm/drmP.h>
#include <drm/drm_crtc.h>
#include <drm/drm_fb_helper.h>
diff --git a/sys/external/bsd/drm2/dist/drm/drm_flip_work.c b/sys/external/bsd/drm2/dist/drm/drm_flip_work.c
index d4b0abb1e2c..a3e91334259 100644
--- a/sys/external/bsd/drm2/dist/drm/drm_flip_work.c
+++ b/sys/external/bsd/drm2/dist/drm/drm_flip_work.c
@@ -1,4 +1,4 @@
-/* $NetBSD: drm_flip_work.c,v 1.3 2018/08/27 04:58:19 riastradh Exp $ */
+/* $NetBSD: drm_flip_work.c,v 1.4 2020/02/14 14:34:57 maya Exp $ */
/*
* Copyright (C) 2013 Red Hat
@@ -24,9 +24,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: drm_flip_work.c,v 1.3 2018/08/27 04:58:19 riastradh Exp $");
-
-#include <linux/export.h>
+__KERNEL_RCSID(0, "$NetBSD: drm_flip_work.c,v 1.4 2020/02/14 14:34:57 maya Exp $");
#include <drm/drmP.h>
#include <drm/drm_flip_work.h>
diff --git a/sys/external/bsd/drm2/dist/drm/drm_gem.c b/sys/external/bsd/drm2/dist/drm/drm_gem.c
index 0a74bc75ef3..0c40db0ad73 100644
--- a/sys/external/bsd/drm2/dist/drm/drm_gem.c
+++ b/sys/external/bsd/drm2/dist/drm/drm_gem.c
@@ -1,4 +1,4 @@
-/* $NetBSD: drm_gem.c,v 1.13 2020/02/14 04:35:19 riastradh Exp $ */
+/* $NetBSD: drm_gem.c,v 1.14 2020/02/14 14:34:57 maya Exp $ */
/*
* Copyright © 2008 Intel Corporation
@@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: drm_gem.c,v 1.13 2020/02/14 04:35:19 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: drm_gem.c,v 1.14 2020/02/14 14:34:57 maya Exp $");
#include <linux/types.h>
#include <linux/slab.h>
@@ -41,9 +41,6 @@ __KERNEL_RCSID(0, "$NetBSD: drm_gem.c,v 1.13 2020/02/14 04:35:19 riastradh Exp $
#include <linux/pagemap.h>
#include <linux/shmem_fs.h>
#include <linux/dma-buf.h>
-#include <linux/err.h>
-#include <linux/export.h>
-#include <asm/bug.h>
#include <drm/drmP.h>
#include <drm/drm_vma_manager.h>
#include <drm/drm_gem.h>
diff --git a/sys/external/bsd/drm2/dist/drm/drm_global.c b/sys/external/bsd/drm2/dist/drm/drm_global.c
index 5b699822532..d0b6ecf952a 100644
--- a/sys/external/bsd/drm2/dist/drm/drm_global.c
+++ b/sys/external/bsd/drm2/dist/drm/drm_global.c
@@ -1,4 +1,4 @@
-/* $NetBSD: drm_global.c,v 1.5 2020/02/14 04:35:19 riastradh Exp $ */
+/* $NetBSD: drm_global.c,v 1.6 2020/02/14 14:34:57 maya Exp $ */
/**************************************************************************
*
@@ -31,13 +31,11 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: drm_global.c,v 1.5 2020/02/14 04:35:19 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: drm_global.c,v 1.6 2020/02/14 14:34:57 maya Exp $");
#include <linux/mutex.h>
#include <linux/slab.h>
#include <linux/module.h>
-#include <linux/kernel.h>
-#include <linux/export.h>
#include <asm/bug.h>
#include <drm/drm_global.h>
diff --git a/sys/external/bsd/drm2/dist/drm/drm_irq.c b/sys/external/bsd/drm2/dist/drm/drm_irq.c
index 84fc599793f..9e75616992c 100644
--- a/sys/external/bsd/drm2/dist/drm/drm_irq.c
+++ b/sys/external/bsd/drm2/dist/drm/drm_irq.c
@@ -1,4 +1,4 @@
-/* $NetBSD: drm_irq.c,v 1.15 2018/08/27 14:43:32 riastradh Exp $ */
+/* $NetBSD: drm_irq.c,v 1.16 2020/02/14 14:34:57 maya Exp $ */
/*
* drm_irq.c IRQ and vblank support
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: drm_irq.c,v 1.15 2018/08/27 14:43:32 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: drm_irq.c,v 1.16 2020/02/14 14:34:57 maya Exp $");
#include <drm/drmP.h>
#include "drm_trace.h"
@@ -46,16 +46,6 @@ __KERNEL_RCSID(0, "$NetBSD: drm_irq.c,v 1.15 2018/08/27 14:43:32 riastradh Exp $
#include <linux/vgaarb.h>
#include <linux/export.h>
-#include <linux/moduleparam.h>
-
-#include <linux/atomic.h>
-#include <linux/ktime.h>
-#include <linux/math64.h>
-#include <linux/preempt.h>
-#include <linux/sched.h>
-
-#include <asm/bug.h>
-#include <asm/param.h>
#ifdef __NetBSD__ /* XXX hurk -- selnotify &c. */
#include <sys/poll.h>
diff --git a/sys/external/bsd/drm2/dist/drm/drm_mm.c b/sys/external/bsd/drm2/dist/drm/drm_mm.c
index 19479ab695c..c1d17c09551 100644
--- a/sys/external/bsd/drm2/dist/drm/drm_mm.c
+++ b/sys/external/bsd/drm2/dist/drm/drm_mm.c
@@ -1,4 +1,4 @@
-/* $NetBSD: drm_mm.c,v 1.5 2018/08/27 06:56:50 riastradh Exp $ */
+/* $NetBSD: drm_mm.c,v 1.6 2020/02/14 14:34:57 maya Exp $ */
/**************************************************************************
*
@@ -44,16 +44,13 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: drm_mm.c,v 1.5 2018/08/27 06:56:50 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: drm_mm.c,v 1.6 2020/02/14 14:34:57 maya Exp $");
#include <drm/drmP.h>
#include <drm/drm_mm.h>
#include <linux/slab.h>
#include <linux/seq_file.h>
#include <linux/export.h>
-#include <linux/printk.h>
-#include <asm/bug.h>
-#include <asm/div64.h>
/**
* DOC: Overview
diff --git a/sys/external/bsd/drm2/dist/drm/drm_modeset_lock.c b/sys/external/bsd/drm2/dist/drm/drm_modeset_lock.c
index f3b21cca040..4966b7f31ab 100644
--- a/sys/external/bsd/drm2/dist/drm/drm_modeset_lock.c
+++ b/sys/external/bsd/drm2/dist/drm/drm_modeset_lock.c
@@ -1,4 +1,4 @@
-/* $NetBSD: drm_modeset_lock.c,v 1.3 2018/08/27 06:56:12 riastradh Exp $ */
+/* $NetBSD: drm_modeset_lock.c,v 1.4 2020/02/14 14:34:57 maya Exp $ */
/*
* Copyright (C) 2014 Red Hat
@@ -24,9 +24,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: drm_modeset_lock.c,v 1.3 2018/08/27 06:56:12 riastradh Exp $");
-
-#include <linux/export.h>
+__KERNEL_RCSID(0, "$NetBSD: drm_modeset_lock.c,v 1.4 2020/02/14 14:34:57 maya Exp $");
#include <drm/drmP.h>
#include <drm/drm_crtc.h>
diff --git a/sys/external/bsd/drm2/dist/drm/drm_plane_helper.c b/sys/external/bsd/drm2/dist/drm/drm_plane_helper.c
index f5a68b12698..b382de5803c 100644
--- a/sys/external/bsd/drm2/dist/drm/drm_plane_helper.c
+++ b/sys/external/bsd/drm2/dist/drm/drm_plane_helper.c
@@ -1,4 +1,4 @@
-/* $NetBSD: drm_plane_helper.c,v 1.3 2018/08/27 04:58:19 riastradh Exp $ */
+/* $NetBSD: drm_plane_helper.c,v 1.4 2020/02/14 14:34:57 maya Exp $ */
/*
* Copyright (C) 2014 Intel Corporation
@@ -26,10 +26,9 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: drm_plane_helper.c,v 1.3 2018/08/27 04:58:19 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: drm_plane_helper.c,v 1.4 2020/02/14 14:34:57 maya Exp $");
#include <linux/list.h>
-#include <linux/export.h>
#include <drm/drmP.h>
#include <drm/drm_plane_helper.h>
#include <drm/drm_rect.h>
diff --git a/sys/external/bsd/drm2/dist/drm/drm_probe_helper.c b/sys/external/bsd/drm2/dist/drm/drm_probe_helper.c
index 7d9e24a6537..0aca6f09114 100644
--- a/sys/external/bsd/drm2/dist/drm/drm_probe_helper.c
+++ b/sys/external/bsd/drm2/dist/drm/drm_probe_helper.c
@@ -1,4 +1,4 @@
-/* $NetBSD: drm_probe_helper.c,v 1.3 2018/08/27 04:58:19 riastradh Exp $ */
+/* $NetBSD: drm_probe_helper.c,v 1.4 2020/02/14 14:34:57 maya Exp $ */
/*
* Copyright (c) 2006-2008 Intel Corporation
@@ -32,9 +32,8 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: drm_probe_helper.c,v 1.3 2018/08/27 04:58:19 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: drm_probe_helper.c,v 1.4 2020/02/14 14:34:57 maya Exp $");
-#include <asm/param.h>
#include <linux/export.h>
#include <linux/moduleparam.h>
diff --git a/sys/external/bsd/drm2/dist/drm/i915/i915_cmd_parser.c b/sys/external/bsd/drm2/dist/drm/i915/i915_cmd_parser.c
index 6268eaaa697..a01faef7e6a 100644
--- a/sys/external/bsd/drm2/dist/drm/i915/i915_cmd_parser.c
+++ b/sys/external/bsd/drm2/dist/drm/i915/i915_cmd_parser.c
@@ -1,4 +1,4 @@
-/* $NetBSD: i915_cmd_parser.c,v 1.21 2020/02/14 04:30:05 riastradh Exp $ */
+/* $NetBSD: i915_cmd_parser.c,v 1.22 2020/02/14 14:34:58 maya Exp $ */
/*
* Copyright © 2013 Intel Corporation
@@ -28,11 +28,10 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: i915_cmd_parser.c,v 1.21 2020/02/14 04:30:05 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: i915_cmd_parser.c,v 1.22 2020/02/14 14:34:58 maya Exp $");
#include "i915_drv.h"
#include <linux/bitmap.h>
-#include <linux/log2.h>
/**
* DOC: batch buffer command parser
diff --git a/sys/external/bsd/drm2/dist/drm/i915/i915_drv.c b/sys/external/bsd/drm2/dist/drm/i915/i915_drv.c
index c133088fd8d..b125228ca81 100644
--- a/sys/external/bsd/drm2/dist/drm/i915/i915_drv.c
+++ b/sys/external/bsd/drm2/dist/drm/i915/i915_drv.c
@@ -1,4 +1,4 @@
-/* $NetBSD: i915_drv.c,v 1.18 2020/02/14 04:37:09 riastradh Exp $ */
+/* $NetBSD: i915_drv.c,v 1.19 2020/02/14 14:34:58 maya Exp $ */
/* i915_drv.c -- i830,i845,i855,i865,i915 driver -*- linux-c -*-
*/
@@ -30,12 +30,10 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: i915_drv.c,v 1.18 2020/02/14 04:37:09 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: i915_drv.c,v 1.19 2020/02/14 14:34:58 maya Exp $");
#include <linux/device.h>
#include <linux/acpi.h>
-#include <linux/moduleparam.h>
-#include <linux/time.h>
#include <drm/drmP.h>
#include <drm/i915_drm.h>
#include "i915_drv.h"
diff --git a/sys/external/bsd/drm2/dist/drm/i915/i915_gem.c b/sys/external/bsd/drm2/dist/drm/i915/i915_gem.c
index 76a86c63407..1ebfbed1d49 100644
--- a/sys/external/bsd/drm2/dist/drm/i915/i915_gem.c
+++ b/sys/external/bsd/drm2/dist/drm/i915/i915_gem.c
@@ -1,4 +1,4 @@
-/* $NetBSD: i915_gem.c,v 1.58 2020/02/14 04:35:19 riastradh Exp $ */
+/* $NetBSD: i915_gem.c,v 1.59 2020/02/14 14:34:58 maya Exp $ */
/*
* Copyright © 2008-2015 Intel Corporation
@@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: i915_gem.c,v 1.58 2020/02/14 04:35:19 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: i915_gem.c,v 1.59 2020/02/14 14:34:58 maya Exp $");
#ifdef __NetBSD__
#if 0 /* XXX uvmhist option? */
@@ -60,12 +60,6 @@ __KERNEL_RCSID(0, "$NetBSD: i915_gem.c,v 1.58 2020/02/14 04:35:19 riastradh Exp
#include <linux/swap.h>
#include <linux/pci.h>
#include <linux/dma-buf.h>
-#include <linux/errno.h>
-#include <linux/time.h>
-#include <linux/err.h>
-#include <linux/bitops.h>
-#include <linux/printk.h>
-#include <asm/param.h>
#include <asm/page.h>
#include <asm/cpufeature.h>
diff --git a/sys/external/bsd/drm2/dist/drm/i915/i915_gem_context.c b/sys/external/bsd/drm2/dist/drm/i915/i915_gem_context.c
index ef5f3e904d7..be7364ba048 100644
--- a/sys/external/bsd/drm2/dist/drm/i915/i915_gem_context.c
+++ b/sys/external/bsd/drm2/dist/drm/i915/i915_gem_context.c
@@ -1,4 +1,4 @@
-/* $NetBSD: i915_gem_context.c,v 1.11 2020/02/14 04:36:56 riastradh Exp $ */
+/* $NetBSD: i915_gem_context.c,v 1.12 2020/02/14 14:34:58 maya Exp $ */
/*
* Copyright © 2011-2012 Intel Corporation
@@ -88,9 +88,8 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: i915_gem_context.c,v 1.11 2020/02/14 04:36:56 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: i915_gem_context.c,v 1.12 2020/02/14 14:34:58 maya Exp $");
-#include <linux/err.h>
#include <drm/drmP.h>
#include <drm/i915_drm.h>
#include "i915_drv.h"
diff --git a/sys/external/bsd/drm2/dist/drm/i915/i915_gem_execbuffer.c b/sys/external/bsd/drm2/dist/drm/i915/i915_gem_execbuffer.c
index 6cfbebe4c4e..5291e9fa91d 100644
--- a/sys/external/bsd/drm2/dist/drm/i915/i915_gem_execbuffer.c
+++ b/sys/external/bsd/drm2/dist/drm/i915/i915_gem_execbuffer.c
@@ -1,4 +1,4 @@
-/* $NetBSD: i915_gem_execbuffer.c,v 1.10 2020/02/14 04:36:56 riastradh Exp $ */
+/* $NetBSD: i915_gem_execbuffer.c,v 1.11 2020/02/14 14:34:58 maya Exp $ */
/*
* Copyright © 2008,2010 Intel Corporation
@@ -29,7 +29,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: i915_gem_execbuffer.c,v 1.10 2020/02/14 04:36:56 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: i915_gem_execbuffer.c,v 1.11 2020/02/14 14:34:58 maya Exp $");
#include <drm/drmP.h>
#include <drm/i915_drm.h>
@@ -38,9 +38,7 @@ __KERNEL_RCSID(0, "$NetBSD: i915_gem_execbuffer.c,v 1.10 2020/02/14 04:36:56 ria
#include "intel_drv.h"
#include <linux/dma_remapping.h>
#include <linux/uaccess.h>
-#include <linux/log2.h>
#include <linux/pagemap.h>
-#include <linux/err.h>
#include <asm/cpufeature.h>
#define __EXEC_OBJECT_HAS_PIN (1<<31)
diff --git a/sys/external/bsd/drm2/dist/drm/i915/i915_gem_gtt.c b/sys/external/bsd/drm2/dist/drm/i915/i915_gem_gtt.c
index 1b61f0efcbb..fd10826b408 100644
--- a/sys/external/bsd/drm2/dist/drm/i915/i915_gem_gtt.c
+++ b/sys/external/bsd/drm2/dist/drm/i915/i915_gem_gtt.c
@@ -1,4 +1,4 @@
-/* $NetBSD: i915_gem_gtt.c,v 1.16 2019/12/05 20:03:09 maya Exp $ */
+/* $NetBSD: i915_gem_gtt.c,v 1.17 2020/02/14 14:34:58 maya Exp $ */
/*
* Copyright © 2010 Daniel Vetter
@@ -26,10 +26,9 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: i915_gem_gtt.c,v 1.16 2019/12/05 20:03:09 maya Exp $");
+__KERNEL_RCSID(0, "$NetBSD: i915_gem_gtt.c,v 1.17 2020/02/14 14:34:58 maya Exp $");
#include <linux/bitmap.h>
-#include <linux/err.h>
#include <linux/seq_file.h>
#include <drm/drmP.h>
#include <drm/i915_drm.h>
diff --git a/sys/external/bsd/drm2/dist/drm/i915/i915_gem_stolen.c b/sys/external/bsd/drm2/dist/drm/i915/i915_gem_stolen.c
index 68739d905d2..bacd6daa3d6 100644
--- a/sys/external/bsd/drm2/dist/drm/i915/i915_gem_stolen.c
+++ b/sys/external/bsd/drm2/dist/drm/i915/i915_gem_stolen.c
@@ -1,4 +1,4 @@
-/* $NetBSD: i915_gem_stolen.c,v 1.13 2020/02/14 04:35:19 riastradh Exp $ */
+/* $NetBSD: i915_gem_stolen.c,v 1.14 2020/02/14 14:34:58 maya Exp $ */
/*
* Copyright © 2008-2012 Intel Corporation
@@ -29,10 +29,8 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: i915_gem_stolen.c,v 1.13 2020/02/14 04:35:19 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: i915_gem_stolen.c,v 1.14 2020/02/14 14:34:58 maya Exp $");
-#include <linux/printk.h>
-#include <linux/err.h>
#include <drm/drmP.h>
#include <drm/i915_drm.h>
#include "i915_drv.h"
diff --git a/sys/external/bsd/drm2/dist/drm/i915/i915_gpu_error.c b/sys/external/bsd/drm2/dist/drm/i915/i915_gpu_error.c
index b5a1f7fe3f5..c498f045540 100644
--- a/sys/external/bsd/drm2/dist/drm/i915/i915_gpu_error.c
+++ b/sys/external/bsd/drm2/dist/drm/i915/i915_gpu_error.c
@@ -1,4 +1,4 @@
-/* $NetBSD: i915_gpu_error.c,v 1.10 2018/08/27 16:14:55 riastradh Exp $ */
+/* $NetBSD: i915_gpu_error.c,v 1.11 2020/02/14 14:34:58 maya Exp $ */
/*
* Copyright (c) 2008 Intel Corporation
@@ -30,12 +30,10 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: i915_gpu_error.c,v 1.10 2018/08/27 16:14:55 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: i915_gpu_error.c,v 1.11 2020/02/14 14:34:58 maya Exp $");
#include <sys/param.h>
-#include <asm/io.h>
-#include <linux/irqflags.h>
#include "i915_drv.h"
static const char *ring_str(int ring)
diff --git a/sys/external/bsd/drm2/dist/drm/i915/i915_irq.c b/sys/external/bsd/drm2/dist/drm/i915/i915_irq.c
index 7e8c0c07dc9..60bfdeca1ee 100644
--- a/sys/external/bsd/drm2/dist/drm/i915/i915_irq.c
+++ b/sys/external/bsd/drm2/dist/drm/i915/i915_irq.c
@@ -1,4 +1,4 @@
-/* $NetBSD: i915_irq.c,v 1.18 2020/02/14 04:36:11 riastradh Exp $ */
+/* $NetBSD: i915_irq.c,v 1.19 2020/02/14 14:34:58 maya Exp $ */
/* i915_irq.c -- IRQ support for the I915 -*- linux-c -*-
*/
@@ -29,16 +29,10 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: i915_irq.c,v 1.18 2020/02/14 04:36:11 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: i915_irq.c,v 1.19 2020/02/14 14:34:58 maya Exp $");
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
-#ifdef __NetBSD__
-#include <sys/cdefs.h>
-#endif
-
-#include <linux/hardirq.h>
-#include <linux/printk.h>
#include <linux/sysrq.h>
#include <linux/slab.h>
#ifdef CONFIG_DEBUG_FS
diff --git a/sys/external/bsd/drm2/dist/drm/i915/i915_params.c b/sys/external/bsd/drm2/dist/drm/i915/i915_params.c
index 46135e7c4a9..ef0a1424249 100644
--- a/sys/external/bsd/drm2/dist/drm/i915/i915_params.c
+++ b/sys/external/bsd/drm2/dist/drm/i915/i915_params.c
@@ -1,4 +1,4 @@
-/* $NetBSD: i915_params.c,v 1.3 2018/08/27 04:58:23 riastradh Exp $ */
+/* $NetBSD: i915_params.c,v 1.4 2020/02/14 14:34:58 maya Exp $ */
/*
* Copyright © 2014 Intel Corporation
@@ -25,10 +25,8 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: i915_params.c,v 1.3 2018/08/27 04:58:23 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: i915_params.c,v 1.4 2020/02/14 14:34:58 maya Exp $");
-#include <linux/module.h>
-#include <linux/moduleparam.h>
#include "i915_drv.h"
struct i915_params i915 __read_mostly = {
diff --git a/sys/external/bsd/drm2/dist/drm/i915/intel_csr.c b/sys/external/bsd/drm2/dist/drm/i915/intel_csr.c
index e68dba5d294..5d9f5a6b4e5 100644
--- a/sys/external/bsd/drm2/dist/drm/i915/intel_csr.c
+++ b/sys/external/bsd/drm2/dist/drm/i915/intel_csr.c
@@ -1,4 +1,4 @@
-/* $NetBSD: intel_csr.c,v 1.5 2018/09/13 08:25:55 mrg Exp $ */
+/* $NetBSD: intel_csr.c,v 1.6 2020/02/14 14:34:58 maya Exp $ */
/*
* Copyright © 2014 Intel Corporation
@@ -24,10 +24,9 @@
*
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: intel_csr.c,v 1.5 2018/09/13 08:25:55 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: intel_csr.c,v 1.6 2020/02/14 14:34:58 maya Exp $");
#include <linux/firmware.h>
-#include <linux/module.h>
#include "i915_drv.h"
#include "i915_reg.h"
#include "intel_drv.h"
diff --git a/sys/external/bsd/drm2/dist/drm/i915/intel_display.c b/sys/external/bsd/drm2/dist/drm/i915/intel_display.c
index 5241b83d9ea..7057ad87ff2 100644
--- a/sys/external/bsd/drm2/dist/drm/i915/intel_display.c
+++ b/sys/external/bsd/drm2/dist/drm/i915/intel_display.c
@@ -1,4 +1,4 @@
-/* $NetBSD: intel_display.c,v 1.31 2020/02/14 09:39:37 riastradh Exp $ */
+/* $NetBSD: intel_display.c,v 1.32 2020/02/14 14:34:58 maya Exp $ */
/*
* Copyright © 2006-2007 Intel Corporation
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: intel_display.c,v 1.31 2020/02/14 09:39:37 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: intel_display.c,v 1.32 2020/02/14 14:34:58 maya Exp $");
#include <linux/dmi.h>
#include <linux/module.h>
@@ -36,8 +36,6 @@ __KERNEL_RCSID(0, "$NetBSD: intel_display.c,v 1.31 2020/02/14 09:39:37 riastradh
#include <linux/kernel.h>
#include <linux/slab.h>
#include <linux/vgaarb.h>
-#include <linux/err.h>
-#include <linux/interrupt.h>
#include <drm/drm_edid.h>
#include <drm/drmP.h>
#include "intel_drv.h"
@@ -51,11 +49,7 @@ __KERNEL_RCSID(0, "$NetBSD: intel_display.c,v 1.31 2020/02/14 09:39:37 riastradh
#include <drm/drm_plane_helper.h>
#include <drm/drm_rect.h>
#include <linux/dma_remapping.h>
-#include <linux/err.h>
-#include <asm/bug.h>
#include <linux/math64.h>
-#include <linux/bitops.h>
-#include <linux/log2.h>
#include <linux/nbsd-namespace.h>
diff --git a/sys/external/bsd/drm2/dist/drm/i915/intel_dp.c b/sys/external/bsd/drm2/dist/drm/i915/intel_dp.c
index af079f72287..9bfc0080b55 100644
--- a/sys/external/bsd/drm2/dist/drm/i915/intel_dp.c
+++ b/sys/external/bsd/drm2/dist/drm/i915/intel_dp.c
@@ -1,4 +1,4 @@
-/* $NetBSD: intel_dp.c,v 1.21 2020/02/14 04:36:11 riastradh Exp $ */
+/* $NetBSD: intel_dp.c,v 1.22 2020/02/14 14:34:58 maya Exp $ */
/*
* Copyright © 2008 Intel Corporation
@@ -28,18 +28,13 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: intel_dp.c,v 1.21 2020/02/14 04:36:11 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: intel_dp.c,v 1.22 2020/02/14 14:34:58 maya Exp $");
#include <linux/i2c.h>
#include <linux/slab.h>
#include <linux/export.h>
#include <linux/notifier.h>
#include <linux/reboot.h>
-#include <linux/err.h>
-#include <linux/module.h>
-#include <linux/printk.h>
-#include <linux/pm_qos.h>
-#include <asm/byteorder.h>
#include <drm/drmP.h>
#include <drm/drm_atomic_helper.h>
#include <drm/drm_crtc.h>
diff --git a/sys/external/bsd/drm2/dist/drm/i915/intel_drv.h b/sys/external/bsd/drm2/dist/drm/i915/intel_drv.h
index 1b9c1d24021..261afea2c42 100644
--- a/sys/external/bsd/drm2/dist/drm/i915/intel_drv.h
+++ b/sys/external/bsd/drm2/dist/drm/i915/intel_drv.h
@@ -1,4 +1,4 @@
-/* $NetBSD: intel_drv.h,v 1.12 2020/02/14 04:36:11 riastradh Exp $ */
+/* $NetBSD: intel_drv.h,v 1.13 2020/02/14 14:34:58 maya Exp $ */
/*
* Copyright (c) 2006 Dave Airlie <airlied@linux.ie>
@@ -28,10 +28,8 @@
#define __INTEL_DRV_H__
#include <linux/async.h>
-#include <linux/err.h>
#include <linux/i2c.h>
#include <linux/hdmi.h>
-#include <asm/processor.h>
#include <drm/i915_drm.h>
#include "i915_drv.h"
#include <drm/drm_crtc.h>
diff --git a/sys/external/bsd/drm2/dist/drm/i915/intel_fbdev.c b/sys/external/bsd/drm2/dist/drm/i915/intel_fbdev.c
index 489c590dd4e..cecadd66499 100644
--- a/sys/external/bsd/drm2/dist/drm/i915/intel_fbdev.c
+++ b/sys/external/bsd/drm2/dist/drm/i915/intel_fbdev.c
@@ -1,4 +1,4 @@
-/* $NetBSD: intel_fbdev.c,v 1.12 2020/02/14 09:39:57 riastradh Exp $ */
+/* $NetBSD: intel_fbdev.c,v 1.13 2020/02/14 14:34:58 maya Exp $ */
/*
* Copyright © 2007 David Airlie
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: intel_fbdev.c,v 1.12 2020/02/14 09:39:57 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: intel_fbdev.c,v 1.13 2020/02/14 14:34:58 maya Exp $");
#include <linux/async.h>
#include <linux/module.h>
@@ -42,7 +42,6 @@ __KERNEL_RCSID(0, "$NetBSD: intel_fbdev.c,v 1.12 2020/02/14 09:39:57 riastradh E
#include <linux/fb.h>
#include <linux/init.h>
#include <linux/vga_switcheroo.h>
-#include <linux/err.h>
#include <drm/drmP.h>
#include <drm/drm_crtc.h>
diff --git a/sys/external/bsd/drm2/dist/drm/i915/intel_guc_loader.c b/sys/external/bsd/drm2/dist/drm/i915/intel_guc_loader.c
index 8606549d9a3..ef8c3d1477e 100644
--- a/sys/external/bsd/drm2/dist/drm/i915/intel_guc_loader.c
+++ b/sys/external/bsd/drm2/dist/drm/i915/intel_guc_loader.c
@@ -1,4 +1,4 @@
-/* $NetBSD: intel_guc_loader.c,v 1.13 2018/09/13 08:25:55 mrg Exp $ */
+/* $NetBSD: intel_guc_loader.c,v 1.14 2020/02/14 14:34:58 maya Exp $ */
/*
* Copyright © 2014 Intel Corporation
@@ -29,10 +29,9 @@
* Alex Dai <yu.dai@intel.com>
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: intel_guc_loader.c,v 1.13 2018/09/13 08:25:55 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: intel_guc_loader.c,v 1.14 2020/02/14 14:34:58 maya Exp $");
#include <linux/firmware.h>
-#include <linux/module.h>
#include "i915_drv.h"
#include "intel_drv.h"
#include "intel_guc.h"
diff --git a/sys/external/bsd/drm2/dist/drm/i915/intel_hdmi.c b/sys/external/bsd/drm2/dist/drm/i915/intel_hdmi.c
index ac0162b9c0d..676a7001c32 100644
--- a/sys/external/bsd/drm2/dist/drm/i915/intel_hdmi.c
+++ b/sys/external/bsd/drm2/dist/drm/i915/intel_hdmi.c
@@ -1,4 +1,4 @@
-/* $NetBSD: intel_hdmi.c,v 1.8 2020/02/14 04:36:11 riastradh Exp $ */
+/* $NetBSD: intel_hdmi.c,v 1.9 2020/02/14 14:34:58 maya Exp $ */
/*
* Copyright 2006 Dave Airlie <airlied@linux.ie>
@@ -29,13 +29,12 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: intel_hdmi.c,v 1.8 2020/02/14 04:36:11 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: intel_hdmi.c,v 1.9 2020/02/14 14:34:58 maya Exp $");
#include <linux/i2c.h>
#include <linux/slab.h>
#include <linux/delay.h>
#include <linux/hdmi.h>
-#include <asm/io.h>
#include <drm/drmP.h>
#include <drm/drm_atomic_helper.h>
#include <drm/drm_crtc.h>
diff --git a/sys/external/bsd/drm2/dist/drm/i915/intel_i2c.c b/sys/external/bsd/drm2/dist/drm/i915/intel_i2c.c
index 3a1a6b0b9f2..90200411d40 100644
--- a/sys/external/bsd/drm2/dist/drm/i915/intel_i2c.c
+++ b/sys/external/bsd/drm2/dist/drm/i915/intel_i2c.c
@@ -1,4 +1,4 @@
-/* $NetBSD: intel_i2c.c,v 1.18 2020/02/14 04:35:19 riastradh Exp $ */
+/* $NetBSD: intel_i2c.c,v 1.19 2020/02/14 14:34:58 maya Exp $ */
/*
* Copyright (c) 2006 Dave Airlie <airlied@linux.ie>
@@ -29,12 +29,11 @@
* Chris Wilson <chris@chris-wilson.co.uk>
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: intel_i2c.c,v 1.18 2020/02/14 04:35:19 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: intel_i2c.c,v 1.19 2020/02/14 14:34:58 maya Exp $");
#include <linux/i2c.h>
#include <linux/i2c-algo-bit.h>
#include <linux/export.h>
-#include <linux/module.h>
#include <drm/drmP.h>
#include "intel_drv.h"
#include <drm/i915_drm.h>
diff --git a/sys/external/bsd/drm2/dist/drm/i915/intel_lvds.c b/sys/external/bsd/drm2/dist/drm/i915/intel_lvds.c
index 67039b5093a..41b9eb0d7b0 100644
--- a/sys/external/bsd/drm2/dist/drm/i915/intel_lvds.c
+++ b/sys/external/bsd/drm2/dist/drm/i915/intel_lvds.c
@@ -1,4 +1,4 @@
-/* $NetBSD: intel_lvds.c,v 1.9 2020/02/14 09:39:37 riastradh Exp $ */
+/* $NetBSD: intel_lvds.c,v 1.10 2020/02/14 14:34:58 maya Exp $ */
/*
* Copyright © 2006-2007 Intel Corporation
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: intel_lvds.c,v 1.9 2020/02/14 09:39:37 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: intel_lvds.c,v 1.10 2020/02/14 14:34:58 maya Exp $");
#include <acpi/button.h>
#include <linux/dmi.h>
@@ -44,8 +44,6 @@ __KERNEL_RCSID(0, "$NetBSD: intel_lvds.c,v 1.9 2020/02/14 09:39:37 riastradh Exp
#include <drm/i915_drm.h>
#include "i915_drv.h"
#include <linux/acpi.h>
-#include <linux/err.h>
-#include <linux/notifier.h>
/* Private structure for the integrated LVDS support */
struct intel_lvds_connector {
diff --git a/sys/external/bsd/drm2/dist/drm/i915/intel_opregion.c b/sys/external/bsd/drm2/dist/drm/i915/intel_opregion.c
index 468b8cdf31f..ef742c1d5fe 100644
--- a/sys/external/bsd/drm2/dist/drm/i915/intel_opregion.c
+++ b/sys/external/bsd/drm2/dist/drm/i915/intel_opregion.c
@@ -1,4 +1,4 @@
-/* $NetBSD: intel_opregion.c,v 1.16 2020/02/14 04:30:05 riastradh Exp $ */
+/* $NetBSD: intel_opregion.c,v 1.17 2020/02/14 14:34:58 maya Exp $ */
/*
* Copyright 2008 Intel Corporation <hong.liu@intel.com>
@@ -28,12 +28,10 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: intel_opregion.c,v 1.16 2020/02/14 04:30:05 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: intel_opregion.c,v 1.17 2020/02/14 14:34:58 maya Exp $");
-#include <linux/printk.h>
#include <linux/acpi.h>
#include <acpi/video.h>
-#include <asm/io.h>
#include <drm/drmP.h>
#include <drm/i915_drm.h>
diff --git a/sys/external/bsd/drm2/dist/drm/i915/intel_overlay.c b/sys/external/bsd/drm2/dist/drm/i915/intel_overlay.c
index 289234a7983..f83b340dc50 100644
--- a/sys/external/bsd/drm2/dist/drm/i915/intel_overlay.c
+++ b/sys/external/bsd/drm2/dist/drm/i915/intel_overlay.c
@@ -1,4 +1,4 @@
-/* $NetBSD: intel_overlay.c,v 1.9 2020/02/14 04:36:12 riastradh Exp $ */
+/* $NetBSD: intel_overlay.c,v 1.10 2020/02/14 14:34:58 maya Exp $ */
/*
* Copyright © 2009
@@ -28,10 +28,8 @@
* Derived from Xorg ddx, xf86-video-intel, src/i830_video.c
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: intel_overlay.c,v 1.9 2020/02/14 04:36:12 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: intel_overlay.c,v 1.10 2020/02/14 14:34:58 maya Exp $");
-#include <linux/kernel.h>
-#include <asm/io.h>
#include <drm/drmP.h>
#include <drm/i915_drm.h>
#include "i915_drv.h"
diff --git a/sys/external/bsd/drm2/dist/drm/i915/intel_panel.c b/sys/external/bsd/drm2/dist/drm/i915/intel_panel.c
index 5a1d7e8d6aa..55d8b9a855d 100644
--- a/sys/external/bsd/drm2/dist/drm/i915/intel_panel.c
+++ b/sys/external/bsd/drm2/dist/drm/i915/intel_panel.c
@@ -1,4 +1,4 @@
-/* $NetBSD: intel_panel.c,v 1.13 2020/02/14 04:36:12 riastradh Exp $ */
+/* $NetBSD: intel_panel.c,v 1.14 2020/02/14 14:34:58 maya Exp $ */
/*
* Copyright © 2006-2010 Intel Corporation
@@ -31,15 +31,12 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: intel_panel.c,v 1.13 2020/02/14 04:36:12 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: intel_panel.c,v 1.14 2020/02/14 14:34:58 maya Exp $");
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
#include <linux/kernel.h>
#include <linux/moduleparam.h>
-#include <linux/module.h>
-#include <linux/printk.h>
-#include <asm/div64.h>
#include <linux/pwm.h>
#include "intel_drv.h"
diff --git a/sys/external/bsd/drm2/dist/drm/i915/intel_pm.c b/sys/external/bsd/drm2/dist/drm/i915/intel_pm.c
index f86b4431acf..dcef664b593 100644
--- a/sys/external/bsd/drm2/dist/drm/i915/intel_pm.c
+++ b/sys/external/bsd/drm2/dist/drm/i915/intel_pm.c
@@ -1,4 +1,4 @@
-/* $NetBSD: intel_pm.c,v 1.23 2020/02/14 09:39:37 riastradh Exp $ */
+/* $NetBSD: intel_pm.c,v 1.24 2020/02/14 14:34:58 maya Exp $ */
/*
* Copyright © 2012 Intel Corporation
@@ -28,11 +28,9 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: intel_pm.c,v 1.23 2020/02/14 09:39:37 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: intel_pm.c,v 1.24 2020/02/14 14:34:58 maya Exp $");
-#include <linux/bitops.h>
#include <linux/cpufreq.h>
-#include <linux/export.h>
#include "i915_drv.h"
#include "i915_trace.h"
#include "intel_drv.h"
@@ -40,9 +38,6 @@ __KERNEL_RCSID(0, "$NetBSD: intel_pm.c,v 1.23 2020/02/14 09:39:37 riastradh Exp
#include "../../../platform/x86/intel_ips.h"
#endif
#include <linux/module.h>
-#include <linux/log2.h>
-#include <linux/math64.h>
-#include <linux/time.h>
#include <linux/nbsd-namespace.h>
diff --git a/sys/external/bsd/drm2/dist/drm/i915/intel_ringbuffer.c b/sys/external/bsd/drm2/dist/drm/i915/intel_ringbuffer.c
index 65f6654ca5e..080fd497e5b 100644
--- a/sys/external/bsd/drm2/dist/drm/i915/intel_ringbuffer.c
+++ b/sys/external/bsd/drm2/dist/drm/i915/intel_ringbuffer.c
@@ -1,4 +1,4 @@
-/* $NetBSD: intel_ringbuffer.c,v 1.11 2019/12/05 20:03:09 maya Exp $ */
+/* $NetBSD: intel_ringbuffer.c,v 1.12 2020/02/14 14:34:58 maya Exp $ */
/*
* Copyright © 2008-2010 Intel Corporation
@@ -30,9 +30,8 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: intel_ringbuffer.c,v 1.11 2019/12/05 20:03:09 maya Exp $");
+__KERNEL_RCSID(0, "$NetBSD: intel_ringbuffer.c,v 1.12 2020/02/14 14:34:58 maya Exp $");
-#include <asm/param.h>
#include <drm/drmP.h>
#include "i915_drv.h"
#include <drm/i915_drm.h>
diff --git a/sys/external/bsd/drm2/dist/drm/i915/intel_ringbuffer.h b/sys/external/bsd/drm2/dist/drm/i915/intel_ringbuffer.h
index f743bcb15dd..174c3e6316e 100644
--- a/sys/external/bsd/drm2/dist/drm/i915/intel_ringbuffer.h
+++ b/sys/external/bsd/drm2/dist/drm/i915/intel_ringbuffer.h
@@ -1,9 +1,8 @@
-/* $NetBSD: intel_ringbuffer.h,v 1.7 2019/12/05 20:03:09 maya Exp $ */
+/* $NetBSD: intel_ringbuffer.h,v 1.8 2020/02/14 14:34:58 maya Exp $ */
#ifndef _INTEL_RINGBUFFER_H_
#define _INTEL_RINGBUFFER_H_
-#include <asm/bug.h>
#include <linux/hashtable.h>
#include "i915_gem_batch_pool.h"
diff --git a/sys/external/bsd/drm2/dist/drm/i915/intel_sdvo.c b/sys/external/bsd/drm2/dist/drm/i915/intel_sdvo.c
index bee6b12dd91..3d42325cb12 100644
--- a/sys/external/bsd/drm2/dist/drm/i915/intel_sdvo.c
+++ b/sys/external/bsd/drm2/dist/drm/i915/intel_sdvo.c
@@ -1,4 +1,4 @@
-/* $NetBSD: intel_sdvo.c,v 1.14 2020/02/14 09:39:38 riastradh Exp $ */
+/* $NetBSD: intel_sdvo.c,v 1.15 2020/02/14 14:34:58 maya Exp $ */
/*
* Copyright 2006 Dave Airlie <airlied@linux.ie>
@@ -28,15 +28,12 @@
* Eric Anholt <eric@anholt.net>
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: intel_sdvo.c,v 1.14 2020/02/14 09:39:38 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: intel_sdvo.c,v 1.15 2020/02/14 14:34:58 maya Exp $");
#include <linux/i2c.h>
#include <linux/slab.h>
#include <linux/delay.h>
-#include <linux/module.h>
#include <linux/export.h>
-#include <linux/bitops.h>
-#include <linux/module.h>
#include <drm/drmP.h>
#include <drm/drm_atomic_helper.h>
#include <drm/drm_crtc.h>
diff --git a/sys/external/bsd/drm2/dist/drm/i915/intel_uncore.c b/sys/external/bsd/drm2/dist/drm/i915/intel_uncore.c
index adce81a4e98..02ed9de8fb4 100644
--- a/sys/external/bsd/drm2/dist/drm/i915/intel_uncore.c
+++ b/sys/external/bsd/drm2/dist/drm/i915/intel_uncore.c
@@ -1,4 +1,4 @@
-/* $NetBSD: intel_uncore.c,v 1.12 2020/02/14 04:36:56 riastradh Exp $ */
+/* $NetBSD: intel_uncore.c,v 1.13 2020/02/14 14:34:58 maya Exp $ */
/*
* Copyright © 2013 Intel Corporation
@@ -24,14 +24,13 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: intel_uncore.c,v 1.12 2020/02/14 04:36:56 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: intel_uncore.c,v 1.13 2020/02/14 14:34:58 maya Exp $");
#include "i915_drv.h"
#include "intel_drv.h"
#include "i915_vgpu.h"
#include "i915_trace.h"
-#include <linux/err.h>
#include <linux/pm_runtime.h>
#define FORCEWAKE_ACK_TIMEOUT_MS 50
diff --git a/sys/external/bsd/drm2/dist/drm/nouveau/dispnv04/nouveau_dispnv04_disp.c b/sys/external/bsd/drm2/dist/drm/nouveau/dispnv04/nouveau_dispnv04_disp.c
index 52459be3484..1bd28548318 100644
--- a/sys/external/bsd/drm2/dist/drm/nouveau/dispnv04/nouveau_dispnv04_disp.c
+++ b/sys/external/bsd/drm2/dist/drm/nouveau/dispnv04/nouveau_dispnv04_disp.c
@@ -1,4 +1,4 @@
-/* $NetBSD: nouveau_dispnv04_disp.c,v 1.4 2018/08/27 14:48:21 riastradh Exp $ */
+/* $NetBSD: nouveau_dispnv04_disp.c,v 1.5 2020/02/14 14:34:58 maya Exp $ */
/*
* Copyright 2009 Red Hat Inc.
@@ -25,9 +25,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nouveau_dispnv04_disp.c,v 1.4 2018/08/27 14:48:21 riastradh Exp $");
-
-#include <linux/err.h>
+__KERNEL_RCSID(0, "$NetBSD: nouveau_dispnv04_disp.c,v 1.5 2020/02/14 14:34:58 maya Exp $");
#include <drm/drmP.h>
#include <drm/drm_crtc_helper.h>
diff --git a/sys/external/bsd/drm2/dist/drm/nouveau/dispnv04/nouveau_dispnv04_tvmodesnv17.c b/sys/external/bsd/drm2/dist/drm/nouveau/dispnv04/nouveau_dispnv04_tvmodesnv17.c
index f96a68fcdad..e521aece6f1 100644
--- a/sys/external/bsd/drm2/dist/drm/nouveau/dispnv04/nouveau_dispnv04_tvmodesnv17.c
+++ b/sys/external/bsd/drm2/dist/drm/nouveau/dispnv04/nouveau_dispnv04_tvmodesnv17.c
@@ -1,4 +1,4 @@
-/* $NetBSD: nouveau_dispnv04_tvmodesnv17.c,v 1.4 2018/08/27 04:58:29 riastradh Exp $ */
+/* $NetBSD: nouveau_dispnv04_tvmodesnv17.c,v 1.5 2020/02/14 14:34:58 maya Exp $ */
/*
* Copyright (C) 2009 Francisco Jerez.
@@ -27,9 +27,8 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nouveau_dispnv04_tvmodesnv17.c,v 1.4 2018/08/27 04:58:29 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nouveau_dispnv04_tvmodesnv17.c,v 1.5 2020/02/14 14:34:58 maya Exp $");
-#include <asm/div64.h> /* XXX */
#include <drm/drmP.h>
#include <drm/drm_crtc_helper.h>
#include "nouveau_drm.h"
diff --git a/sys/external/bsd/drm2/dist/drm/nouveau/dispnv04/nouveau_dispnv04_tvnv04.c b/sys/external/bsd/drm2/dist/drm/nouveau/dispnv04/nouveau_dispnv04_tvnv04.c
index cdf0391e42f..badcd8abc23 100644
--- a/sys/external/bsd/drm2/dist/drm/nouveau/dispnv04/nouveau_dispnv04_tvnv04.c
+++ b/sys/external/bsd/drm2/dist/drm/nouveau/dispnv04/nouveau_dispnv04_tvnv04.c
@@ -1,4 +1,4 @@
-/* $NetBSD: nouveau_dispnv04_tvnv04.c,v 1.4 2018/08/27 07:35:03 riastradh Exp $ */
+/* $NetBSD: nouveau_dispnv04_tvnv04.c,v 1.5 2020/02/14 14:34:58 maya Exp $ */
/*
* Copyright (C) 2009 Francisco Jerez.
@@ -27,9 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nouveau_dispnv04_tvnv04.c,v 1.4 2018/08/27 07:35:03 riastradh Exp $");
-
-#include <linux/err.h>
+__KERNEL_RCSID(0, "$NetBSD: nouveau_dispnv04_tvnv04.c,v 1.5 2020/02/14 14:34:58 maya Exp $");
#include <drm/drmP.h>
#include "nouveau_drm.h"
diff --git a/sys/external/bsd/drm2/dist/drm/nouveau/include/nvkm/core/device.h b/sys/external/bsd/drm2/dist/drm/nouveau/include/nvkm/core/device.h
index 049d019cc3c..7a149a63583 100644
--- a/sys/external/bsd/drm2/dist/drm/nouveau/include/nvkm/core/device.h
+++ b/sys/external/bsd/drm2/dist/drm/nouveau/include/nvkm/core/device.h
@@ -1,8 +1,7 @@
-/* $NetBSD: device.h,v 1.7 2018/08/29 19:31:35 mrg Exp $ */
+/* $NetBSD: device.h,v 1.8 2020/02/14 14:34:58 maya Exp $ */
#ifndef __NVKM_DEVICE_H__
#define __NVKM_DEVICE_H__
-#include <linux/notifier.h>
#include <core/event.h>
#include <core/object.h>
diff --git a/sys/external/bsd/drm2/dist/drm/nouveau/nouveau_bios.h b/sys/external/bsd/drm2/dist/drm/nouveau/nouveau_bios.h
index 08f143e951b..78e913ea296 100644
--- a/sys/external/bsd/drm2/dist/drm/nouveau/nouveau_bios.h
+++ b/sys/external/bsd/drm2/dist/drm/nouveau/nouveau_bios.h
@@ -1,4 +1,4 @@
-/* $NetBSD: nouveau_bios.h,v 1.3 2018/08/27 04:58:24 riastradh Exp $ */
+/* $NetBSD: nouveau_bios.h,v 1.4 2020/02/14 14:34:58 maya Exp $ */
/*
* Copyright 2007-2008 Nouveau Project
@@ -26,8 +26,6 @@
#ifndef __NOUVEAU_DISPBIOS_H__
#define __NOUVEAU_DISPBIOS_H__
-#include <asm/byteorder.h>
-
#define DCB_MAX_NUM_ENTRIES 16
#define DCB_MAX_NUM_I2C_ENTRIES 16
#define DCB_MAX_NUM_GPIO_ENTRIES 32
diff --git a/sys/external/bsd/drm2/dist/drm/nouveau/nouveau_connector.c b/sys/external/bsd/drm2/dist/drm/nouveau/nouveau_connector.c
index 4d108dae1f1..a67c96b50e4 100644
--- a/sys/external/bsd/drm2/dist/drm/nouveau/nouveau_connector.c
+++ b/sys/external/bsd/drm2/dist/drm/nouveau/nouveau_connector.c
@@ -1,4 +1,4 @@
-/* $NetBSD: nouveau_connector.c,v 1.4 2018/08/27 04:58:24 riastradh Exp $ */
+/* $NetBSD: nouveau_connector.c,v 1.5 2020/02/14 14:34:58 maya Exp $ */
/*
* Copyright (C) 2008 Maarten Maathuis.
@@ -27,13 +27,11 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nouveau_connector.c,v 1.4 2018/08/27 04:58:24 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nouveau_connector.c,v 1.5 2020/02/14 14:34:58 maya Exp $");
#include <acpi/button.h>
-#include <linux/err.h>
#include <linux/pm_runtime.h>
-#include <linux/string.h>
#include <drm/drmP.h>
#include <drm/drm_edid.h>
diff --git a/sys/external/bsd/drm2/dist/drm/nouveau/nouveau_display.c b/sys/external/bsd/drm2/dist/drm/nouveau/nouveau_display.c
index 88e3df844b3..e9cd422f32f 100644
--- a/sys/external/bsd/drm2/dist/drm/nouveau/nouveau_display.c
+++ b/sys/external/bsd/drm2/dist/drm/nouveau/nouveau_display.c
@@ -1,4 +1,4 @@
-/* $NetBSD: nouveau_display.c,v 1.3 2018/08/27 04:58:24 riastradh Exp $ */
+/* $NetBSD: nouveau_display.c,v 1.4 2020/02/14 14:34:58 maya Exp $ */
/*
* Copyright (C) 2008 Maarten Maathuis.
@@ -27,9 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nouveau_display.c,v 1.3 2018/08/27 04:58:24 riastradh Exp $");
-
-#include <linux/err.h>
+__KERNEL_RCSID(0, "$NetBSD: nouveau_display.c,v 1.4 2020/02/14 14:34:58 maya Exp $");
#include <drm/drmP.h>
#include <drm/drm_crtc_helper.h>
diff --git a/sys/external/bsd/drm2/dist/drm/nouveau/nouveau_fence.c b/sys/external/bsd/drm2/dist/drm/nouveau/nouveau_fence.c
index 9deceae2ff5..49ac743a2f7 100644
--- a/sys/external/bsd/drm2/dist/drm/nouveau/nouveau_fence.c
+++ b/sys/external/bsd/drm2/dist/drm/nouveau/nouveau_fence.c
@@ -1,4 +1,4 @@
-/* $NetBSD: nouveau_fence.c,v 1.14 2019/04/16 10:00:04 mrg Exp $ */
+/* $NetBSD: nouveau_fence.c,v 1.15 2020/02/14 14:34:58 maya Exp $ */
/*
* Copyright (C) 2007 Ben Skeggs.
@@ -27,11 +27,10 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nouveau_fence.c,v 1.14 2019/04/16 10:00:04 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nouveau_fence.c,v 1.15 2020/02/14 14:34:58 maya Exp $");
#include <drm/drmP.h>
-#include <asm/param.h>
#include <linux/ktime.h>
#include <linux/hrtimer.h>
#include <trace/events/fence.h>
diff --git a/sys/external/bsd/drm2/dist/drm/nouveau/nouveau_gem.c b/sys/external/bsd/drm2/dist/drm/nouveau/nouveau_gem.c
index 4ee887acc44..e017bdca353 100644
--- a/sys/external/bsd/drm2/dist/drm/nouveau/nouveau_gem.c
+++ b/sys/external/bsd/drm2/dist/drm/nouveau/nouveau_gem.c
@@ -1,4 +1,4 @@
-/* $NetBSD: nouveau_gem.c,v 1.10 2020/02/14 04:38:48 riastradh Exp $ */
+/* $NetBSD: nouveau_gem.c,v 1.11 2020/02/14 14:34:58 maya Exp $ */
/*
* Copyright (C) 2008 Ben Skeggs.
@@ -27,9 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nouveau_gem.c,v 1.10 2020/02/14 04:38:48 riastradh Exp $");
-
-#include <linux/err.h> /* XXX */
+__KERNEL_RCSID(0, "$NetBSD: nouveau_gem.c,v 1.11 2020/02/14 14:34:58 maya Exp $");
#include "nouveau_drm.h"
#include "nouveau_dma.h"
diff --git a/sys/external/bsd/drm2/dist/drm/nouveau/nouveau_nv50_display.c b/sys/external/bsd/drm2/dist/drm/nouveau/nouveau_nv50_display.c
index 8e418e7158d..14c2ffbc101 100644
--- a/sys/external/bsd/drm2/dist/drm/nouveau/nouveau_nv50_display.c
+++ b/sys/external/bsd/drm2/dist/drm/nouveau/nouveau_nv50_display.c
@@ -1,4 +1,4 @@
-/* $NetBSD: nouveau_nv50_display.c,v 1.10 2018/08/27 14:48:21 riastradh Exp $ */
+/* $NetBSD: nouveau_nv50_display.c,v 1.11 2020/02/14 14:34:58 maya Exp $ */
/*
* Copyright 2011 Red Hat Inc.
@@ -25,10 +25,9 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nouveau_nv50_display.c,v 1.10 2018/08/27 14:48:21 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nouveau_nv50_display.c,v 1.11 2020/02/14 14:34:58 maya Exp $");
#include <linux/dma-mapping.h>
-#include <linux/err.h>
#include <drm/drmP.h>
#include <drm/drm_crtc_helper.h>
diff --git a/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/engine/disp/nouveau_nvkm_engine_disp_gf119.c b/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/engine/disp/nouveau_nvkm_engine_disp_gf119.c
index caf797e02a0..feee977e845 100644
--- a/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/engine/disp/nouveau_nvkm_engine_disp_gf119.c
+++ b/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/engine/disp/nouveau_nvkm_engine_disp_gf119.c
@@ -1,4 +1,4 @@
-/* $NetBSD: nouveau_nvkm_engine_disp_gf119.c,v 1.2 2018/08/27 04:58:31 riastradh Exp $ */
+/* $NetBSD: nouveau_nvkm_engine_disp_gf119.c,v 1.3 2020/02/14 14:34:59 maya Exp $ */
/*
* Copyright 2012 Red Hat Inc.
@@ -24,7 +24,7 @@
* Authors: Ben Skeggs
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nouveau_nvkm_engine_disp_gf119.c,v 1.2 2018/08/27 04:58:31 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nouveau_nvkm_engine_disp_gf119.c,v 1.3 2020/02/14 14:34:59 maya Exp $");
#include "nv50.h"
#include "rootnv50.h"
@@ -35,8 +35,6 @@ __KERNEL_RCSID(0, "$NetBSD: nouveau_nvkm_engine_disp_gf119.c,v 1.2 2018/08/27 04
#include <subdev/bios/pll.h>
#include <subdev/devinit.h>
-#include <asm/div64.h> /* XXX */
-
void
gf119_disp_vblank_init(struct nv50_disp *disp, int head)
{
diff --git a/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/engine/disp/nouveau_nvkm_engine_disp_nv50.c b/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/engine/disp/nouveau_nvkm_engine_disp_nv50.c
index 3df0f6ac301..7f0c00e0086 100644
--- a/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/engine/disp/nouveau_nvkm_engine_disp_nv50.c
+++ b/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/engine/disp/nouveau_nvkm_engine_disp_nv50.c
@@ -1,4 +1,4 @@
-/* $NetBSD: nouveau_nvkm_engine_disp_nv50.c,v 1.2 2018/08/27 04:58:31 riastradh Exp $ */
+/* $NetBSD: nouveau_nvkm_engine_disp_nv50.c,v 1.3 2020/02/14 14:34:59 maya Exp $ */
/*
* Copyright 2012 Red Hat Inc.
@@ -24,7 +24,7 @@
* Authors: Ben Skeggs
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nouveau_nvkm_engine_disp_nv50.c,v 1.2 2018/08/27 04:58:31 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nouveau_nvkm_engine_disp_nv50.c,v 1.3 2020/02/14 14:34:59 maya Exp $");
#include "nv50.h"
#include "rootnv50.h"
@@ -38,9 +38,6 @@ __KERNEL_RCSID(0, "$NetBSD: nouveau_nvkm_engine_disp_nv50.c,v 1.2 2018/08/27 04:
#include <subdev/bios/pll.h>
#include <subdev/devinit.h>
-#include <asm/div64.h> /* XXX */
-#include <linux/bitops.h> /* XXX */
-
static const struct nvkm_disp_oclass *
nv50_disp_root_(struct nvkm_disp *base)
{
diff --git a/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/engine/gr/nouveau_nvkm_engine_gr_gf100.c b/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/engine/gr/nouveau_nvkm_engine_gr_gf100.c
index c4dd22e4be5..e3ff936dce5 100644
--- a/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/engine/gr/nouveau_nvkm_engine_gr_gf100.c
+++ b/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/engine/gr/nouveau_nvkm_engine_gr_gf100.c
@@ -1,4 +1,4 @@
-/* $NetBSD: nouveau_nvkm_engine_gr_gf100.c,v 1.3 2018/08/27 07:38:56 riastradh Exp $ */
+/* $NetBSD: nouveau_nvkm_engine_gr_gf100.c,v 1.4 2020/02/14 14:34:59 maya Exp $ */
/*
* Copyright 2012 Red Hat Inc.
@@ -24,9 +24,7 @@
* Authors: Ben Skeggs
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nouveau_nvkm_engine_gr_gf100.c,v 1.3 2018/08/27 07:38:56 riastradh Exp $");
-
-#include <linux/string.h> /* XXX */
+__KERNEL_RCSID(0, "$NetBSD: nouveau_nvkm_engine_gr_gf100.c,v 1.4 2020/02/14 14:34:59 maya Exp $");
#include "gf100.h"
#include "ctxgf100.h"
diff --git a/sys/external/bsd/drm2/dist/drm/radeon/radeon.h b/sys/external/bsd/drm2/dist/drm/radeon/radeon.h
index 4ce7e06e921..8fb7ade480e 100644
--- a/sys/external/bsd/drm2/dist/drm/radeon/radeon.h
+++ b/sys/external/bsd/drm2/dist/drm/radeon/radeon.h
@@ -1,4 +1,4 @@
-/* $NetBSD: radeon.h,v 1.8 2020/02/14 04:37:43 riastradh Exp $ */
+/* $NetBSD: radeon.h,v 1.9 2020/02/14 14:34:59 maya Exp $ */
/*
* Copyright 2008 Advanced Micro Devices, Inc.
@@ -62,7 +62,6 @@
* are considered as fatal)
*/
-#include <asm/byteorder.h>
#include <linux/atomic.h>
#include <linux/wait.h>
#include <linux/list.h>
@@ -70,11 +69,6 @@
#include <linux/interval_tree.h>
#include <linux/hashtable.h>
#include <linux/fence.h>
-#include <linux/device.h>
-#include <linux/log2.h>
-#include <linux/notifier.h>
-#include <linux/printk.h>
-#include <linux/rwsem.h>
#include <ttm/ttm_bo_api.h>
#include <ttm/ttm_bo_driver.h>
diff --git a/sys/external/bsd/drm2/dist/drm/radeon/radeon_bios.c b/sys/external/bsd/drm2/dist/drm/radeon/radeon_bios.c
index a2c80e08ac4..929cdb85883 100644
--- a/sys/external/bsd/drm2/dist/drm/radeon/radeon_bios.c
+++ b/sys/external/bsd/drm2/dist/drm/radeon/radeon_bios.c
@@ -1,4 +1,4 @@
-/* $NetBSD: radeon_bios.c,v 1.6 2018/08/27 13:55:59 riastradh Exp $ */
+/* $NetBSD: radeon_bios.c,v 1.7 2020/02/14 14:34:59 maya Exp $ */
/*
* Copyright 2008 Advanced Micro Devices, Inc.
@@ -28,7 +28,7 @@
* Jerome Glisse
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: radeon_bios.c,v 1.6 2018/08/27 13:55:59 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: radeon_bios.c,v 1.7 2020/02/14 14:34:59 maya Exp $");
#include <drm/drmP.h>
#include "radeon_reg.h"
@@ -37,7 +37,6 @@ __KERNEL_RCSID(0, "$NetBSD: radeon_bios.c,v 1.6 2018/08/27 13:55:59 riastradh Ex
#include <linux/slab.h>
#include <linux/acpi.h>
-#include <linux/string.h>
/*
* BIOS.
*/
diff --git a/sys/external/bsd/drm2/dist/drm/radeon/radeon_cik_sdma.c b/sys/external/bsd/drm2/dist/drm/radeon/radeon_cik_sdma.c
index 11607da321e..49ede04b605 100644
--- a/sys/external/bsd/drm2/dist/drm/radeon/radeon_cik_sdma.c
+++ b/sys/external/bsd/drm2/dist/drm/radeon/radeon_cik_sdma.c
@@ -1,4 +1,4 @@
-/* $NetBSD: radeon_cik_sdma.c,v 1.1 2018/08/27 14:38:20 riastradh Exp $ */
+/* $NetBSD: radeon_cik_sdma.c,v 1.2 2020/02/14 14:34:59 maya Exp $ */
/*
* Copyright 2013 Advanced Micro Devices, Inc.
@@ -24,10 +24,9 @@
* Authors: Alex Deucher
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: radeon_cik_sdma.c,v 1.1 2018/08/27 14:38:20 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: radeon_cik_sdma.c,v 1.2 2020/02/14 14:34:59 maya Exp $");
#include <linux/firmware.h>
-#include <linux/err.h>
#include <drm/drmP.h>
#include "radeon.h"
#include "radeon_ucode.h"
diff --git a/sys/external/bsd/drm2/dist/drm/radeon/radeon_device.c b/sys/external/bsd/drm2/dist/drm/radeon/radeon_device.c
index fe9fc3c11c8..d98873ff241 100644
--- a/sys/external/bsd/drm2/dist/drm/radeon/radeon_device.c
+++ b/sys/external/bsd/drm2/dist/drm/radeon/radeon_device.c
@@ -1,4 +1,4 @@
-/* $NetBSD: radeon_device.c,v 1.9 2020/02/14 04:37:09 riastradh Exp $ */
+/* $NetBSD: radeon_device.c,v 1.10 2020/02/14 14:34:59 maya Exp $ */
/*
* Copyright 2008 Advanced Micro Devices, Inc.
@@ -28,7 +28,7 @@
* Jerome Glisse
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: radeon_device.c,v 1.9 2020/02/14 04:37:09 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: radeon_device.c,v 1.10 2020/02/14 14:34:59 maya Exp $");
#include <linux/console.h>
#include <linux/slab.h>
@@ -38,7 +38,6 @@ __KERNEL_RCSID(0, "$NetBSD: radeon_device.c,v 1.9 2020/02/14 04:37:09 riastradh
#include <linux/vgaarb.h>
#include <linux/vga_switcheroo.h>
#include <linux/efi.h>
-#include <linux/bitops.h>
#include "radeon_reg.h"
#include "radeon.h"
#include "atom.h"
diff --git a/sys/external/bsd/drm2/dist/drm/radeon/radeon_display.c b/sys/external/bsd/drm2/dist/drm/radeon/radeon_display.c
index 170ced0eeb3..971a7843c16 100644
--- a/sys/external/bsd/drm2/dist/drm/radeon/radeon_display.c
+++ b/sys/external/bsd/drm2/dist/drm/radeon/radeon_display.c
@@ -1,4 +1,4 @@
-/* $NetBSD: radeon_display.c,v 1.10 2019/01/30 01:11:08 mrg Exp $ */
+/* $NetBSD: radeon_display.c,v 1.11 2020/02/14 14:34:59 maya Exp $ */
/*
* Copyright 2007-8 Advanced Micro Devices, Inc.
@@ -26,7 +26,7 @@
* Alex Deucher
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: radeon_display.c,v 1.10 2019/01/30 01:11:08 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: radeon_display.c,v 1.11 2020/02/14 14:34:59 maya Exp $");
#include <drm/drmP.h>
#include <drm/radeon_drm.h>
@@ -35,7 +35,6 @@ __KERNEL_RCSID(0, "$NetBSD: radeon_display.c,v 1.10 2019/01/30 01:11:08 mrg Exp
#include "atom.h"
#include <asm/div64.h>
-#include <linux/err.h>
#include <linux/pm_runtime.h>
#include <drm/drm_crtc_helper.h>
#include <drm/drm_plane_helper.h>
diff --git a/sys/external/bsd/drm2/dist/drm/radeon/radeon_drv.c b/sys/external/bsd/drm2/dist/drm/radeon/radeon_drv.c
index 7947dacb589..736ef732aa0 100644
--- a/sys/external/bsd/drm2/dist/drm/radeon/radeon_drv.c
+++ b/sys/external/bsd/drm2/dist/drm/radeon/radeon_drv.c
@@ -1,4 +1,4 @@
-/* $NetBSD: radeon_drv.c,v 1.9 2018/08/28 03:41:39 riastradh Exp $ */
+/* $NetBSD: radeon_drv.c,v 1.10 2020/02/14 14:34:59 maya Exp $ */
/**
* \file radeon_drv.c
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: radeon_drv.c,v 1.9 2018/08/28 03:41:39 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: radeon_drv.c,v 1.10 2020/02/14 14:34:59 maya Exp $");
#include <drm/drmP.h>
#include <drm/radeon_drm.h>
@@ -41,7 +41,6 @@ __KERNEL_RCSID(0, "$NetBSD: radeon_drv.c,v 1.9 2018/08/28 03:41:39 riastradh Exp
#include <drm/drm_pciids.h>
#include <linux/console.h>
#include <linux/module.h>
-#include <linux/moduleparam.h>
#include <linux/pm_runtime.h>
#include <linux/vga_switcheroo.h>
#include <drm/drm_gem.h>
diff --git a/sys/external/bsd/drm2/dist/drm/radeon/radeon_evergreen.c b/sys/external/bsd/drm2/dist/drm/radeon/radeon_evergreen.c
index 39ed2c7962a..07603e38dbc 100644
--- a/sys/external/bsd/drm2/dist/drm/radeon/radeon_evergreen.c
+++ b/sys/external/bsd/drm2/dist/drm/radeon/radeon_evergreen.c
@@ -1,4 +1,4 @@
-/* $NetBSD: radeon_evergreen.c,v 1.3 2019/10/04 12:29:05 mrg Exp $ */
+/* $NetBSD: radeon_evergreen.c,v 1.4 2020/02/14 14:34:59 maya Exp $ */
/*
* Copyright 2010 Advanced Micro Devices, Inc.
@@ -24,9 +24,8 @@
* Authors: Alex Deucher
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: radeon_evergreen.c,v 1.3 2019/10/04 12:29:05 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: radeon_evergreen.c,v 1.4 2020/02/14 14:34:59 maya Exp $");
-#include <linux/bitops.h>
#include <linux/firmware.h>
#include <linux/slab.h>
#include <drm/drmP.h>
diff --git a/sys/external/bsd/drm2/dist/drm/radeon/radeon_i2c.c b/sys/external/bsd/drm2/dist/drm/radeon/radeon_i2c.c
index 76e2add7d60..0ccb21941cc 100644
--- a/sys/external/bsd/drm2/dist/drm/radeon/radeon_i2c.c
+++ b/sys/external/bsd/drm2/dist/drm/radeon/radeon_i2c.c
@@ -1,4 +1,4 @@
-/* $NetBSD: radeon_i2c.c,v 1.6 2020/02/14 04:35:20 riastradh Exp $ */
+/* $NetBSD: radeon_i2c.c,v 1.7 2020/02/14 14:34:59 maya Exp $ */
/*
* Copyright 2007-8 Advanced Micro Devices, Inc.
@@ -26,10 +26,9 @@
* Alex Deucher
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: radeon_i2c.c,v 1.6 2020/02/14 04:35:20 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: radeon_i2c.c,v 1.7 2020/02/14 14:34:59 maya Exp $");
#include <linux/export.h>
-#include <linux/module.h>
#include <drm/drmP.h>
#include <drm/drm_edid.h>
diff --git a/sys/external/bsd/drm2/dist/drm/radeon/radeon_r600.c b/sys/external/bsd/drm2/dist/drm/radeon/radeon_r600.c
index a377bf59ca8..33737013e52 100644
--- a/sys/external/bsd/drm2/dist/drm/radeon/radeon_r600.c
+++ b/sys/external/bsd/drm2/dist/drm/radeon/radeon_r600.c
@@ -1,4 +1,4 @@
-/* $NetBSD: radeon_r600.c,v 1.4 2020/02/14 04:35:20 riastradh Exp $ */
+/* $NetBSD: radeon_r600.c,v 1.5 2020/02/14 14:34:59 maya Exp $ */
/*
* Copyright 2008 Advanced Micro Devices, Inc.
@@ -28,9 +28,8 @@
* Jerome Glisse
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: radeon_r600.c,v 1.4 2020/02/14 04:35:20 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: radeon_r600.c,v 1.5 2020/02/14 14:34:59 maya Exp $");
-#include <linux/bitops.h>
#include <linux/slab.h>
#include <linux/seq_file.h>
#include <linux/firmware.h>
diff --git a/sys/external/bsd/drm2/dist/drm/radeon/radeon_ring.c b/sys/external/bsd/drm2/dist/drm/radeon/radeon_ring.c
index 892e60adbf7..c9ec8c73279 100644
--- a/sys/external/bsd/drm2/dist/drm/radeon/radeon_ring.c
+++ b/sys/external/bsd/drm2/dist/drm/radeon/radeon_ring.c
@@ -1,4 +1,4 @@
-/* $NetBSD: radeon_ring.c,v 1.3 2018/08/27 04:58:36 riastradh Exp $ */
+/* $NetBSD: radeon_ring.c,v 1.4 2020/02/14 14:34:59 maya Exp $ */
/*
* Copyright 2008 Advanced Micro Devices, Inc.
@@ -29,9 +29,8 @@
* Christian König
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: radeon_ring.c,v 1.3 2018/08/27 04:58:36 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: radeon_ring.c,v 1.4 2020/02/14 14:34:59 maya Exp $");
-#include <linux/jiffies.h>
#include <drm/drmP.h>
#include "radeon.h"
diff --git a/sys/external/bsd/drm2/dist/drm/radeon/radeon_si_dpm.c b/sys/external/bsd/drm2/dist/drm/radeon/radeon_si_dpm.c
index 23f32161b45..a468876f635 100644
--- a/sys/external/bsd/drm2/dist/drm/radeon/radeon_si_dpm.c
+++ b/sys/external/bsd/drm2/dist/drm/radeon/radeon_si_dpm.c
@@ -1,4 +1,4 @@
-/* $NetBSD: radeon_si_dpm.c,v 1.3 2020/02/14 04:29:42 riastradh Exp $ */
+/* $NetBSD: radeon_si_dpm.c,v 1.4 2020/02/14 14:34:59 maya Exp $ */
/*
* Copyright 2013 Advanced Micro Devices, Inc.
@@ -24,7 +24,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: radeon_si_dpm.c,v 1.3 2020/02/14 04:29:42 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: radeon_si_dpm.c,v 1.4 2020/02/14 14:34:59 maya Exp $");
#include "drmP.h"
#include "radeon.h"
@@ -35,7 +35,6 @@ __KERNEL_RCSID(0, "$NetBSD: radeon_si_dpm.c,v 1.3 2020/02/14 04:29:42 riastradh
#include "atom.h"
#include <linux/math64.h>
#include <linux/seq_file.h>
-#include <linux/bitops.h>
#define MC_CG_ARB_FREQ_F0 0x0a
#define MC_CG_ARB_FREQ_F1 0x0b
diff --git a/sys/external/bsd/drm2/dist/drm/ttm/ttm_bo.c b/sys/external/bsd/drm2/dist/drm/ttm/ttm_bo.c
index f53b82ee45f..fde4262701d 100644
--- a/sys/external/bsd/drm2/dist/drm/ttm/ttm_bo.c
+++ b/sys/external/bsd/drm2/dist/drm/ttm/ttm_bo.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ttm_bo.c,v 1.18 2020/02/14 04:37:28 riastradh Exp $ */
+/* $NetBSD: ttm_bo.c,v 1.19 2020/02/14 14:34:59 maya Exp $ */
/**************************************************************************
*
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ttm_bo.c,v 1.18 2020/02/14 04:37:28 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ttm_bo.c,v 1.19 2020/02/14 14:34:59 maya Exp $");
#define pr_fmt(fmt) "[TTM] " fmt
@@ -53,9 +53,6 @@ __KERNEL_RCSID(0, "$NetBSD: ttm_bo.c,v 1.18 2020/02/14 04:37:28 riastradh Exp $"
#include <linux/module.h>
#include <linux/atomic.h>
#include <linux/reservation.h>
-#include <linux/printk.h>
-#include <linux/export.h>
-#include <linux/fence.h>
#include <linux/nbsd-namespace.h>
diff --git a/sys/external/bsd/drm2/dist/drm/ttm/ttm_bo_manager.c b/sys/external/bsd/drm2/dist/drm/ttm/ttm_bo_manager.c
index 08752e4eed1..20bc3842f56 100644
--- a/sys/external/bsd/drm2/dist/drm/ttm/ttm_bo_manager.c
+++ b/sys/external/bsd/drm2/dist/drm/ttm/ttm_bo_manager.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ttm_bo_manager.c,v 1.3 2018/08/27 04:58:37 riastradh Exp $ */
+/* $NetBSD: ttm_bo_manager.c,v 1.4 2020/02/14 14:34:59 maya Exp $ */
/**************************************************************************
*
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ttm_bo_manager.c,v 1.3 2018/08/27 04:58:37 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ttm_bo_manager.c,v 1.4 2020/02/14 14:34:59 maya Exp $");
#include <drm/ttm/ttm_module.h>
#include <drm/ttm/ttm_bo_driver.h>
@@ -40,7 +40,6 @@ __KERNEL_RCSID(0, "$NetBSD: ttm_bo_manager.c,v 1.3 2018/08/27 04:58:37 riastradh
#include <linux/slab.h>
#include <linux/spinlock.h>
#include <linux/module.h>
-#include <linux/export.h>
/**
* Currently we use a spinlock for the lock, but a mutex *may* be
diff --git a/sys/external/bsd/drm2/dist/drm/ttm/ttm_bo_util.c b/sys/external/bsd/drm2/dist/drm/ttm/ttm_bo_util.c
index 2aa777192f9..89d413470a9 100644
--- a/sys/external/bsd/drm2/dist/drm/ttm/ttm_bo_util.c
+++ b/sys/external/bsd/drm2/dist/drm/ttm/ttm_bo_util.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ttm_bo_util.c,v 1.18 2020/02/14 04:37:28 riastradh Exp $ */
+/* $NetBSD: ttm_bo_util.c,v 1.19 2020/02/14 14:34:59 maya Exp $ */
/**************************************************************************
*
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ttm_bo_util.c,v 1.18 2020/02/14 04:37:28 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ttm_bo_util.c,v 1.19 2020/02/14 14:34:59 maya Exp $");
#include <drm/ttm/ttm_bo_driver.h>
#include <drm/ttm/ttm_placement.h>
@@ -43,8 +43,6 @@ __KERNEL_RCSID(0, "$NetBSD: ttm_bo_util.c,v 1.18 2020/02/14 04:37:28 riastradh E
#include <linux/vmalloc.h>
#include <linux/module.h>
#include <linux/reservation.h>
-#include <linux/export.h>
-#include <asm/barrier.h>
#ifdef __NetBSD__ /* PMAP_* caching flags for ttm_io_prot */
#include <uvm/uvm_pmap.h>
diff --git a/sys/external/bsd/drm2/dist/drm/ttm/ttm_execbuf_util.c b/sys/external/bsd/drm2/dist/drm/ttm/ttm_execbuf_util.c
index 71973d6d01f..a27a5545537 100644
--- a/sys/external/bsd/drm2/dist/drm/ttm/ttm_execbuf_util.c
+++ b/sys/external/bsd/drm2/dist/drm/ttm/ttm_execbuf_util.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ttm_execbuf_util.c,v 1.4 2018/08/27 07:53:39 riastradh Exp $ */
+/* $NetBSD: ttm_execbuf_util.c,v 1.5 2020/02/14 14:34:59 maya Exp $ */
/**************************************************************************
*
@@ -28,7 +28,7 @@
**************************************************************************/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ttm_execbuf_util.c,v 1.4 2018/08/27 07:53:39 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ttm_execbuf_util.c,v 1.5 2020/02/14 14:34:59 maya Exp $");
#include <drm/ttm/ttm_execbuf_util.h>
#include <drm/ttm/ttm_bo_driver.h>
@@ -36,7 +36,6 @@ __KERNEL_RCSID(0, "$NetBSD: ttm_execbuf_util.c,v 1.4 2018/08/27 07:53:39 riastra
#include <linux/wait.h>
#include <linux/sched.h>
#include <linux/module.h>
-#include <linux/export.h>
static void ttm_eu_backoff_reservation_reverse(struct list_head *list,
struct ttm_validate_buffer *entry)
diff --git a/sys/external/bsd/drm2/dist/drm/ttm/ttm_memory.c b/sys/external/bsd/drm2/dist/drm/ttm/ttm_memory.c
index 969257f8a8a..ad5c359a81f 100644
--- a/sys/external/bsd/drm2/dist/drm/ttm/ttm_memory.c
+++ b/sys/external/bsd/drm2/dist/drm/ttm/ttm_memory.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ttm_memory.c,v 1.5 2020/02/14 04:36:56 riastradh Exp $ */
+/* $NetBSD: ttm_memory.c,v 1.6 2020/02/14 14:34:59 maya Exp $ */
/**************************************************************************
*
@@ -28,7 +28,7 @@
**************************************************************************/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ttm_memory.c,v 1.5 2020/02/14 04:36:56 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ttm_memory.c,v 1.6 2020/02/14 14:34:59 maya Exp $");
#define pr_fmt(fmt) "[TTM] " fmt
@@ -42,8 +42,6 @@ __KERNEL_RCSID(0, "$NetBSD: ttm_memory.c,v 1.5 2020/02/14 04:36:56 riastradh Exp
#include <linux/mm.h>
#include <linux/module.h>
#include <linux/slab.h>
-#include <linux/printk.h>
-#include <linux/export.h>
#define TTM_MEMORY_ALLOC_RETRIES 4
diff --git a/sys/external/bsd/drm2/dist/drm/ttm/ttm_tt.c b/sys/external/bsd/drm2/dist/drm/ttm/ttm_tt.c
index cbd67d66e4c..1b25e71c90d 100644
--- a/sys/external/bsd/drm2/dist/drm/ttm/ttm_tt.c
+++ b/sys/external/bsd/drm2/dist/drm/ttm/ttm_tt.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ttm_tt.c,v 1.11 2018/08/27 04:58:37 riastradh Exp $ */
+/* $NetBSD: ttm_tt.c,v 1.12 2020/02/14 14:34:59 maya Exp $ */
/**************************************************************************
*
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ttm_tt.c,v 1.11 2018/08/27 04:58:37 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ttm_tt.c,v 1.12 2020/02/14 14:34:59 maya Exp $");
#define pr_fmt(fmt) "[TTM] " fmt
@@ -43,7 +43,6 @@ __KERNEL_RCSID(0, "$NetBSD: ttm_tt.c,v 1.11 2018/08/27 04:58:37 riastradh Exp $"
#include <linux/swap.h>
#include <linux/slab.h>
#include <linux/export.h>
-#include <linux/printk.h>
#include <drm/drm_cache.h>
#include <drm/drm_mem_util.h>
#include <drm/ttm/ttm_module.h>
diff --git a/sys/external/bsd/drm2/dist/drm/via/via_dma.c b/sys/external/bsd/drm2/dist/drm/via/via_dma.c
index 0b091172fd2..f110dff8dea 100644
--- a/sys/external/bsd/drm2/dist/drm/via/via_dma.c
+++ b/sys/external/bsd/drm2/dist/drm/via/via_dma.c
@@ -1,4 +1,4 @@
-/* $NetBSD: via_dma.c,v 1.4 2020/02/14 04:36:56 riastradh Exp $ */
+/* $NetBSD: via_dma.c,v 1.5 2020/02/14 14:34:59 maya Exp $ */
/* via_dma.c -- DMA support for the VIA Unichrome/Pro
*
@@ -37,15 +37,13 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: via_dma.c,v 1.4 2020/02/14 04:36:56 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: via_dma.c,v 1.5 2020/02/14 14:34:59 maya Exp $");
#include <drm/drmP.h>
#include <drm/via_drm.h>
#include "via_drv.h"
#include "via_3d_reg.h"
-#include <linux/delay.h>
-
#define CMDBUF_ALIGNMENT_SIZE (0x100)
#define CMDBUF_ALIGNMENT_MASK (0x0ff)
diff --git a/sys/external/bsd/drm2/dist/drm/via/via_dmablit.c b/sys/external/bsd/drm2/dist/drm/via/via_dmablit.c
index 7f691c600d4..25fbeda033c 100644
--- a/sys/external/bsd/drm2/dist/drm/via/via_dmablit.c
+++ b/sys/external/bsd/drm2/dist/drm/via/via_dmablit.c
@@ -1,4 +1,4 @@
-/* $NetBSD: via_dmablit.c,v 1.7 2020/02/14 04:37:43 riastradh Exp $ */
+/* $NetBSD: via_dmablit.c,v 1.8 2020/02/14 14:34:59 maya Exp $ */
/* via_dmablit.c -- PCI DMA BitBlt support for the VIA Unichrome/Pro
*
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: via_dmablit.c,v 1.7 2020/02/14 04:37:43 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: via_dmablit.c,v 1.8 2020/02/14 14:34:59 maya Exp $");
#include <drm/drmP.h>
#include <drm/via_drm.h>
@@ -46,7 +46,6 @@ __KERNEL_RCSID(0, "$NetBSD: via_dmablit.c,v 1.7 2020/02/14 04:37:43 riastradh Ex
#include <linux/pagemap.h>
#include <linux/slab.h>
-#include <linux/timer.h>
#define VIA_PGDN(x) (((unsigned long)(x)) & PAGE_MASK)
#define VIA_PGOFF(x) (((unsigned long)(x)) & ~PAGE_MASK)
diff --git a/sys/external/bsd/drm2/dist/include/drm/drmP.h b/sys/external/bsd/drm2/dist/include/drm/drmP.h
index 90f51e97b39..74f7adc9e0f 100644
--- a/sys/external/bsd/drm2/dist/include/drm/drmP.h
+++ b/sys/external/bsd/drm2/dist/include/drm/drmP.h
@@ -1,4 +1,4 @@
-/* $NetBSD: drmP.h,v 1.36 2019/11/05 23:29:28 jmcneill Exp $ */
+/* $NetBSD: drmP.h,v 1.37 2020/02/14 14:34:59 maya Exp $ */
/*
* Internal Header for the Direct Rendering Manager
@@ -35,12 +35,10 @@
#define _DRM_P_H_
#include <linux/agp_backend.h>
-#include <linux/atomic.h>
#include <linux/cdev.h>
#include <linux/dma-mapping.h>
#include <linux/file.h>
#include <linux/fs.h>
-#include <linux/err.h>
#include <linux/highmem.h>
#include <linux/idr.h>
#include <linux/init.h>
@@ -48,24 +46,19 @@
#include <linux/jiffies.h>
#include <linux/kernel.h>
#include <linux/kref.h>
-#include <linux/ktime.h>
#include <linux/miscdevice.h>
#include <linux/mm.h>
#include <linux/mutex.h>
#include <linux/pci.h>
#include <linux/platform_device.h>
-#include <linux/pm.h>
#include <linux/poll.h>
#include <linux/ratelimit.h>
#include <linux/sched.h>
#include <linux/slab.h>
-#include <linux/timer.h>
#include <linux/types.h>
-#include <linux/uidgid.h>
#include <linux/vmalloc.h>
#include <linux/workqueue.h>
-#include <asm/barrier.h>
#include <asm/mman.h>
#include <asm/pgalloc.h>
#include <asm/uaccess.h>
@@ -75,6 +68,19 @@
#ifdef __NetBSD__
#include <drm/drm_os_netbsd.h>
+#include <asm/barrier.h>
+#include <asm/bug.h>
+#include <linux/atomic.h>
+#include <linux/delay.h>
+#include <linux/err.h>
+#include <linux/fence.h>
+#include <linux/interrupt.h>
+#include <linux/ktime.h>
+#include <linux/module.h>
+#include <linux/pm.h>
+#include <linux/string.h>
+#include <linux/timer.h>
+#include <linux/uidgid.h>
#else
#include <drm/drm_os_linux.h>
#endif
diff --git a/sys/external/bsd/drm2/include/linux/atomic.h b/sys/external/bsd/drm2/include/linux/atomic.h
index e509157c1aa..b2e7e587938 100644
--- a/sys/external/bsd/drm2/include/linux/atomic.h
+++ b/sys/external/bsd/drm2/include/linux/atomic.h
@@ -1,4 +1,4 @@
-/* $NetBSD: atomic.h,v 1.21 2019/09/28 12:34:56 christos Exp $ */
+/* $NetBSD: atomic.h,v 1.22 2020/02/14 14:34:59 maya Exp $ */
/*-
* Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -36,6 +36,8 @@
#include <machine/limits.h>
+#include <asm/barrier.h>
+
#if defined(MULTIPROCESSOR) && !defined(__HAVE_ATOMIC_AS_MEMBAR)
# define smp_mb__before_atomic() membar_exit()
# define smp_mb__after_atomic() membar_enter()
diff --git a/sys/external/bsd/drm2/include/linux/fs.h b/sys/external/bsd/drm2/include/linux/fs.h
index 6ded5a90c89..8a134179365 100644
--- a/sys/external/bsd/drm2/include/linux/fs.h
+++ b/sys/external/bsd/drm2/include/linux/fs.h
@@ -1,4 +1,4 @@
-/* $NetBSD: fs.h,v 1.3 2020/02/14 04:36:56 riastradh Exp $ */
+/* $NetBSD: fs.h,v 1.4 2020/02/14 14:34:59 maya Exp $ */
/*-
* Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -33,5 +33,6 @@
#define _LINUX_FS_H_
#include <linux/capability.h>
+#include <linux/err.h>
#endif /* _LINUX_FS_H_ */
diff --git a/sys/external/bsd/drm2/include/linux/interrupt.h b/sys/external/bsd/drm2/include/linux/interrupt.h
index dcb8bd7a2dd..dec6082a7d3 100644
--- a/sys/external/bsd/drm2/include/linux/interrupt.h
+++ b/sys/external/bsd/drm2/include/linux/interrupt.h
@@ -1,4 +1,4 @@
-/* $NetBSD: interrupt.h,v 1.3 2018/08/27 07:20:16 riastradh Exp $ */
+/* $NetBSD: interrupt.h,v 1.4 2020/02/14 14:34:59 maya Exp $ */
/*-
* Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -34,6 +34,8 @@
#include <sys/cpu.h>
+#include <linux/hardirq.h>
+
#define in_interrupt() (cpu_intr_p() || cpu_softintr_p())
#endif /* _LINUX_INTERRUPT_H_ */
diff --git a/sys/external/bsd/drm2/include/linux/jiffies.h b/sys/external/bsd/drm2/include/linux/jiffies.h
index 10c4a0b28c3..a813bf9f2ce 100644
--- a/sys/external/bsd/drm2/include/linux/jiffies.h
+++ b/sys/external/bsd/drm2/include/linux/jiffies.h
@@ -1,4 +1,4 @@
-/* $NetBSD: jiffies.h,v 1.12 2018/08/27 13:57:50 riastradh Exp $ */
+/* $NetBSD: jiffies.h,v 1.13 2020/02/14 14:34:59 maya Exp $ */
/*-
* Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -35,6 +35,10 @@
#include <sys/param.h>
#include <sys/kernel.h>
+#include <asm/param.h> /* HZ */
+
+#include <linux/math64.h>
+
#define jiffies hardclock_ticks
#define jiffies_64 hardclock_ticks /* XXX */
diff --git a/sys/external/bsd/drm2/include/linux/ktime.h b/sys/external/bsd/drm2/include/linux/ktime.h
index 11b227bd345..6e7c9124265 100644
--- a/sys/external/bsd/drm2/include/linux/ktime.h
+++ b/sys/external/bsd/drm2/include/linux/ktime.h
@@ -1,4 +1,4 @@
-/* $NetBSD: ktime.h,v 1.8 2020/01/02 15:42:26 thorpej Exp $ */
+/* $NetBSD: ktime.h,v 1.9 2020/02/14 14:34:59 maya Exp $ */
/*-
* Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -37,6 +37,7 @@
#include <sys/kernel.h>
#include <sys/time.h>
+#include <linux/jiffies.h>
#include <linux/time.h>
union ktime {
diff --git a/sys/external/bsd/drm2/include/linux/mm_types.h b/sys/external/bsd/drm2/include/linux/mm_types.h
index de3cc794690..f90adc2f293 100644
--- a/sys/external/bsd/drm2/include/linux/mm_types.h
+++ b/sys/external/bsd/drm2/include/linux/mm_types.h
@@ -1,4 +1,4 @@
-/* $NetBSD: mm_types.h,v 1.4 2014/07/16 20:59:58 riastradh Exp $ */
+/* $NetBSD: mm_types.h,v 1.5 2020/02/14 14:34:59 maya Exp $ */
/*-
* Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -34,6 +34,8 @@
#include <uvm/uvm_page.h> /* XXX don't expose this */
+#include <linux/rwsem.h>
+
struct page {
struct vm_page p_vmp;
};
diff --git a/sys/external/bsd/drm2/include/linux/mutex.h b/sys/external/bsd/drm2/include/linux/mutex.h
index 22e42b55c11..fc1693c3fb0 100644
--- a/sys/external/bsd/drm2/include/linux/mutex.h
+++ b/sys/external/bsd/drm2/include/linux/mutex.h
@@ -1,4 +1,4 @@
-/* $NetBSD: mutex.h,v 1.11 2018/08/27 07:34:03 riastradh Exp $ */
+/* $NetBSD: mutex.h,v 1.12 2020/02/14 14:34:59 maya Exp $ */
/*-
* Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -35,6 +35,9 @@
#include <sys/mutex.h>
#include <lib/libkern/libkern.h> /* KASSERT */
+
+#include <asm/processor.h>
+
#include <linux/list.h>
#define __acquires(lock) /* XXX lockdep stuff */
diff --git a/sys/external/bsd/drm2/include/linux/pci.h b/sys/external/bsd/drm2/include/linux/pci.h
index a3dacd373ea..e7b5c220887 100644
--- a/sys/external/bsd/drm2/include/linux/pci.h
+++ b/sys/external/bsd/drm2/include/linux/pci.h
@@ -1,4 +1,4 @@
-/* $NetBSD: pci.h,v 1.38 2020/01/18 03:00:04 jmcneill Exp $ */
+/* $NetBSD: pci.h,v 1.39 2020/02/14 14:34:59 maya Exp $ */
/*-
* Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -61,7 +61,10 @@
struct acpi_devnode;
#endif
+#include <linux/device.h>
#include <linux/dma-mapping.h>
+#include <linux/errno.h>
+#include <linux/io.h>
#include <linux/ioport.h>
#include <linux/kernel.h>
diff --git a/sys/external/bsd/drm2/include/linux/pm_qos.h b/sys/external/bsd/drm2/include/linux/pm_qos.h
index d47e2bb84e8..52d2df0db51 100644
--- a/sys/external/bsd/drm2/include/linux/pm_qos.h
+++ b/sys/external/bsd/drm2/include/linux/pm_qos.h
@@ -1,4 +1,4 @@
-/* $NetBSD: pm_qos.h,v 1.1 2014/07/16 20:56:25 riastradh Exp $ */
+/* $NetBSD: pm_qos.h,v 1.2 2020/02/14 14:34:59 maya Exp $ */
/*-
* Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -32,6 +32,8 @@
#ifndef _LINUX_PM_QOS_H_
#define _LINUX_PM_QOS_H_
+#include <linux/notifier.h>
+
struct pm_qos_request {
char dummy;
};
diff --git a/sys/external/bsd/drm2/include/linux/pm_runtime.h b/sys/external/bsd/drm2/include/linux/pm_runtime.h
index 048105b61c1..110e11ac472 100644
--- a/sys/external/bsd/drm2/include/linux/pm_runtime.h
+++ b/sys/external/bsd/drm2/include/linux/pm_runtime.h
@@ -1,4 +1,4 @@
-/* $NetBSD: pm_runtime.h,v 1.4 2018/08/27 07:30:00 riastradh Exp $ */
+/* $NetBSD: pm_runtime.h,v 1.5 2020/02/14 14:34:59 maya Exp $ */
/*-
* Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -32,6 +32,8 @@
#ifndef _LINUX_PM_RUNTIME_H_
#define _LINUX_PM_RUNTIME_H_
+#include <linux/notifier.h>
+
struct device;
static inline void