From 8e8f70db5782bd8ee1763765a3eacb071bd4adb2 Mon Sep 17 00:00:00 2001 From: Taylor R Campbell Date: Fri, 14 Feb 2020 07:41:10 +0000 Subject: [PATCH] Reduce diffs by side-loading some header files like Linux. --- .../bsd/common/include/linux/kernel.h | 5 +++++ .../drm2/dist/drm/amd/amdgpu/amdgpu_atom.c | 1 - .../dist/drm/amd/amdgpu/amdgpu_atombios.c | 1 - .../drm/amd/amdgpu/amdgpu_atombios_crtc.c | 1 - .../dist/drm/amd/amdgpu/amdgpu_atombios_dp.c | 1 - .../drm/amd/amdgpu/amdgpu_atombios_encoders.c | 1 - .../dist/drm/amd/amdgpu/amdgpu_atombios_i2c.c | 1 - .../bsd/drm2/dist/drm/amd/amdgpu/amdgpu_cgs.c | 1 - .../drm2/dist/drm/amd/amdgpu/amdgpu_ci_dpm.c | 2 -- .../drm2/dist/drm/amd/amdgpu/amdgpu_ci_smc.c | 1 - .../drm2/dist/drm/amd/amdgpu/amdgpu_cik_ih.c | 2 -- .../dist/drm/amd/amdgpu/amdgpu_cik_sdma.c | 3 --- .../drm2/dist/drm/amd/amdgpu/amdgpu_cz_dpm.c | 1 - .../drm2/dist/drm/amd/amdgpu/amdgpu_cz_ih.c | 2 -- .../drm2/dist/drm/amd/amdgpu/amdgpu_cz_smc.c | 1 - .../bsd/drm2/dist/drm/amd/amdgpu/amdgpu_dpm.c | 1 - .../drm2/dist/drm/amd/amdgpu/amdgpu_fence.c | 1 - .../dist/drm/amd/amdgpu/amdgpu_fiji_dpm.c | 1 - .../dist/drm/amd/amdgpu/amdgpu_fiji_smc.c | 1 - .../dist/drm/amd/amdgpu/amdgpu_gfx_v7_0.c | 3 --- .../dist/drm/amd/amdgpu/amdgpu_gfx_v8_0.c | 3 --- .../dist/drm/amd/amdgpu/amdgpu_gmc_v7_0.c | 2 -- .../dist/drm/amd/amdgpu/amdgpu_gmc_v8_0.c | 2 -- .../bsd/drm2/dist/drm/amd/amdgpu/amdgpu_i2c.c | 1 - .../dist/drm/amd/amdgpu/amdgpu_iceland_dpm.c | 1 - .../dist/drm/amd/amdgpu/amdgpu_iceland_ih.c | 3 --- .../dist/drm/amd/amdgpu/amdgpu_iceland_smc.c | 1 - .../bsd/drm2/dist/drm/amd/amdgpu/amdgpu_ih.c | 1 - .../drm2/dist/drm/amd/amdgpu/amdgpu_kv_dpm.c | 1 - .../drm2/dist/drm/amd/amdgpu/amdgpu_object.h | 1 - .../drm2/dist/drm/amd/amdgpu/amdgpu_ring.c | 2 -- .../dist/drm/amd/amdgpu/amdgpu_sdma_v2_4.c | 3 --- .../dist/drm/amd/amdgpu/amdgpu_sdma_v3_0.c | 3 --- .../dist/drm/amd/amdgpu/amdgpu_tonga_dpm.c | 1 - .../dist/drm/amd/amdgpu/amdgpu_tonga_ih.c | 2 -- .../dist/drm/amd/amdgpu/amdgpu_tonga_smc.c | 1 - .../drm2/dist/drm/amd/amdgpu/amdgpu_ucode.c | 1 - .../bsd/drm2/dist/drm/amd/amdgpu/amdgpu_uvd.c | 1 - .../dist/drm/amd/amdgpu/amdgpu_uvd_v4_2.c | 1 - .../dist/drm/amd/amdgpu/amdgpu_uvd_v5_0.c | 1 - .../dist/drm/amd/amdgpu/amdgpu_uvd_v6_0.c | 1 - .../bsd/drm2/dist/drm/amd/amdgpu/amdgpu_vce.c | 1 - .../dist/drm/amd/amdgpu/amdgpu_vce_v3_0.c | 1 - .../bsd/drm2/dist/drm/drm_agpsupport.c | 2 -- sys/external/bsd/drm2/dist/drm/drm_atomic.c | 2 -- .../bsd/drm2/dist/drm/drm_atomic_helper.c | 1 - sys/external/bsd/drm2/dist/drm/drm_bufs.c | 4 ---- sys/external/bsd/drm2/dist/drm/drm_context.c | 2 -- sys/external/bsd/drm2/dist/drm/drm_crtc.c | 4 ---- .../bsd/drm2/dist/drm/drm_crtc_helper.c | 3 --- .../bsd/drm2/dist/drm/drm_dp_helper.c | 3 --- .../bsd/drm2/dist/drm/drm_dp_mst_topology.c | 3 --- sys/external/bsd/drm2/dist/drm/drm_drv.c | 3 --- sys/external/bsd/drm2/dist/drm/drm_edid.c | 7 ------- .../bsd/drm2/dist/drm/drm_fb_helper.c | 6 ------ .../bsd/drm2/dist/drm/drm_flip_work.c | 2 -- sys/external/bsd/drm2/dist/drm/drm_gem.c | 3 --- sys/external/bsd/drm2/dist/drm/drm_global.c | 2 -- sys/external/bsd/drm2/dist/drm/drm_irq.c | 10 ---------- sys/external/bsd/drm2/dist/drm/drm_mm.c | 3 --- .../bsd/drm2/dist/drm/drm_modeset_lock.c | 2 -- .../bsd/drm2/dist/drm/drm_plane_helper.c | 1 - .../bsd/drm2/dist/drm/drm_probe_helper.c | 1 - .../bsd/drm2/dist/drm/i915/i915_cmd_parser.c | 1 - .../bsd/drm2/dist/drm/i915/i915_drv.c | 2 -- .../bsd/drm2/dist/drm/i915/i915_gem.c | 6 ------ .../bsd/drm2/dist/drm/i915/i915_gem_context.c | 1 - .../drm2/dist/drm/i915/i915_gem_execbuffer.c | 2 -- .../bsd/drm2/dist/drm/i915/i915_gem_gtt.c | 1 - .../bsd/drm2/dist/drm/i915/i915_gem_stolen.c | 2 -- .../bsd/drm2/dist/drm/i915/i915_gpu_error.c | 2 -- .../bsd/drm2/dist/drm/i915/i915_irq.c | 6 ------ .../bsd/drm2/dist/drm/i915/i915_params.c | 2 -- .../bsd/drm2/dist/drm/i915/intel_csr.c | 1 - .../bsd/drm2/dist/drm/i915/intel_display.c | 6 ------ .../bsd/drm2/dist/drm/i915/intel_dp.c | 5 ----- .../bsd/drm2/dist/drm/i915/intel_drv.h | 2 -- .../bsd/drm2/dist/drm/i915/intel_fbdev.c | 1 - .../bsd/drm2/dist/drm/i915/intel_guc_loader.c | 1 - .../bsd/drm2/dist/drm/i915/intel_hdmi.c | 1 - .../bsd/drm2/dist/drm/i915/intel_i2c.c | 1 - .../bsd/drm2/dist/drm/i915/intel_lvds.c | 2 -- .../bsd/drm2/dist/drm/i915/intel_opregion.c | 2 -- .../bsd/drm2/dist/drm/i915/intel_overlay.c | 2 -- .../bsd/drm2/dist/drm/i915/intel_panel.c | 3 --- .../bsd/drm2/dist/drm/i915/intel_pm.c | 5 ----- .../bsd/drm2/dist/drm/i915/intel_ringbuffer.c | 1 - .../bsd/drm2/dist/drm/i915/intel_ringbuffer.h | 1 - .../bsd/drm2/dist/drm/i915/intel_sdvo.c | 3 --- .../bsd/drm2/dist/drm/i915/intel_uncore.c | 1 - .../nouveau/dispnv04/nouveau_dispnv04_disp.c | 2 -- .../dispnv04/nouveau_dispnv04_tvmodesnv17.c | 1 - .../dispnv04/nouveau_dispnv04_tvnv04.c | 2 -- .../drm/nouveau/include/nvkm/core/device.h | 1 - .../bsd/drm2/dist/drm/nouveau/nouveau_bios.h | 2 -- .../drm2/dist/drm/nouveau/nouveau_connector.c | 2 -- .../drm2/dist/drm/nouveau/nouveau_display.c | 2 -- .../bsd/drm2/dist/drm/nouveau/nouveau_fence.c | 1 - .../bsd/drm2/dist/drm/nouveau/nouveau_gem.c | 2 -- .../dist/drm/nouveau/nouveau_nv50_display.c | 1 - .../disp/nouveau_nvkm_engine_disp_gf119.c | 2 -- .../disp/nouveau_nvkm_engine_disp_nv50.c | 3 --- .../engine/gr/nouveau_nvkm_engine_gr_gf100.c | 2 -- .../bsd/drm2/dist/drm/radeon/radeon.h | 6 ------ .../bsd/drm2/dist/drm/radeon/radeon_bios.c | 1 - .../drm2/dist/drm/radeon/radeon_cik_sdma.c | 1 - .../bsd/drm2/dist/drm/radeon/radeon_device.c | 1 - .../bsd/drm2/dist/drm/radeon/radeon_display.c | 1 - .../bsd/drm2/dist/drm/radeon/radeon_drv.c | 1 - .../drm2/dist/drm/radeon/radeon_evergreen.c | 1 - .../bsd/drm2/dist/drm/radeon/radeon_i2c.c | 1 - .../bsd/drm2/dist/drm/radeon/radeon_r600.c | 1 - .../bsd/drm2/dist/drm/radeon/radeon_ring.c | 1 - .../bsd/drm2/dist/drm/radeon/radeon_si_dpm.c | 1 - sys/external/bsd/drm2/dist/drm/ttm/ttm_bo.c | 3 --- .../bsd/drm2/dist/drm/ttm/ttm_bo_manager.c | 1 - .../bsd/drm2/dist/drm/ttm/ttm_bo_util.c | 2 -- .../bsd/drm2/dist/drm/ttm/ttm_execbuf_util.c | 1 - .../bsd/drm2/dist/drm/ttm/ttm_memory.c | 2 -- sys/external/bsd/drm2/dist/drm/ttm/ttm_tt.c | 1 - sys/external/bsd/drm2/dist/drm/via/via_dma.c | 2 -- .../bsd/drm2/dist/drm/via/via_dmablit.c | 1 - sys/external/bsd/drm2/dist/include/drm/drmP.h | 20 ++++++++++++------- sys/external/bsd/drm2/include/linux/atomic.h | 2 ++ sys/external/bsd/drm2/include/linux/fs.h | 1 + .../bsd/drm2/include/linux/interrupt.h | 2 ++ sys/external/bsd/drm2/include/linux/jiffies.h | 4 ++++ sys/external/bsd/drm2/include/linux/ktime.h | 1 + .../bsd/drm2/include/linux/mm_types.h | 2 ++ sys/external/bsd/drm2/include/linux/mutex.h | 3 +++ sys/external/bsd/drm2/include/linux/pci.h | 3 +++ sys/external/bsd/drm2/include/linux/pm_qos.h | 2 ++ .../bsd/drm2/include/linux/pm_runtime.h | 2 ++ 133 files changed, 40 insertions(+), 247 deletions(-) diff --git a/sys/external/bsd/common/include/linux/kernel.h b/sys/external/bsd/common/include/linux/kernel.h index 4756377efec6..ad87b64d5088 100644 --- a/sys/external/bsd/common/include/linux/kernel.h +++ b/sys/external/bsd/common/include/linux/kernel.h @@ -38,7 +38,12 @@ #include #include + +#include +#include + #include +#include #include #include 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 f379362e5bfb..bf6037579b5b 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 @@ -31,7 +31,6 @@ __KERNEL_RCSID(0, "$NetBSD: amdgpu_atom.c,v 1.1 2018/08/27 14:10:14 riastradh Ex #include #include #include -#include #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 8d874f381c43..990b745c9172 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 @@ -28,7 +28,6 @@ #include __KERNEL_RCSID(0, "$NetBSD: amdgpu_atombios.c,v 1.3 2018/08/27 14:04:50 riastradh Exp $"); -#include #include #include #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 c0adfa1b0666..670cd3975f96 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 @@ -32,7 +32,6 @@ __KERNEL_RCSID(0, "$NetBSD: amdgpu_atombios_crtc.c,v 1.1 2018/08/27 14:10:14 ria #include #include #include -#include #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 d046a7259e39..185bf9e186a9 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 @@ -31,7 +31,6 @@ __KERNEL_RCSID(0, "$NetBSD: amdgpu_atombios_dp.c,v 1.2 2019/01/01 08:07:47 maya #include #include -#include #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 c3412c7f0977..34c552b80b78 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 @@ -37,7 +37,6 @@ __KERNEL_RCSID(0, "$NetBSD: amdgpu_atombios_encoders.c,v 1.1 2018/08/27 14:10:14 #include "atombios_encoders.h" #include "atombios_dp.h" #include -#include #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 e8dc6c4aa0f7..d07967bf66c7 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 @@ -29,7 +29,6 @@ __KERNEL_RCSID(0, "$NetBSD: amdgpu_atombios_i2c.c,v 1.1 2018/08/27 14:10:14 rias #include #include -#include #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 1dc4fc353a40..a62fad218325 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 @@ -26,7 +26,6 @@ #include __KERNEL_RCSID(0, "$NetBSD: amdgpu_cgs.c,v 1.4 2018/08/27 15:26:33 riastradh Exp $"); -#include #include #include #include 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 d0309b54d333..b68cc7924fe1 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 @@ -27,8 +27,6 @@ __KERNEL_RCSID(0, "$NetBSD: amdgpu_ci_dpm.c,v 1.2 2018/08/27 14:24:03 riastradh Exp $"); #include -#include -#include #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 1b52806bf2c6..d32837fd4b05 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 @@ -28,7 +28,6 @@ __KERNEL_RCSID(0, "$NetBSD: amdgpu_ci_smc.c,v 1.2 2018/08/27 14:24:03 riastradh Exp $"); #include -#include #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 2c89101959a3..039d4b7a1c32 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 @@ -25,8 +25,6 @@ #include __KERNEL_RCSID(0, "$NetBSD: amdgpu_cik_ih.c,v 1.2 2018/08/27 14:24:03 riastradh Exp $"); -#include -#include #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 f5d274414975..db63a7666c47 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 @@ -27,9 +27,6 @@ __KERNEL_RCSID(0, "$NetBSD: amdgpu_cik_sdma.c,v 1.2 2018/08/27 14:24:03 riastradh Exp $"); #include -#include -#include -#include #include #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 539bd3545176..2da9ca012049 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 @@ -28,7 +28,6 @@ __KERNEL_RCSID(0, "$NetBSD: amdgpu_cz_dpm.c,v 1.1 2018/08/27 14:10:14 riastradh #include #include -#include #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 1f79eb4d1659..e1a7b1ed1823 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 @@ -25,8 +25,6 @@ #include __KERNEL_RCSID(0, "$NetBSD: amdgpu_cz_ih.c,v 1.1 2018/08/27 14:10:14 riastradh Exp $"); -#include -#include #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 2a5175fd2211..90155dc8b7f9 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 @@ -26,7 +26,6 @@ __KERNEL_RCSID(0, "$NetBSD: amdgpu_cz_smc.c,v 1.2 2019/02/23 19:36:15 kamil Exp $"); #include -#include #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 a9d4b9ef6541..084245a0d30c 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 @@ -27,7 +27,6 @@ #include __KERNEL_RCSID(0, "$NetBSD: amdgpu_dpm.c,v 1.3 2018/08/27 14:04:50 riastradh Exp $"); -#include #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 d8552a6eb072..e133fa256083 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 @@ -33,7 +33,6 @@ #include __KERNEL_RCSID(0, "$NetBSD: amdgpu_fence.c,v 1.3 2018/08/27 14:04:50 riastradh Exp $"); -#include #include #include #include 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 2fe232e7402d..3016e64ecf13 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 @@ -27,7 +27,6 @@ __KERNEL_RCSID(0, "$NetBSD: amdgpu_fiji_dpm.c,v 1.1 2018/08/27 14:10:14 riastradh Exp $"); #include -#include #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 6068a17b4999..6482b93d9d69 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 @@ -27,7 +27,6 @@ __KERNEL_RCSID(0, "$NetBSD: amdgpu_fiji_smc.c,v 1.1 2018/08/27 14:10:14 riastradh Exp $"); #include -#include #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 2424f51947bc..d0fb98e137be 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 @@ -26,9 +26,6 @@ __KERNEL_RCSID(0, "$NetBSD: amdgpu_gfx_v7_0.c,v 1.2 2018/08/27 14:24:03 riastradh Exp $"); #include -#include -#include -#include #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 8e6ee1f3aa6f..515791e0c8f0 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 @@ -26,9 +26,6 @@ __KERNEL_RCSID(0, "$NetBSD: amdgpu_gfx_v8_0.c,v 1.2 2019/02/23 19:37:36 kamil Exp $"); #include -#include -#include -#include #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 76cd0beb67f7..773fbeed9a89 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 @@ -26,8 +26,6 @@ __KERNEL_RCSID(0, "$NetBSD: amdgpu_gmc_v7_0.c,v 1.1 2018/08/27 14:10:14 riastradh Exp $"); #include -#include -#include #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 3bdb7d4410fa..d637827cba93 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 @@ -26,8 +26,6 @@ __KERNEL_RCSID(0, "$NetBSD: amdgpu_gmc_v8_0.c,v 1.1 2018/08/27 14:10:14 riastradh Exp $"); #include -#include -#include #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 c88293a6f867..5183b146dd11 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 @@ -29,7 +29,6 @@ __KERNEL_RCSID(0, "$NetBSD: amdgpu_i2c.c,v 1.3 2018/08/27 14:04:50 riastradh Exp $"); #include -#include #include #include 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 3b26cac5c062..e259f7c2c3ca 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 @@ -27,7 +27,6 @@ __KERNEL_RCSID(0, "$NetBSD: amdgpu_iceland_dpm.c,v 1.1 2018/08/27 14:10:14 riastradh Exp $"); #include -#include #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 e4c44cb8ab3b..b8ddd711d13f 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 @@ -25,9 +25,6 @@ #include __KERNEL_RCSID(0, "$NetBSD: amdgpu_iceland_ih.c,v 1.1 2018/08/27 14:10:14 riastradh Exp $"); -#include -#include -#include #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 4a9f30043ab3..25f8ffd10060 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 @@ -27,7 +27,6 @@ __KERNEL_RCSID(0, "$NetBSD: amdgpu_iceland_smc.c,v 1.1 2018/08/27 14:10:14 riastradh Exp $"); #include -#include #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 8f02bdebd134..aaa69518fc8d 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 @@ -26,7 +26,6 @@ #include __KERNEL_RCSID(0, "$NetBSD: amdgpu_ih.c,v 1.3 2018/08/27 14:04:50 riastradh Exp $"); -#include #include #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 e561a8ddfe46..9139256bec64 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 @@ -26,7 +26,6 @@ #include __KERNEL_RCSID(0, "$NetBSD: amdgpu_kv_dpm.c,v 1.2 2018/08/27 14:24:03 riastradh Exp $"); -#include #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 d03c69de6b1f..326926a661ff 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 @@ -30,7 +30,6 @@ #ifndef __AMDGPU_OBJECT_H__ #define __AMDGPU_OBJECT_H__ -#include #include #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 c8083a8e01d6..fa1dd28360f7 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 @@ -31,8 +31,6 @@ #include __KERNEL_RCSID(0, "$NetBSD: amdgpu_ring.c,v 1.3 2018/08/27 14:04:50 riastradh Exp $"); -#include -#include #include #include #include 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 72a183834729..bdcd4e8cb3d2 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 @@ -27,9 +27,6 @@ __KERNEL_RCSID(0, "$NetBSD: amdgpu_sdma_v2_4.c,v 1.1 2018/08/27 14:10:14 riastradh Exp $"); #include -#include -#include -#include #include #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 a5dc02612ee2..daa5a7759afa 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 @@ -27,9 +27,6 @@ __KERNEL_RCSID(0, "$NetBSD: amdgpu_sdma_v3_0.c,v 1.1 2018/08/27 14:10:14 riastradh Exp $"); #include -#include -#include -#include #include #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 a6d7c8ec62e0..059c85e5c882 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 @@ -27,7 +27,6 @@ __KERNEL_RCSID(0, "$NetBSD: amdgpu_tonga_dpm.c,v 1.1 2018/08/27 14:10:14 riastradh Exp $"); #include -#include #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 ee6d4a1528cc..d0422e684dcc 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 @@ -25,8 +25,6 @@ #include __KERNEL_RCSID(0, "$NetBSD: amdgpu_tonga_ih.c,v 1.1 2018/08/27 14:10:14 riastradh Exp $"); -#include -#include #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 1e5f543222ea..9d05490c69af 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 @@ -27,7 +27,6 @@ __KERNEL_RCSID(0, "$NetBSD: amdgpu_tonga_smc.c,v 1.1 2018/08/27 14:10:14 riastradh Exp $"); #include -#include #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 5f852a94392f..ed1bab43b87b 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 @@ -29,7 +29,6 @@ __KERNEL_RCSID(0, "$NetBSD: amdgpu_ucode.c,v 1.3 2018/08/27 14:04:50 riastradh E #include #include #include -#include #include #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 10677c03d635..723e67cc212d 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 @@ -35,7 +35,6 @@ __KERNEL_RCSID(0, "$NetBSD: amdgpu_uvd.c,v 1.4 2019/01/01 08:07:47 maya Exp $"); #include #include -#include #include #include 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 bf8689f1c0da..e7ecffeba053 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 @@ -28,7 +28,6 @@ __KERNEL_RCSID(0, "$NetBSD: amdgpu_uvd_v4_2.c,v 1.2 2018/08/27 14:24:03 riastradh Exp $"); #include -#include #include #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 26c4eaa1496a..adbda4948b1a 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 @@ -28,7 +28,6 @@ __KERNEL_RCSID(0, "$NetBSD: amdgpu_uvd_v5_0.c,v 1.1 2018/08/27 14:10:14 riastradh Exp $"); #include -#include #include #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 df6042683b65..8b2dcf68eb2d 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 @@ -28,7 +28,6 @@ __KERNEL_RCSID(0, "$NetBSD: amdgpu_uvd_v6_0.c,v 1.1 2018/08/27 14:10:14 riastradh Exp $"); #include -#include #include #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 d0bec40fdbed..92ddd39b882a 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 @@ -32,7 +32,6 @@ __KERNEL_RCSID(0, "$NetBSD: amdgpu_vce.c,v 1.4 2019/01/01 08:07:47 maya Exp $"); #include #include -#include #include #include 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 b2f270f4791c..1ce9989cf32a 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 @@ -31,7 +31,6 @@ __KERNEL_RCSID(0, "$NetBSD: amdgpu_vce_v3_0.c,v 1.1 2018/08/27 14:10:14 riastradh Exp $"); #include -#include #include #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 139d5484f6d8..772975a510f5 100644 --- a/sys/external/bsd/drm2/dist/drm/drm_agpsupport.c +++ b/sys/external/bsd/drm2/dist/drm/drm_agpsupport.c @@ -37,8 +37,6 @@ __KERNEL_RCSID(0, "$NetBSD: drm_agpsupport.c,v 1.10 2018/08/28 03:41:38 riastradh Exp $"); #include -#include -#include #include #include #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 ba69906e998c..be41dc17f527 100644 --- a/sys/external/bsd/drm2/dist/drm/drm_atomic.c +++ b/sys/external/bsd/drm2/dist/drm/drm_atomic.c @@ -31,8 +31,6 @@ #include __KERNEL_RCSID(0, "$NetBSD: drm_atomic.c,v 1.7 2018/08/27 07:45:55 riastradh Exp $"); -#include - #include #include #include 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 ba1b823f7cf8..bc0fb79a4588 100644 --- a/sys/external/bsd/drm2/dist/drm/drm_atomic_helper.c +++ b/sys/external/bsd/drm2/dist/drm/drm_atomic_helper.c @@ -35,7 +35,6 @@ __KERNEL_RCSID(0, "$NetBSD: drm_atomic_helper.c,v 1.4 2018/08/27 06:50:45 riastr #include #include #include -#include #include /** diff --git a/sys/external/bsd/drm2/dist/drm/drm_bufs.c b/sys/external/bsd/drm2/dist/drm/drm_bufs.c index cabeacc22157..97f494b39b66 100644 --- a/sys/external/bsd/drm2/dist/drm/drm_bufs.c +++ b/sys/external/bsd/drm2/dist/drm/drm_bufs.c @@ -35,12 +35,8 @@ __KERNEL_RCSID(0, "$NetBSD: drm_bufs.c,v 1.9 2018/08/27 06:44:14 riastradh Exp $ #include #include -#include #include #include -#include -#include -#include #include #include #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 1ad294227a89..d8c43e3df44f 100644 --- a/sys/external/bsd/drm2/dist/drm/drm_context.c +++ b/sys/external/bsd/drm2/dist/drm/drm_context.c @@ -33,8 +33,6 @@ #include __KERNEL_RCSID(0, "$NetBSD: drm_context.c,v 1.5 2018/08/27 14:14:29 riastradh Exp $"); -#include - #include #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 918af117414c..091fef10b397 100644 --- a/sys/external/bsd/drm2/dist/drm/drm_crtc.c +++ b/sys/external/bsd/drm2/dist/drm/drm_crtc.c @@ -34,14 +34,10 @@ #include __KERNEL_RCSID(0, "$NetBSD: drm_crtc.c,v 1.11 2018/08/27 14:40:30 riastradh Exp $"); -#include -#include #include #include #include #include -#include -#include #include #include #include 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 4e185a4565fa..28caee93f2a5 100644 --- a/sys/external/bsd/drm2/dist/drm/drm_crtc_helper.c +++ b/sys/external/bsd/drm2/dist/drm/drm_crtc_helper.c @@ -36,10 +36,7 @@ __KERNEL_RCSID(0, "$NetBSD: drm_crtc_helper.c,v 1.5 2018/08/27 04:58:19 riastrad #include #include -#include #include -#include -#include #include #include 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 f59e781157f2..e49410569e56 100644 --- a/sys/external/bsd/drm2/dist/drm/drm_dp_helper.c +++ b/sys/external/bsd/drm2/dist/drm/drm_dp_helper.c @@ -27,14 +27,11 @@ __KERNEL_RCSID(0, "$NetBSD: drm_dp_helper.c,v 1.8 2018/08/27 06:52:45 riastradh #include #include -#include #include #include #include #include #include -#include -#include #include #include 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 2dc184f21711..bb5e2e4f2797 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 @@ -32,9 +32,6 @@ __KERNEL_RCSID(0, "$NetBSD: drm_dp_mst_topology.c,v 1.3 2018/08/27 06:56:02 rias #include #include #include -#include -#include -#include #include #include diff --git a/sys/external/bsd/drm2/dist/drm/drm_drv.c b/sys/external/bsd/drm2/dist/drm/drm_drv.c index f85c6171c55a..90b1f6a91ea6 100644 --- a/sys/external/bsd/drm2/dist/drm/drm_drv.c +++ b/sys/external/bsd/drm2/dist/drm/drm_drv.c @@ -31,14 +31,11 @@ #include __KERNEL_RCSID(0, "$NetBSD: drm_drv.c,v 1.10 2018/08/28 08:20:27 martin Exp $"); -#include -#include #include #include #include #include #include -#include #include #include #include diff --git a/sys/external/bsd/drm2/dist/drm/drm_edid.c b/sys/external/bsd/drm2/dist/drm/drm_edid.c index f6f4e7b3a69b..c81db2245646 100644 --- a/sys/external/bsd/drm2/dist/drm/drm_edid.c +++ b/sys/external/bsd/drm2/dist/drm/drm_edid.c @@ -37,13 +37,6 @@ __KERNEL_RCSID(0, "$NetBSD: drm_edid.c,v 1.6 2018/08/27 04:58:19 riastradh Exp $ #include #include #include -#include -#include -#include -#include -#include -#include -#include #include #include #include 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 b21c84ef465b..32133c7ccee4 100644 --- a/sys/external/bsd/drm2/dist/drm/drm_fb_helper.c +++ b/sys/external/bsd/drm2/dist/drm/drm_fb_helper.c @@ -39,13 +39,7 @@ __KERNEL_RCSID(0, "$NetBSD: drm_fb_helper.c,v 1.13 2019/11/05 04:09:51 msaitoh E #include #include #include -#include -#include -#include -#include -#include #include -#include #include #include #include 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 d4b0abb1e2c7..ffb6b9cd9abc 100644 --- a/sys/external/bsd/drm2/dist/drm/drm_flip_work.c +++ b/sys/external/bsd/drm2/dist/drm/drm_flip_work.c @@ -26,8 +26,6 @@ #include __KERNEL_RCSID(0, "$NetBSD: drm_flip_work.c,v 1.3 2018/08/27 04:58:19 riastradh Exp $"); -#include - #include #include diff --git a/sys/external/bsd/drm2/dist/drm/drm_gem.c b/sys/external/bsd/drm2/dist/drm/drm_gem.c index 443b616e725a..050896bc0f81 100644 --- a/sys/external/bsd/drm2/dist/drm/drm_gem.c +++ b/sys/external/bsd/drm2/dist/drm/drm_gem.c @@ -41,9 +41,6 @@ __KERNEL_RCSID(0, "$NetBSD: drm_gem.c,v 1.12 2020/01/17 19:56:49 ad Exp $"); #include #include #include -#include -#include -#include #include #include #include diff --git a/sys/external/bsd/drm2/dist/drm/drm_global.c b/sys/external/bsd/drm2/dist/drm/drm_global.c index 304ba2f0ee6d..9ad529e90594 100644 --- a/sys/external/bsd/drm2/dist/drm/drm_global.c +++ b/sys/external/bsd/drm2/dist/drm/drm_global.c @@ -36,8 +36,6 @@ __KERNEL_RCSID(0, "$NetBSD: drm_global.c,v 1.4 2018/08/27 04:58:19 riastradh Exp #include #include #include -#include -#include #include #include diff --git a/sys/external/bsd/drm2/dist/drm/drm_irq.c b/sys/external/bsd/drm2/dist/drm/drm_irq.c index 84fc599793ff..ec2e59080b9a 100644 --- a/sys/external/bsd/drm2/dist/drm/drm_irq.c +++ b/sys/external/bsd/drm2/dist/drm/drm_irq.c @@ -46,16 +46,6 @@ __KERNEL_RCSID(0, "$NetBSD: drm_irq.c,v 1.15 2018/08/27 14:43:32 riastradh Exp $ #include #include -#include - -#include -#include -#include -#include -#include - -#include -#include #ifdef __NetBSD__ /* XXX hurk -- selnotify &c. */ #include diff --git a/sys/external/bsd/drm2/dist/drm/drm_mm.c b/sys/external/bsd/drm2/dist/drm/drm_mm.c index 19479ab695c2..a777f22af8e4 100644 --- a/sys/external/bsd/drm2/dist/drm/drm_mm.c +++ b/sys/external/bsd/drm2/dist/drm/drm_mm.c @@ -51,9 +51,6 @@ __KERNEL_RCSID(0, "$NetBSD: drm_mm.c,v 1.5 2018/08/27 06:56:50 riastradh Exp $") #include #include #include -#include -#include -#include /** * 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 f3b21cca0407..c73c3c49bdf8 100644 --- a/sys/external/bsd/drm2/dist/drm/drm_modeset_lock.c +++ b/sys/external/bsd/drm2/dist/drm/drm_modeset_lock.c @@ -26,8 +26,6 @@ #include __KERNEL_RCSID(0, "$NetBSD: drm_modeset_lock.c,v 1.3 2018/08/27 06:56:12 riastradh Exp $"); -#include - #include #include #include 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 f5a68b12698b..e193c15d950e 100644 --- a/sys/external/bsd/drm2/dist/drm/drm_plane_helper.c +++ b/sys/external/bsd/drm2/dist/drm/drm_plane_helper.c @@ -29,7 +29,6 @@ __KERNEL_RCSID(0, "$NetBSD: drm_plane_helper.c,v 1.3 2018/08/27 04:58:19 riastradh Exp $"); #include -#include #include #include #include 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 7d9e24a6537b..ed995dd993e5 100644 --- a/sys/external/bsd/drm2/dist/drm/drm_probe_helper.c +++ b/sys/external/bsd/drm2/dist/drm/drm_probe_helper.c @@ -34,7 +34,6 @@ #include __KERNEL_RCSID(0, "$NetBSD: drm_probe_helper.c,v 1.3 2018/08/27 04:58:19 riastradh Exp $"); -#include #include #include 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 a56c8ddb05c1..2388b75cb4fe 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 @@ -32,7 +32,6 @@ __KERNEL_RCSID(0, "$NetBSD: i915_cmd_parser.c,v 1.20 2019/12/05 20:25:54 maya Ex #include "i915_drv.h" #include -#include /** * 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 65ef1f4fe739..1c30558cb544 100644 --- a/sys/external/bsd/drm2/dist/drm/i915/i915_drv.c +++ b/sys/external/bsd/drm2/dist/drm/i915/i915_drv.c @@ -34,8 +34,6 @@ __KERNEL_RCSID(0, "$NetBSD: i915_drv.c,v 1.17 2019/12/05 20:03:09 maya Exp $"); #include #include -#include -#include #include #include #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 c5b9bb1aab3a..4b68a202560a 100644 --- a/sys/external/bsd/drm2/dist/drm/i915/i915_gem.c +++ b/sys/external/bsd/drm2/dist/drm/i915/i915_gem.c @@ -60,12 +60,6 @@ __KERNEL_RCSID(0, "$NetBSD: i915_gem.c,v 1.56 2020/01/17 19:56:50 ad Exp $"); #include #include #include -#include -#include -#include -#include -#include -#include #include #include 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 58db5a8cf933..6036e30bd0d9 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 @@ -90,7 +90,6 @@ #include __KERNEL_RCSID(0, "$NetBSD: i915_gem_context.c,v 1.10 2019/12/05 20:03:09 maya Exp $"); -#include #include #include #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 30235d87f161..1b0eaf51c02b 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 @@ -38,9 +38,7 @@ __KERNEL_RCSID(0, "$NetBSD: i915_gem_execbuffer.c,v 1.9 2019/12/05 20:03:09 maya #include "intel_drv.h" #include #include -#include #include -#include #include #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 1b61f0efcbb9..a4c9abde2ea0 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 @@ -29,7 +29,6 @@ __KERNEL_RCSID(0, "$NetBSD: i915_gem_gtt.c,v 1.16 2019/12/05 20:03:09 maya Exp $"); #include -#include #include #include #include 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 1ab859295c48..897883ab2da6 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 @@ -31,8 +31,6 @@ #include __KERNEL_RCSID(0, "$NetBSD: i915_gem_stolen.c,v 1.12 2019/10/01 18:44:24 msaitoh Exp $"); -#include -#include #include #include #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 b5a1f7fe3f59..2fcb0b8f65ab 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 @@ -34,8 +34,6 @@ __KERNEL_RCSID(0, "$NetBSD: i915_gpu_error.c,v 1.10 2018/08/27 16:14:55 riastrad #include -#include -#include #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 436fcc3a473b..cdc58e802e42 100644 --- a/sys/external/bsd/drm2/dist/drm/i915/i915_irq.c +++ b/sys/external/bsd/drm2/dist/drm/i915/i915_irq.c @@ -33,12 +33,6 @@ __KERNEL_RCSID(0, "$NetBSD: i915_irq.c,v 1.17 2018/09/13 08:25:55 mrg Exp $"); #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt -#ifdef __NetBSD__ -#include -#endif - -#include -#include #include #include #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 46135e7c4a9c..81c71aefe82d 100644 --- a/sys/external/bsd/drm2/dist/drm/i915/i915_params.c +++ b/sys/external/bsd/drm2/dist/drm/i915/i915_params.c @@ -27,8 +27,6 @@ #include __KERNEL_RCSID(0, "$NetBSD: i915_params.c,v 1.3 2018/08/27 04:58:23 riastradh Exp $"); -#include -#include #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 e68dba5d2940..9f094b87c7df 100644 --- a/sys/external/bsd/drm2/dist/drm/i915/intel_csr.c +++ b/sys/external/bsd/drm2/dist/drm/i915/intel_csr.c @@ -27,7 +27,6 @@ __KERNEL_RCSID(0, "$NetBSD: intel_csr.c,v 1.5 2018/09/13 08:25:55 mrg Exp $"); #include -#include #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 65f1b6df93e0..c5ff4cca2157 100644 --- a/sys/external/bsd/drm2/dist/drm/i915/intel_display.c +++ b/sys/external/bsd/drm2/dist/drm/i915/intel_display.c @@ -36,8 +36,6 @@ __KERNEL_RCSID(0, "$NetBSD: intel_display.c,v 1.28 2019/12/05 20:03:09 maya Exp #include #include #include -#include -#include #include #include #include "intel_drv.h" @@ -51,11 +49,7 @@ __KERNEL_RCSID(0, "$NetBSD: intel_display.c,v 1.28 2019/12/05 20:03:09 maya Exp #include #include #include -#include -#include #include -#include -#include #include 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 67abbfd0214c..d7a5bc763719 100644 --- a/sys/external/bsd/drm2/dist/drm/i915/intel_dp.c +++ b/sys/external/bsd/drm2/dist/drm/i915/intel_dp.c @@ -35,11 +35,6 @@ __KERNEL_RCSID(0, "$NetBSD: intel_dp.c,v 1.20 2019/10/15 18:50:44 msaitoh Exp $" #include #include #include -#include -#include -#include -#include -#include #include #include #include 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 750ed7cab8af..4a0bb175784d 100644 --- a/sys/external/bsd/drm2/dist/drm/i915/intel_drv.h +++ b/sys/external/bsd/drm2/dist/drm/i915/intel_drv.h @@ -28,10 +28,8 @@ #define __INTEL_DRV_H__ #include -#include #include #include -#include #include #include "i915_drv.h" #include 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 362e7269a3f7..bcafe31413c0 100644 --- a/sys/external/bsd/drm2/dist/drm/i915/intel_fbdev.c +++ b/sys/external/bsd/drm2/dist/drm/i915/intel_fbdev.c @@ -42,7 +42,6 @@ __KERNEL_RCSID(0, "$NetBSD: intel_fbdev.c,v 1.9 2018/08/27 07:55:39 riastradh Ex #include #include #include -#include #include #include 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 8606549d9a35..5beff006bbee 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 @@ -32,7 +32,6 @@ __KERNEL_RCSID(0, "$NetBSD: intel_guc_loader.c,v 1.13 2018/09/13 08:25:55 mrg Exp $"); #include -#include #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 62ebeb31a090..124dcbc3ad75 100644 --- a/sys/external/bsd/drm2/dist/drm/i915/intel_hdmi.c +++ b/sys/external/bsd/drm2/dist/drm/i915/intel_hdmi.c @@ -35,7 +35,6 @@ __KERNEL_RCSID(0, "$NetBSD: intel_hdmi.c,v 1.7 2018/08/27 07:23:10 riastradh Exp #include #include #include -#include #include #include #include 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 858a3439bba1..851655190055 100644 --- a/sys/external/bsd/drm2/dist/drm/i915/intel_i2c.c +++ b/sys/external/bsd/drm2/dist/drm/i915/intel_i2c.c @@ -34,7 +34,6 @@ __KERNEL_RCSID(0, "$NetBSD: intel_i2c.c,v 1.17 2018/09/13 08:25:55 mrg Exp $"); #include #include #include -#include #include #include "intel_drv.h" #include 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 2c88a624e259..2558b0a28510 100644 --- a/sys/external/bsd/drm2/dist/drm/i915/intel_lvds.c +++ b/sys/external/bsd/drm2/dist/drm/i915/intel_lvds.c @@ -44,8 +44,6 @@ __KERNEL_RCSID(0, "$NetBSD: intel_lvds.c,v 1.7 2018/08/27 04:58:24 riastradh Exp #include #include "i915_drv.h" #include -#include -#include /* 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 b457148d618c..275402cd40b0 100644 --- a/sys/external/bsd/drm2/dist/drm/i915/intel_opregion.c +++ b/sys/external/bsd/drm2/dist/drm/i915/intel_opregion.c @@ -30,10 +30,8 @@ #include __KERNEL_RCSID(0, "$NetBSD: intel_opregion.c,v 1.15 2020/02/10 21:54:26 maya Exp $"); -#include #include #include -#include #include #include 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 a43013b34a99..3a5faf20de30 100644 --- a/sys/external/bsd/drm2/dist/drm/i915/intel_overlay.c +++ b/sys/external/bsd/drm2/dist/drm/i915/intel_overlay.c @@ -30,8 +30,6 @@ #include __KERNEL_RCSID(0, "$NetBSD: intel_overlay.c,v 1.8 2018/08/27 07:26:59 riastradh Exp $"); -#include -#include #include #include #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 ea9ddce6acba..c8547de7c219 100644 --- a/sys/external/bsd/drm2/dist/drm/i915/intel_panel.c +++ b/sys/external/bsd/drm2/dist/drm/i915/intel_panel.c @@ -37,9 +37,6 @@ __KERNEL_RCSID(0, "$NetBSD: intel_panel.c,v 1.12 2018/10/06 15:33:35 christos Ex #include #include -#include -#include -#include #include #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 7fdb4e7367f8..632bf3173af8 100644 --- a/sys/external/bsd/drm2/dist/drm/i915/intel_pm.c +++ b/sys/external/bsd/drm2/dist/drm/i915/intel_pm.c @@ -30,9 +30,7 @@ #include __KERNEL_RCSID(0, "$NetBSD: intel_pm.c,v 1.20 2019/12/05 20:03:09 maya Exp $"); -#include #include -#include #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.20 2019/12/05 20:03:09 maya Exp $"); #include "../../../platform/x86/intel_ips.h" #endif #include -#include -#include -#include #include 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 65f6654ca5e3..d0dd86972bbc 100644 --- a/sys/external/bsd/drm2/dist/drm/i915/intel_ringbuffer.c +++ b/sys/external/bsd/drm2/dist/drm/i915/intel_ringbuffer.c @@ -32,7 +32,6 @@ #include __KERNEL_RCSID(0, "$NetBSD: intel_ringbuffer.c,v 1.11 2019/12/05 20:03:09 maya Exp $"); -#include #include #include "i915_drv.h" #include 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 f743bcb15dd0..f7970966f91e 100644 --- a/sys/external/bsd/drm2/dist/drm/i915/intel_ringbuffer.h +++ b/sys/external/bsd/drm2/dist/drm/i915/intel_ringbuffer.h @@ -3,7 +3,6 @@ #ifndef _INTEL_RINGBUFFER_H_ #define _INTEL_RINGBUFFER_H_ -#include #include #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 8ce66b1fb10c..967931f38351 100644 --- a/sys/external/bsd/drm2/dist/drm/i915/intel_sdvo.c +++ b/sys/external/bsd/drm2/dist/drm/i915/intel_sdvo.c @@ -33,10 +33,7 @@ __KERNEL_RCSID(0, "$NetBSD: intel_sdvo.c,v 1.12 2019/02/19 00:30:16 christos Exp #include #include #include -#include #include -#include -#include #include #include #include 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 8987e4954009..db1a60b06a88 100644 --- a/sys/external/bsd/drm2/dist/drm/i915/intel_uncore.c +++ b/sys/external/bsd/drm2/dist/drm/i915/intel_uncore.c @@ -31,7 +31,6 @@ __KERNEL_RCSID(0, "$NetBSD: intel_uncore.c,v 1.11 2019/07/24 14:57:09 msaitoh Ex #include "i915_vgpu.h" #include "i915_trace.h" -#include #include #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 52459be3484a..4bf3c42543e8 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 @@ -27,8 +27,6 @@ #include __KERNEL_RCSID(0, "$NetBSD: nouveau_dispnv04_disp.c,v 1.4 2018/08/27 14:48:21 riastradh Exp $"); -#include - #include #include 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 f96a68fcdadb..cdff9501d5ca 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 @@ -29,7 +29,6 @@ #include __KERNEL_RCSID(0, "$NetBSD: nouveau_dispnv04_tvmodesnv17.c,v 1.4 2018/08/27 04:58:29 riastradh Exp $"); -#include /* XXX */ #include #include #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 cdf0391e42ff..eca01ee39f55 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 @@ -29,8 +29,6 @@ #include __KERNEL_RCSID(0, "$NetBSD: nouveau_dispnv04_tvnv04.c,v 1.4 2018/08/27 07:35:03 riastradh Exp $"); -#include - #include #include "nouveau_drm.h" #include "nouveau_reg.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 049d019cc3cf..c7e64aa63bfa 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 @@ -2,7 +2,6 @@ #ifndef __NVKM_DEVICE_H__ #define __NVKM_DEVICE_H__ -#include #include #include 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 08f143e951b1..13547887cf46 100644 --- a/sys/external/bsd/drm2/dist/drm/nouveau/nouveau_bios.h +++ b/sys/external/bsd/drm2/dist/drm/nouveau/nouveau_bios.h @@ -26,8 +26,6 @@ #ifndef __NOUVEAU_DISPBIOS_H__ #define __NOUVEAU_DISPBIOS_H__ -#include - #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 4d108dae1f17..772cad409b0a 100644 --- a/sys/external/bsd/drm2/dist/drm/nouveau/nouveau_connector.c +++ b/sys/external/bsd/drm2/dist/drm/nouveau/nouveau_connector.c @@ -31,9 +31,7 @@ __KERNEL_RCSID(0, "$NetBSD: nouveau_connector.c,v 1.4 2018/08/27 04:58:24 riastr #include -#include #include -#include #include #include 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 88e3df844b32..56adee91c415 100644 --- a/sys/external/bsd/drm2/dist/drm/nouveau/nouveau_display.c +++ b/sys/external/bsd/drm2/dist/drm/nouveau/nouveau_display.c @@ -29,8 +29,6 @@ #include __KERNEL_RCSID(0, "$NetBSD: nouveau_display.c,v 1.3 2018/08/27 04:58:24 riastradh Exp $"); -#include - #include #include 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 9deceae2ff5d..56dd5d5cadd8 100644 --- a/sys/external/bsd/drm2/dist/drm/nouveau/nouveau_fence.c +++ b/sys/external/bsd/drm2/dist/drm/nouveau/nouveau_fence.c @@ -31,7 +31,6 @@ __KERNEL_RCSID(0, "$NetBSD: nouveau_fence.c,v 1.14 2019/04/16 10:00:04 mrg Exp $ #include -#include #include #include #include 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 e35970c59f70..28e8efb282e2 100644 --- a/sys/external/bsd/drm2/dist/drm/nouveau/nouveau_gem.c +++ b/sys/external/bsd/drm2/dist/drm/nouveau/nouveau_gem.c @@ -29,8 +29,6 @@ #include __KERNEL_RCSID(0, "$NetBSD: nouveau_gem.c,v 1.9 2019/01/27 02:08:42 pgoyette Exp $"); -#include /* XXX */ - #include "nouveau_drm.h" #include "nouveau_dma.h" #include "nouveau_fence.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 8e418e7158d8..3218b6638ee8 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 @@ -28,7 +28,6 @@ __KERNEL_RCSID(0, "$NetBSD: nouveau_nv50_display.c,v 1.10 2018/08/27 14:48:21 riastradh Exp $"); #include -#include #include #include 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 caf797e02a0e..32ef514ef5f3 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 @@ -35,8 +35,6 @@ __KERNEL_RCSID(0, "$NetBSD: nouveau_nvkm_engine_disp_gf119.c,v 1.2 2018/08/27 04 #include #include -#include /* 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 3df0f6ac301b..293936c1ec2c 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 @@ -38,9 +38,6 @@ __KERNEL_RCSID(0, "$NetBSD: nouveau_nvkm_engine_disp_nv50.c,v 1.2 2018/08/27 04: #include #include -#include /* XXX */ -#include /* 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 c4dd22e4be5d..d1ba2d01d889 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 @@ -26,8 +26,6 @@ #include __KERNEL_RCSID(0, "$NetBSD: nouveau_nvkm_engine_gr_gf100.c,v 1.3 2018/08/27 07:38:56 riastradh Exp $"); -#include /* XXX */ - #include "gf100.h" #include "ctxgf100.h" #include "fuc/os.h" diff --git a/sys/external/bsd/drm2/dist/drm/radeon/radeon.h b/sys/external/bsd/drm2/dist/drm/radeon/radeon.h index 0b56fcf7c5e9..023fe2e9910f 100644 --- a/sys/external/bsd/drm2/dist/drm/radeon/radeon.h +++ b/sys/external/bsd/drm2/dist/drm/radeon/radeon.h @@ -62,7 +62,6 @@ * are considered as fatal) */ -#include #include #include #include @@ -70,11 +69,6 @@ #include #include #include -#include -#include -#include -#include -#include #include #include 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 a2c80e08ac4d..ee519c4a3b15 100644 --- a/sys/external/bsd/drm2/dist/drm/radeon/radeon_bios.c +++ b/sys/external/bsd/drm2/dist/drm/radeon/radeon_bios.c @@ -37,7 +37,6 @@ __KERNEL_RCSID(0, "$NetBSD: radeon_bios.c,v 1.6 2018/08/27 13:55:59 riastradh Ex #include #include -#include /* * 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 11607da321e7..22b8fbd42cfc 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 @@ -27,7 +27,6 @@ __KERNEL_RCSID(0, "$NetBSD: radeon_cik_sdma.c,v 1.1 2018/08/27 14:38:20 riastradh Exp $"); #include -#include #include #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 0c0b8d95887a..ed683c4c3bf4 100644 --- a/sys/external/bsd/drm2/dist/drm/radeon/radeon_device.c +++ b/sys/external/bsd/drm2/dist/drm/radeon/radeon_device.c @@ -38,7 +38,6 @@ __KERNEL_RCSID(0, "$NetBSD: radeon_device.c,v 1.7 2020/01/26 14:36:35 jmcneill E #include #include #include -#include #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 170ced0eeb39..2acaf9d7b461 100644 --- a/sys/external/bsd/drm2/dist/drm/radeon/radeon_display.c +++ b/sys/external/bsd/drm2/dist/drm/radeon/radeon_display.c @@ -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 -#include #include #include #include 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 7947dacb5890..530f54077469 100644 --- a/sys/external/bsd/drm2/dist/drm/radeon/radeon_drv.c +++ b/sys/external/bsd/drm2/dist/drm/radeon/radeon_drv.c @@ -41,7 +41,6 @@ __KERNEL_RCSID(0, "$NetBSD: radeon_drv.c,v 1.9 2018/08/28 03:41:39 riastradh Exp #include #include #include -#include #include #include #include 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 39ed2c7962a0..44ffde6932ba 100644 --- a/sys/external/bsd/drm2/dist/drm/radeon/radeon_evergreen.c +++ b/sys/external/bsd/drm2/dist/drm/radeon/radeon_evergreen.c @@ -26,7 +26,6 @@ #include __KERNEL_RCSID(0, "$NetBSD: radeon_evergreen.c,v 1.3 2019/10/04 12:29:05 mrg Exp $"); -#include #include #include #include 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 d06d1a3568e3..5a9066470d16 100644 --- a/sys/external/bsd/drm2/dist/drm/radeon/radeon_i2c.c +++ b/sys/external/bsd/drm2/dist/drm/radeon/radeon_i2c.c @@ -29,7 +29,6 @@ __KERNEL_RCSID(0, "$NetBSD: radeon_i2c.c,v 1.5 2018/08/27 07:46:38 riastradh Exp $"); #include -#include #include #include 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 f2f4a1202633..ad40ef8b6ceb 100644 --- a/sys/external/bsd/drm2/dist/drm/radeon/radeon_r600.c +++ b/sys/external/bsd/drm2/dist/drm/radeon/radeon_r600.c @@ -30,7 +30,6 @@ #include __KERNEL_RCSID(0, "$NetBSD: radeon_r600.c,v 1.3 2019/08/17 16:02:55 msaitoh Exp $"); -#include #include #include #include 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 892e60adbf7c..60ff611bc1ac 100644 --- a/sys/external/bsd/drm2/dist/drm/radeon/radeon_ring.c +++ b/sys/external/bsd/drm2/dist/drm/radeon/radeon_ring.c @@ -31,7 +31,6 @@ #include __KERNEL_RCSID(0, "$NetBSD: radeon_ring.c,v 1.3 2018/08/27 04:58:36 riastradh Exp $"); -#include #include #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 1c513203fcd4..ddd048c2a56e 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 @@ -35,7 +35,6 @@ __KERNEL_RCSID(0, "$NetBSD: radeon_si_dpm.c,v 1.1 2018/08/27 14:38:20 riastradh #include "atom.h" #include #include -#include #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 573bd4b74084..fa3ed7de4a2d 100644 --- a/sys/external/bsd/drm2/dist/drm/ttm/ttm_bo.c +++ b/sys/external/bsd/drm2/dist/drm/ttm/ttm_bo.c @@ -53,9 +53,6 @@ __KERNEL_RCSID(0, "$NetBSD: ttm_bo.c,v 1.16 2020/02/12 20:22:37 jdolecek Exp $") #include #include #include -#include -#include -#include #include 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 08752e4eed1c..2f25dd72546d 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 @@ -40,7 +40,6 @@ __KERNEL_RCSID(0, "$NetBSD: ttm_bo_manager.c,v 1.3 2018/08/27 04:58:37 riastradh #include #include #include -#include /** * 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 0ab774680a16..ed2eda6d2505 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 @@ -43,8 +43,6 @@ __KERNEL_RCSID(0, "$NetBSD: ttm_bo_util.c,v 1.15 2020/01/28 23:21:05 jmcneill Ex #include #include #include -#include -#include #ifdef __NetBSD__ /* PMAP_* caching flags for ttm_io_prot */ #include 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 71973d6d01fd..03a569925476 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 @@ -36,7 +36,6 @@ __KERNEL_RCSID(0, "$NetBSD: ttm_execbuf_util.c,v 1.4 2018/08/27 07:53:39 riastra #include #include #include -#include 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 ac15a2eb6862..d2bac3206394 100644 --- a/sys/external/bsd/drm2/dist/drm/ttm/ttm_memory.c +++ b/sys/external/bsd/drm2/dist/drm/ttm/ttm_memory.c @@ -42,8 +42,6 @@ __KERNEL_RCSID(0, "$NetBSD: ttm_memory.c,v 1.4 2018/08/27 14:41:10 riastradh Exp #include #include #include -#include -#include #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 cbd67d66e4c0..d3882af3a204 100644 --- a/sys/external/bsd/drm2/dist/drm/ttm/ttm_tt.c +++ b/sys/external/bsd/drm2/dist/drm/ttm/ttm_tt.c @@ -43,7 +43,6 @@ __KERNEL_RCSID(0, "$NetBSD: ttm_tt.c,v 1.11 2018/08/27 04:58:37 riastradh Exp $" #include #include #include -#include #include #include #include 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 9338d8a96244..db5bc211c3cf 100644 --- a/sys/external/bsd/drm2/dist/drm/via/via_dma.c +++ b/sys/external/bsd/drm2/dist/drm/via/via_dma.c @@ -44,8 +44,6 @@ __KERNEL_RCSID(0, "$NetBSD: via_dma.c,v 1.3 2018/08/27 04:58:37 riastradh Exp $" #include "via_drv.h" #include "via_3d_reg.h" -#include - #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 1c0f3b9f94ad..fc76a2782f6f 100644 --- a/sys/external/bsd/drm2/dist/drm/via/via_dmablit.c +++ b/sys/external/bsd/drm2/dist/drm/via/via_dmablit.c @@ -46,7 +46,6 @@ __KERNEL_RCSID(0, "$NetBSD: via_dmablit.c,v 1.6 2018/08/27 04:58:37 riastradh Ex #include #include -#include #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 90f51e97b390..fd587152507b 100644 --- a/sys/external/bsd/drm2/dist/include/drm/drmP.h +++ b/sys/external/bsd/drm2/dist/include/drm/drmP.h @@ -35,12 +35,10 @@ #define _DRM_P_H_ #include -#include #include #include #include #include -#include #include #include #include @@ -48,24 +46,19 @@ #include #include #include -#include #include #include #include #include #include -#include #include #include #include #include -#include #include -#include #include #include -#include #include #include #include @@ -75,6 +68,19 @@ #ifdef __NetBSD__ #include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #else #include #endif diff --git a/sys/external/bsd/drm2/include/linux/atomic.h b/sys/external/bsd/drm2/include/linux/atomic.h index e509157c1aa5..9fa49a6b1df5 100644 --- a/sys/external/bsd/drm2/include/linux/atomic.h +++ b/sys/external/bsd/drm2/include/linux/atomic.h @@ -36,6 +36,8 @@ #include +#include + #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 d0d0f8d95ec8..e551254bda13 100644 --- a/sys/external/bsd/drm2/include/linux/fs.h +++ b/sys/external/bsd/drm2/include/linux/fs.h @@ -33,5 +33,6 @@ #define _LINUX_FS_H_ #include +#include #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 dcb8bd7a2dde..bdc52e388b31 100644 --- a/sys/external/bsd/drm2/include/linux/interrupt.h +++ b/sys/external/bsd/drm2/include/linux/interrupt.h @@ -34,6 +34,8 @@ #include +#include + #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 10c4a0b28c38..8223a3f2104c 100644 --- a/sys/external/bsd/drm2/include/linux/jiffies.h +++ b/sys/external/bsd/drm2/include/linux/jiffies.h @@ -35,6 +35,10 @@ #include #include +#include /* HZ */ + +#include + #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 11b227bd3453..9574c0f40ec9 100644 --- a/sys/external/bsd/drm2/include/linux/ktime.h +++ b/sys/external/bsd/drm2/include/linux/ktime.h @@ -37,6 +37,7 @@ #include #include +#include #include 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 de3cc7946908..391d1fcab718 100644 --- a/sys/external/bsd/drm2/include/linux/mm_types.h +++ b/sys/external/bsd/drm2/include/linux/mm_types.h @@ -34,6 +34,8 @@ #include /* XXX don't expose this */ +#include + 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 22e42b55c118..021b4791eec5 100644 --- a/sys/external/bsd/drm2/include/linux/mutex.h +++ b/sys/external/bsd/drm2/include/linux/mutex.h @@ -35,6 +35,9 @@ #include #include /* KASSERT */ + +#include + #include #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 a3dacd373ea7..59800fc33c21 100644 --- a/sys/external/bsd/drm2/include/linux/pci.h +++ b/sys/external/bsd/drm2/include/linux/pci.h @@ -61,7 +61,10 @@ struct acpi_devnode; #endif +#include #include +#include +#include #include #include diff --git a/sys/external/bsd/drm2/include/linux/pm_qos.h b/sys/external/bsd/drm2/include/linux/pm_qos.h index d47e2bb84e84..fd88cb50fcbe 100644 --- a/sys/external/bsd/drm2/include/linux/pm_qos.h +++ b/sys/external/bsd/drm2/include/linux/pm_qos.h @@ -32,6 +32,8 @@ #ifndef _LINUX_PM_QOS_H_ #define _LINUX_PM_QOS_H_ +#include + 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 048105b61c1f..b6d60d0d33ff 100644 --- a/sys/external/bsd/drm2/include/linux/pm_runtime.h +++ b/sys/external/bsd/drm2/include/linux/pm_runtime.h @@ -32,6 +32,8 @@ #ifndef _LINUX_PM_RUNTIME_H_ #define _LINUX_PM_RUNTIME_H_ +#include + struct device; static inline void -- 2.19.1