Module Name: src
Committed By: maya
Date: Fri Feb 14 14:35:00 UTC 2020
Modified Files:
src/sys/external/bsd/common/include/linux: kernel.h
src/sys/external/bsd/drm2/dist/drm: drm_agpsupport.c drm_atomic.c
drm_atomic_helper.c drm_bufs.c drm_context.c drm_crtc.c
drm_crtc_helper.c drm_dp_helper.c drm_dp_mst_topology.c drm_drv.c
drm_edid.c drm_fb_helper.c drm_flip_work.c drm_gem.c drm_global.c
drm_irq.c drm_mm.c drm_modeset_lock.c drm_plane_helper.c
drm_probe_helper.c
src/sys/external/bsd/drm2/dist/drm/amd/amdgpu: amdgpu_atom.c
amdgpu_atombios.c amdgpu_atombios_crtc.c amdgpu_atombios_dp.c
amdgpu_atombios_encoders.c amdgpu_atombios_i2c.c amdgpu_cgs.c
amdgpu_ci_dpm.c amdgpu_ci_smc.c amdgpu_cik_ih.c amdgpu_cik_sdma.c
amdgpu_cz_dpm.c amdgpu_cz_ih.c amdgpu_cz_smc.c amdgpu_dpm.c
amdgpu_fence.c amdgpu_fiji_dpm.c amdgpu_fiji_smc.c
amdgpu_gfx_v7_0.c amdgpu_gfx_v8_0.c amdgpu_gmc_v7_0.c
amdgpu_gmc_v8_0.c amdgpu_i2c.c amdgpu_iceland_dpm.c
amdgpu_iceland_ih.c amdgpu_iceland_smc.c amdgpu_ih.c
amdgpu_kv_dpm.c amdgpu_object.h amdgpu_ring.c amdgpu_sdma_v2_4.c
amdgpu_sdma_v3_0.c amdgpu_tonga_dpm.c amdgpu_tonga_ih.c
amdgpu_tonga_smc.c amdgpu_ucode.c amdgpu_uvd.c amdgpu_uvd_v4_2.c
amdgpu_uvd_v5_0.c amdgpu_uvd_v6_0.c amdgpu_vce.c amdgpu_vce_v3_0.c
src/sys/external/bsd/drm2/dist/drm/i915: i915_cmd_parser.c i915_drv.c
i915_gem.c i915_gem_context.c i915_gem_execbuffer.c i915_gem_gtt.c
i915_gem_stolen.c i915_gpu_error.c i915_irq.c i915_params.c
intel_csr.c intel_display.c intel_dp.c intel_drv.h intel_fbdev.c
intel_guc_loader.c intel_hdmi.c intel_i2c.c intel_lvds.c
intel_opregion.c intel_overlay.c intel_panel.c intel_pm.c
intel_ringbuffer.c intel_ringbuffer.h intel_sdvo.c intel_uncore.c
src/sys/external/bsd/drm2/dist/drm/nouveau: nouveau_bios.h
nouveau_connector.c nouveau_display.c nouveau_fence.c nouveau_gem.c
nouveau_nv50_display.c
src/sys/external/bsd/drm2/dist/drm/nouveau/dispnv04:
nouveau_dispnv04_disp.c nouveau_dispnv04_tvmodesnv17.c
nouveau_dispnv04_tvnv04.c
src/sys/external/bsd/drm2/dist/drm/nouveau/include/nvkm/core: device.h
src/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/engine/disp:
nouveau_nvkm_engine_disp_gf119.c nouveau_nvkm_engine_disp_nv50.c
src/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/engine/gr:
nouveau_nvkm_engine_gr_gf100.c
src/sys/external/bsd/drm2/dist/drm/radeon: radeon.h radeon_bios.c
radeon_cik_sdma.c radeon_device.c radeon_display.c radeon_drv.c
radeon_evergreen.c radeon_i2c.c radeon_r600.c radeon_ring.c
radeon_si_dpm.c
src/sys/external/bsd/drm2/dist/drm/ttm: ttm_bo.c ttm_bo_manager.c
ttm_bo_util.c ttm_execbuf_util.c ttm_memory.c ttm_tt.c
src/sys/external/bsd/drm2/dist/drm/via: via_dma.c via_dmablit.c
src/sys/external/bsd/drm2/dist/include/drm: drmP.h
src/sys/external/bsd/drm2/include/linux: atomic.h fs.h interrupt.h
jiffies.h ktime.h mm_types.h mutex.h pci.h pm_qos.h pm_runtime.h
Log Message:
Reduce diffs by side-loading some header files like Linux.
>From riastradh
To generate a diff of this commit:
cvs rdiff -u -r1.24 -r1.25 src/sys/external/bsd/common/include/linux/kernel.h
cvs rdiff -u -r1.10 -r1.11 \
src/sys/external/bsd/drm2/dist/drm/drm_agpsupport.c
cvs rdiff -u -r1.7 -r1.8 src/sys/external/bsd/drm2/dist/drm/drm_atomic.c \
src/sys/external/bsd/drm2/dist/drm/drm_edid.c
cvs rdiff -u -r1.4 -r1.5 \
src/sys/external/bsd/drm2/dist/drm/drm_atomic_helper.c \
src/sys/external/bsd/drm2/dist/drm/drm_dp_mst_topology.c
cvs rdiff -u -r1.11 -r1.12 src/sys/external/bsd/drm2/dist/drm/drm_bufs.c \
src/sys/external/bsd/drm2/dist/drm/drm_dp_helper.c \
src/sys/external/bsd/drm2/dist/drm/drm_drv.c
cvs rdiff -u -r1.5 -r1.6 src/sys/external/bsd/drm2/dist/drm/drm_context.c \
src/sys/external/bsd/drm2/dist/drm/drm_crtc_helper.c \
src/sys/external/bsd/drm2/dist/drm/drm_global.c \
src/sys/external/bsd/drm2/dist/drm/drm_mm.c
cvs rdiff -u -r1.15 -r1.16 src/sys/external/bsd/drm2/dist/drm/drm_crtc.c \
src/sys/external/bsd/drm2/dist/drm/drm_fb_helper.c \
src/sys/external/bsd/drm2/dist/drm/drm_irq.c
cvs rdiff -u -r1.3 -r1.4 src/sys/external/bsd/drm2/dist/drm/drm_flip_work.c \
src/sys/external/bsd/drm2/dist/drm/drm_modeset_lock.c \
src/sys/external/bsd/drm2/dist/drm/drm_plane_helper.c \
src/sys/external/bsd/drm2/dist/drm/drm_probe_helper.c
cvs rdiff -u -r1.13 -r1.14 src/sys/external/bsd/drm2/dist/drm/drm_gem.c
cvs rdiff -u -r1.2 -r1.3 \
src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_atom.c \
src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_atombios_dp.c \
src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_atombios_encoders.c \
src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_ci_smc.c \
src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_cik_ih.c \
src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_cik_sdma.c \
src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_cz_dpm.c \
src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_gfx_v7_0.c \
src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_gmc_v7_0.c \
src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_gmc_v8_0.c \
src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_sdma_v2_4.c \
src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_sdma_v3_0.c \
src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_uvd_v4_2.c
cvs rdiff -u -r1.4 -r1.5 \
src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_atombios.c \
src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_cgs.c \
src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_ci_dpm.c \
src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_cz_smc.c \
src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_dpm.c \
src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_i2c.c \
src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_vce.c
cvs rdiff -u -r1.1 -r1.2 \
src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_atombios_crtc.c \
src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_atombios_i2c.c \
src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_cz_ih.c \
src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_fiji_dpm.c \
src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_fiji_smc.c \
src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_iceland_dpm.c \
src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_iceland_ih.c \
src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_iceland_smc.c \
src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_tonga_dpm.c \
src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_tonga_ih.c \
src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_tonga_smc.c \
src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_uvd_v5_0.c \
src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_uvd_v6_0.c \
src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_vce_v3_0.c
cvs rdiff -u -r1.5 -r1.6 \
src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_fence.c \
src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_ucode.c
cvs rdiff -u -r1.3 -r1.4 \
src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_gfx_v8_0.c \
src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_ih.c \
src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_kv_dpm.c \
src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_object.h \
src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_ring.c
cvs rdiff -u -r1.6 -r1.7 \
src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_uvd.c
cvs rdiff -u -r1.21 -r1.22 \
src/sys/external/bsd/drm2/dist/drm/i915/i915_cmd_parser.c \
src/sys/external/bsd/drm2/dist/drm/i915/intel_dp.c
cvs rdiff -u -r1.18 -r1.19 src/sys/external/bsd/drm2/dist/drm/i915/i915_drv.c \
src/sys/external/bsd/drm2/dist/drm/i915/i915_irq.c \
src/sys/external/bsd/drm2/dist/drm/i915/intel_i2c.c
cvs rdiff -u -r1.58 -r1.59 src/sys/external/bsd/drm2/dist/drm/i915/i915_gem.c
cvs rdiff -u -r1.11 -r1.12 \
src/sys/external/bsd/drm2/dist/drm/i915/i915_gem_context.c \
src/sys/external/bsd/drm2/dist/drm/i915/intel_ringbuffer.c
cvs rdiff -u -r1.10 -r1.11 \
src/sys/external/bsd/drm2/dist/drm/i915/i915_gem_execbuffer.c \
src/sys/external/bsd/drm2/dist/drm/i915/i915_gpu_error.c
cvs rdiff -u -r1.16 -r1.17 \
src/sys/external/bsd/drm2/dist/drm/i915/i915_gem_gtt.c \
src/sys/external/bsd/drm2/dist/drm/i915/intel_opregion.c
cvs rdiff -u -r1.13 -r1.14 \
src/sys/external/bsd/drm2/dist/drm/i915/i915_gem_stolen.c \
src/sys/external/bsd/drm2/dist/drm/i915/intel_guc_loader.c \
src/sys/external/bsd/drm2/dist/drm/i915/intel_panel.c
cvs rdiff -u -r1.3 -r1.4 \
src/sys/external/bsd/drm2/dist/drm/i915/i915_params.c
cvs rdiff -u -r1.5 -r1.6 src/sys/external/bsd/drm2/dist/drm/i915/intel_csr.c
cvs rdiff -u -r1.31 -r1.32 \
src/sys/external/bsd/drm2/dist/drm/i915/intel_display.c
cvs rdiff -u -r1.12 -r1.13 \
src/sys/external/bsd/drm2/dist/drm/i915/intel_drv.h \
src/sys/external/bsd/drm2/dist/drm/i915/intel_fbdev.c \
src/sys/external/bsd/drm2/dist/drm/i915/intel_uncore.c
cvs rdiff -u -r1.8 -r1.9 src/sys/external/bsd/drm2/dist/drm/i915/intel_hdmi.c
cvs rdiff -u -r1.9 -r1.10 \
src/sys/external/bsd/drm2/dist/drm/i915/intel_lvds.c \
src/sys/external/bsd/drm2/dist/drm/i915/intel_overlay.c
cvs rdiff -u -r1.23 -r1.24 src/sys/external/bsd/drm2/dist/drm/i915/intel_pm.c
cvs rdiff -u -r1.7 -r1.8 \
src/sys/external/bsd/drm2/dist/drm/i915/intel_ringbuffer.h
cvs rdiff -u -r1.14 -r1.15 \
src/sys/external/bsd/drm2/dist/drm/i915/intel_sdvo.c
cvs rdiff -u -r1.3 -r1.4 \
src/sys/external/bsd/drm2/dist/drm/nouveau/nouveau_bios.h \
src/sys/external/bsd/drm2/dist/drm/nouveau/nouveau_display.c
cvs rdiff -u -r1.4 -r1.5 \
src/sys/external/bsd/drm2/dist/drm/nouveau/nouveau_connector.c
cvs rdiff -u -r1.14 -r1.15 \
src/sys/external/bsd/drm2/dist/drm/nouveau/nouveau_fence.c
cvs rdiff -u -r1.10 -r1.11 \
src/sys/external/bsd/drm2/dist/drm/nouveau/nouveau_gem.c \
src/sys/external/bsd/drm2/dist/drm/nouveau/nouveau_nv50_display.c
cvs rdiff -u -r1.4 -r1.5 \
src/sys/external/bsd/drm2/dist/drm/nouveau/dispnv04/nouveau_dispnv04_disp.c
\
src/sys/external/bsd/drm2/dist/drm/nouveau/dispnv04/nouveau_dispnv04_tvmodesnv17.c
\
src/sys/external/bsd/drm2/dist/drm/nouveau/dispnv04/nouveau_dispnv04_tvnv04.c
cvs rdiff -u -r1.7 -r1.8 \
src/sys/external/bsd/drm2/dist/drm/nouveau/include/nvkm/core/device.h
cvs rdiff -u -r1.2 -r1.3 \
src/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/engine/disp/nouveau_nvkm_engine_disp_gf119.c
\
src/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/engine/disp/nouveau_nvkm_engine_disp_nv50.c
cvs rdiff -u -r1.3 -r1.4 \
src/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/engine/gr/nouveau_nvkm_engine_gr_gf100.c
cvs rdiff -u -r1.8 -r1.9 src/sys/external/bsd/drm2/dist/drm/radeon/radeon.h
cvs rdiff -u -r1.6 -r1.7 \
src/sys/external/bsd/drm2/dist/drm/radeon/radeon_bios.c \
src/sys/external/bsd/drm2/dist/drm/radeon/radeon_i2c.c
cvs rdiff -u -r1.1 -r1.2 \
src/sys/external/bsd/drm2/dist/drm/radeon/radeon_cik_sdma.c
cvs rdiff -u -r1.9 -r1.10 \
src/sys/external/bsd/drm2/dist/drm/radeon/radeon_device.c \
src/sys/external/bsd/drm2/dist/drm/radeon/radeon_drv.c
cvs rdiff -u -r1.10 -r1.11 \
src/sys/external/bsd/drm2/dist/drm/radeon/radeon_display.c
cvs rdiff -u -r1.3 -r1.4 \
src/sys/external/bsd/drm2/dist/drm/radeon/radeon_evergreen.c \
src/sys/external/bsd/drm2/dist/drm/radeon/radeon_ring.c \
src/sys/external/bsd/drm2/dist/drm/radeon/radeon_si_dpm.c
cvs rdiff -u -r1.4 -r1.5 \
src/sys/external/bsd/drm2/dist/drm/radeon/radeon_r600.c
cvs rdiff -u -r1.18 -r1.19 src/sys/external/bsd/drm2/dist/drm/ttm/ttm_bo.c \
src/sys/external/bsd/drm2/dist/drm/ttm/ttm_bo_util.c
cvs rdiff -u -r1.3 -r1.4 \
src/sys/external/bsd/drm2/dist/drm/ttm/ttm_bo_manager.c
cvs rdiff -u -r1.4 -r1.5 \
src/sys/external/bsd/drm2/dist/drm/ttm/ttm_execbuf_util.c
cvs rdiff -u -r1.5 -r1.6 src/sys/external/bsd/drm2/dist/drm/ttm/ttm_memory.c
cvs rdiff -u -r1.11 -r1.12 src/sys/external/bsd/drm2/dist/drm/ttm/ttm_tt.c
cvs rdiff -u -r1.4 -r1.5 src/sys/external/bsd/drm2/dist/drm/via/via_dma.c
cvs rdiff -u -r1.7 -r1.8 src/sys/external/bsd/drm2/dist/drm/via/via_dmablit.c
cvs rdiff -u -r1.36 -r1.37 src/sys/external/bsd/drm2/dist/include/drm/drmP.h
cvs rdiff -u -r1.21 -r1.22 src/sys/external/bsd/drm2/include/linux/atomic.h
cvs rdiff -u -r1.3 -r1.4 src/sys/external/bsd/drm2/include/linux/fs.h \
src/sys/external/bsd/drm2/include/linux/interrupt.h
cvs rdiff -u -r1.12 -r1.13 src/sys/external/bsd/drm2/include/linux/jiffies.h
cvs rdiff -u -r1.8 -r1.9 src/sys/external/bsd/drm2/include/linux/ktime.h
cvs rdiff -u -r1.4 -r1.5 src/sys/external/bsd/drm2/include/linux/mm_types.h \
src/sys/external/bsd/drm2/include/linux/pm_runtime.h
cvs rdiff -u -r1.11 -r1.12 src/sys/external/bsd/drm2/include/linux/mutex.h
cvs rdiff -u -r1.38 -r1.39 src/sys/external/bsd/drm2/include/linux/pci.h
cvs rdiff -u -r1.1 -r1.2 src/sys/external/bsd/drm2/include/linux/pm_qos.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/external/bsd/common/include/linux/kernel.h
diff -u src/sys/external/bsd/common/include/linux/kernel.h:1.24 src/sys/external/bsd/common/include/linux/kernel.h:1.25
--- src/sys/external/bsd/common/include/linux/kernel.h:1.24 Fri Feb 14 04:38:36 2020
+++ src/sys/external/bsd/common/include/linux/kernel.h Fri Feb 14 14:34:57 2020
@@ -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>
Index: src/sys/external/bsd/drm2/dist/drm/drm_agpsupport.c
diff -u src/sys/external/bsd/drm2/dist/drm/drm_agpsupport.c:1.10 src/sys/external/bsd/drm2/dist/drm/drm_agpsupport.c:1.11
--- src/sys/external/bsd/drm2/dist/drm/drm_agpsupport.c:1.10 Tue Aug 28 03:41:38 2018
+++ src/sys/external/bsd/drm2/dist/drm/drm_agpsupport.c Fri Feb 14 14:34:57 2020
@@ -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"
Index: src/sys/external/bsd/drm2/dist/drm/drm_atomic.c
diff -u src/sys/external/bsd/drm2/dist/drm/drm_atomic.c:1.7 src/sys/external/bsd/drm2/dist/drm/drm_atomic.c:1.8
--- src/sys/external/bsd/drm2/dist/drm/drm_atomic.c:1.7 Mon Aug 27 07:45:55 2018
+++ src/sys/external/bsd/drm2/dist/drm/drm_atomic.c Fri Feb 14 14:34:57 2020
@@ -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>
Index: src/sys/external/bsd/drm2/dist/drm/drm_edid.c
diff -u src/sys/external/bsd/drm2/dist/drm/drm_edid.c:1.7 src/sys/external/bsd/drm2/dist/drm/drm_edid.c:1.8
--- src/sys/external/bsd/drm2/dist/drm/drm_edid.c:1.7 Fri Feb 14 04:38:48 2020
+++ src/sys/external/bsd/drm2/dist/drm/drm_edid.c Fri Feb 14 14:34:57 2020
@@ -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>
Index: src/sys/external/bsd/drm2/dist/drm/drm_atomic_helper.c
diff -u src/sys/external/bsd/drm2/dist/drm/drm_atomic_helper.c:1.4 src/sys/external/bsd/drm2/dist/drm/drm_atomic_helper.c:1.5
--- src/sys/external/bsd/drm2/dist/drm/drm_atomic_helper.c:1.4 Mon Aug 27 06:50:45 2018
+++ src/sys/external/bsd/drm2/dist/drm/drm_atomic_helper.c Fri Feb 14 14:34:57 2020
@@ -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>
/**
Index: src/sys/external/bsd/drm2/dist/drm/drm_dp_mst_topology.c
diff -u src/sys/external/bsd/drm2/dist/drm/drm_dp_mst_topology.c:1.4 src/sys/external/bsd/drm2/dist/drm/drm_dp_mst_topology.c:1.5
--- src/sys/external/bsd/drm2/dist/drm/drm_dp_mst_topology.c:1.4 Fri Feb 14 04:35:19 2020
+++ src/sys/external/bsd/drm2/dist/drm/drm_dp_mst_topology.c Fri Feb 14 14:34:57 2020
@@ -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_t
#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>
Index: src/sys/external/bsd/drm2/dist/drm/drm_bufs.c
diff -u src/sys/external/bsd/drm2/dist/drm/drm_bufs.c:1.11 src/sys/external/bsd/drm2/dist/drm/drm_bufs.c:1.12
--- src/sys/external/bsd/drm2/dist/drm/drm_bufs.c:1.11 Fri Feb 14 04:36:55 2020
+++ src/sys/external/bsd/drm2/dist/drm/drm_bufs.c Fri Feb 14 14:34:57 2020
@@ -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"
Index: src/sys/external/bsd/drm2/dist/drm/drm_dp_helper.c
diff -u src/sys/external/bsd/drm2/dist/drm/drm_dp_helper.c:1.11 src/sys/external/bsd/drm2/dist/drm/drm_dp_helper.c:1.12
--- src/sys/external/bsd/drm2/dist/drm/drm_dp_helper.c:1.11 Fri Feb 14 09:38:51 2020
+++ src/sys/external/bsd/drm2/dist/drm/drm_dp_helper.c Fri Feb 14 14:34:57 2020
@@ -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>
Index: src/sys/external/bsd/drm2/dist/drm/drm_drv.c
diff -u src/sys/external/bsd/drm2/dist/drm/drm_drv.c:1.11 src/sys/external/bsd/drm2/dist/drm/drm_drv.c:1.12
--- src/sys/external/bsd/drm2/dist/drm/drm_drv.c:1.11 Fri Feb 14 04:35:19 2020
+++ src/sys/external/bsd/drm2/dist/drm/drm_drv.c Fri Feb 14 14:34:57 2020
@@ -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 fa...@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>
Index: src/sys/external/bsd/drm2/dist/drm/drm_context.c
diff -u src/sys/external/bsd/drm2/dist/drm/drm_context.c:1.5 src/sys/external/bsd/drm2/dist/drm/drm_context.c:1.6
--- src/sys/external/bsd/drm2/dist/drm/drm_context.c:1.5 Mon Aug 27 14:14:29 2018
+++ src/sys/external/bsd/drm2/dist/drm/drm_context.c Fri Feb 14 14:34:57 2020
@@ -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"
Index: src/sys/external/bsd/drm2/dist/drm/drm_crtc_helper.c
diff -u src/sys/external/bsd/drm2/dist/drm/drm_crtc_helper.c:1.5 src/sys/external/bsd/drm2/dist/drm/drm_crtc_helper.c:1.6
--- src/sys/external/bsd/drm2/dist/drm/drm_crtc_helper.c:1.5 Mon Aug 27 04:58:19 2018
+++ src/sys/external/bsd/drm2/dist/drm/drm_crtc_helper.c Fri Feb 14 14:34:57 2020
@@ -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>
Index: src/sys/external/bsd/drm2/dist/drm/drm_global.c
diff -u src/sys/external/bsd/drm2/dist/drm/drm_global.c:1.5 src/sys/external/bsd/drm2/dist/drm/drm_global.c:1.6
--- src/sys/external/bsd/drm2/dist/drm/drm_global.c:1.5 Fri Feb 14 04:35:19 2020
+++ src/sys/external/bsd/drm2/dist/drm/drm_global.c Fri Feb 14 14:34:57 2020
@@ -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>
Index: src/sys/external/bsd/drm2/dist/drm/drm_mm.c
diff -u src/sys/external/bsd/drm2/dist/drm/drm_mm.c:1.5 src/sys/external/bsd/drm2/dist/drm/drm_mm.c:1.6
--- src/sys/external/bsd/drm2/dist/drm/drm_mm.c:1.5 Mon Aug 27 06:56:50 2018
+++ src/sys/external/bsd/drm2/dist/drm/drm_mm.c Fri Feb 14 14:34:57 2020
@@ -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
Index: src/sys/external/bsd/drm2/dist/drm/drm_crtc.c
diff -u src/sys/external/bsd/drm2/dist/drm/drm_crtc.c:1.15 src/sys/external/bsd/drm2/dist/drm/drm_crtc.c:1.16
--- src/sys/external/bsd/drm2/dist/drm/drm_crtc.c:1.15 Fri Feb 14 04:37:27 2020
+++ src/sys/external/bsd/drm2/dist/drm/drm_crtc.c Fri Feb 14 14:34:57 2020
@@ -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.bar...@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>
Index: src/sys/external/bsd/drm2/dist/drm/drm_fb_helper.c
diff -u src/sys/external/bsd/drm2/dist/drm/drm_fb_helper.c:1.15 src/sys/external/bsd/drm2/dist/drm/drm_fb_helper.c:1.16
--- src/sys/external/bsd/drm2/dist/drm/drm_fb_helper.c:1.15 Fri Feb 14 04:37:27 2020
+++ src/sys/external/bsd/drm2/dist/drm/drm_fb_helper.c Fri Feb 14 14:34:57 2020
@@ -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.bar...@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_helpe
#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>
Index: src/sys/external/bsd/drm2/dist/drm/drm_irq.c
diff -u src/sys/external/bsd/drm2/dist/drm/drm_irq.c:1.15 src/sys/external/bsd/drm2/dist/drm/drm_irq.c:1.16
--- src/sys/external/bsd/drm2/dist/drm/drm_irq.c:1.15 Mon Aug 27 14:43:32 2018
+++ src/sys/external/bsd/drm2/dist/drm/drm_irq.c Fri Feb 14 14:34:57 2020
@@ -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
#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>
Index: src/sys/external/bsd/drm2/dist/drm/drm_flip_work.c
diff -u src/sys/external/bsd/drm2/dist/drm/drm_flip_work.c:1.3 src/sys/external/bsd/drm2/dist/drm/drm_flip_work.c:1.4
--- src/sys/external/bsd/drm2/dist/drm/drm_flip_work.c:1.3 Mon Aug 27 04:58:19 2018
+++ src/sys/external/bsd/drm2/dist/drm/drm_flip_work.c Fri Feb 14 14:34:57 2020
@@ -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>
Index: src/sys/external/bsd/drm2/dist/drm/drm_modeset_lock.c
diff -u src/sys/external/bsd/drm2/dist/drm/drm_modeset_lock.c:1.3 src/sys/external/bsd/drm2/dist/drm/drm_modeset_lock.c:1.4
--- src/sys/external/bsd/drm2/dist/drm/drm_modeset_lock.c:1.3 Mon Aug 27 06:56:12 2018
+++ src/sys/external/bsd/drm2/dist/drm/drm_modeset_lock.c Fri Feb 14 14:34:57 2020
@@ -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>
Index: src/sys/external/bsd/drm2/dist/drm/drm_plane_helper.c
diff -u src/sys/external/bsd/drm2/dist/drm/drm_plane_helper.c:1.3 src/sys/external/bsd/drm2/dist/drm/drm_plane_helper.c:1.4
--- src/sys/external/bsd/drm2/dist/drm/drm_plane_helper.c:1.3 Mon Aug 27 04:58:19 2018
+++ src/sys/external/bsd/drm2/dist/drm/drm_plane_helper.c Fri Feb 14 14:34:57 2020
@@ -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>
Index: src/sys/external/bsd/drm2/dist/drm/drm_probe_helper.c
diff -u src/sys/external/bsd/drm2/dist/drm/drm_probe_helper.c:1.3 src/sys/external/bsd/drm2/dist/drm/drm_probe_helper.c:1.4
--- src/sys/external/bsd/drm2/dist/drm/drm_probe_helper.c:1.3 Mon Aug 27 04:58:19 2018
+++ src/sys/external/bsd/drm2/dist/drm/drm_probe_helper.c Fri Feb 14 14:34:57 2020
@@ -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>
Index: src/sys/external/bsd/drm2/dist/drm/drm_gem.c
diff -u src/sys/external/bsd/drm2/dist/drm/drm_gem.c:1.13 src/sys/external/bsd/drm2/dist/drm/drm_gem.c:1.14
--- src/sys/external/bsd/drm2/dist/drm/drm_gem.c:1.13 Fri Feb 14 04:35:19 2020
+++ src/sys/external/bsd/drm2/dist/drm/drm_gem.c Fri Feb 14 14:34:57 2020
@@ -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
#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>
Index: src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_atom.c
diff -u src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_atom.c:1.2 src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_atom.c:1.3
--- src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_atom.c:1.2 Fri Feb 14 04:30:04 2020
+++ src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_atom.c Fri Feb 14 14:34:57 2020
@@ -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
Index: src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_atombios_dp.c
diff -u src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_atombios_dp.c:1.2 src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_atombios_dp.c:1.3
--- src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_atombios_dp.c:1.2 Tue Jan 1 08:07:47 2019
+++ src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_atombios_dp.c Fri Feb 14 14:34:57 2020
@@ -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"
Index: src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_atombios_encoders.c
diff -u src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_atombios_encoders.c:1.2 src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_atombios_encoders.c:1.3
--- src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_atombios_encoders.c:1.2 Fri Feb 14 04:30:04 2020
+++ src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_atombios_encoders.c Fri Feb 14 14:34:57 2020
@@ -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_atomb
#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
Index: src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_ci_smc.c
diff -u src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_ci_smc.c:1.2 src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_ci_smc.c:1.3
--- src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_ci_smc.c:1.2 Mon Aug 27 14:24:03 2018
+++ src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_ci_smc.c Fri Feb 14 14:34:57 2020
@@ -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"
Index: src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_cik_ih.c
diff -u src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_cik_ih.c:1.2 src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_cik_ih.c:1.3
--- src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_cik_ih.c:1.2 Mon Aug 27 14:24:03 2018
+++ src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_cik_ih.c Fri Feb 14 14:34:57 2020
@@ -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"
Index: src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_cik_sdma.c
diff -u src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_cik_sdma.c:1.2 src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_cik_sdma.c:1.3
--- src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_cik_sdma.c:1.2 Mon Aug 27 14:24:03 2018
+++ src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_cik_sdma.c Fri Feb 14 14:34:57 2020
@@ -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"
Index: src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_cz_dpm.c
diff -u src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_cz_dpm.c:1.2 src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_cz_dpm.c:1.3
--- src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_cz_dpm.c:1.2 Fri Feb 14 04:30:04 2020
+++ src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_cz_dpm.c Fri Feb 14 14:34:57 2020
@@ -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"
Index: src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_gfx_v7_0.c
diff -u src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_gfx_v7_0.c:1.2 src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_gfx_v7_0.c:1.3
--- src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_gfx_v7_0.c:1.2 Mon Aug 27 14:24:03 2018
+++ src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_gfx_v7_0.c Fri Feb 14 14:34:58 2020
@@ -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"
Index: src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_gmc_v7_0.c
diff -u src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_gmc_v7_0.c:1.2 src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_gmc_v7_0.c:1.3
--- src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_gmc_v7_0.c:1.2 Fri Feb 14 04:30:04 2020
+++ src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_gmc_v7_0.c Fri Feb 14 14:34:58 2020
@@ -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"
Index: src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_gmc_v8_0.c
diff -u src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_gmc_v8_0.c:1.2 src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_gmc_v8_0.c:1.3
--- src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_gmc_v8_0.c:1.2 Fri Feb 14 04:30:04 2020
+++ src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_gmc_v8_0.c Fri Feb 14 14:34:58 2020
@@ -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"
Index: src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_sdma_v2_4.c
diff -u src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_sdma_v2_4.c:1.2 src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_sdma_v2_4.c:1.3
--- src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_sdma_v2_4.c:1.2 Fri Feb 14 04:35:19 2020
+++ src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_sdma_v2_4.c Fri Feb 14 14:34:58 2020
@@ -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"
Index: src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_sdma_v3_0.c
diff -u src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_sdma_v3_0.c:1.2 src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_sdma_v3_0.c:1.3
--- src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_sdma_v3_0.c:1.2 Fri Feb 14 04:35:19 2020
+++ src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_sdma_v3_0.c Fri Feb 14 14:34:58 2020
@@ -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"
Index: src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_uvd_v4_2.c
diff -u src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_uvd_v4_2.c:1.2 src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_uvd_v4_2.c:1.3
--- src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_uvd_v4_2.c:1.2 Mon Aug 27 14:24:03 2018
+++ src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_uvd_v4_2.c Fri Feb 14 14:34:58 2020
@@ -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"
Index: src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_atombios.c
diff -u src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_atombios.c:1.4 src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_atombios.c:1.5
--- src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_atombios.c:1.4 Fri Feb 14 04:30:04 2020
+++ src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_atombios.c Fri Feb 14 14:34:57 2020
@@ -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"
Index: src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_cgs.c
diff -u src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_cgs.c:1.4 src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_cgs.c:1.5
--- src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_cgs.c:1.4 Mon Aug 27 15:26:33 2018
+++ src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_cgs.c Fri Feb 14 14:34:57 2020
@@ -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>
Index: src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_ci_dpm.c
diff -u src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_ci_dpm.c:1.4 src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_ci_dpm.c:1.5
--- src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_ci_dpm.c:1.4 Fri Feb 14 04:30:04 2020
+++ src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_ci_dpm.c Fri Feb 14 14:34:57 2020
@@ -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"
Index: src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_cz_smc.c
diff -u src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_cz_smc.c:1.4 src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_cz_smc.c:1.5
--- src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_cz_smc.c:1.4 Fri Feb 14 04:35:19 2020
+++ src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_cz_smc.c Fri Feb 14 14:34:57 2020
@@ -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"
Index: src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_dpm.c
diff -u src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_dpm.c:1.4 src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_dpm.c:1.5
--- src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_dpm.c:1.4 Fri Feb 14 04:30:04 2020
+++ src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_dpm.c Fri Feb 14 14:34:57 2020
@@ -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"
Index: src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_i2c.c
diff -u src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_i2c.c:1.4 src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_i2c.c:1.5
--- src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_i2c.c:1.4 Fri Feb 14 04:35:19 2020
+++ src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_i2c.c Fri Feb 14 14:34:58 2020
@@ -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>
Index: src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_vce.c
diff -u src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_vce.c:1.4 src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_vce.c:1.5
--- src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_vce.c:1.4 Tue Jan 1 08:07:47 2019
+++ src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_vce.c Fri Feb 14 14:34:58 2020
@@ -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>
Index: src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_atombios_crtc.c
diff -u src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_atombios_crtc.c:1.1 src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_atombios_crtc.c:1.2
--- src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_atombios_crtc.c:1.1 Mon Aug 27 14:10:14 2018
+++ src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_atombios_crtc.c Fri Feb 14 14:34:57 2020
@@ -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"
Index: src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_atombios_i2c.c
diff -u src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_atombios_i2c.c:1.1 src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_atombios_i2c.c:1.2
--- src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_atombios_i2c.c:1.1 Mon Aug 27 14:10:14 2018
+++ src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_atombios_i2c.c Fri Feb 14 14:34:57 2020
@@ -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"
Index: src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_cz_ih.c
diff -u src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_cz_ih.c:1.1 src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_cz_ih.c:1.2
--- src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_cz_ih.c:1.1 Mon Aug 27 14:10:14 2018
+++ src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_cz_ih.c Fri Feb 14 14:34:57 2020
@@ -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"
Index: src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_fiji_dpm.c
diff -u src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_fiji_dpm.c:1.1 src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_fiji_dpm.c:1.2
--- src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_fiji_dpm.c:1.1 Mon Aug 27 14:10:14 2018
+++ src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_fiji_dpm.c Fri Feb 14 14:34:58 2020
@@ -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"
Index: src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_fiji_smc.c
diff -u src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_fiji_smc.c:1.1 src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_fiji_smc.c:1.2
--- src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_fiji_smc.c:1.1 Mon Aug 27 14:10:14 2018
+++ src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_fiji_smc.c Fri Feb 14 14:34:58 2020
@@ -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"
Index: src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_iceland_dpm.c
diff -u src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_iceland_dpm.c:1.1 src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_iceland_dpm.c:1.2
--- src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_iceland_dpm.c:1.1 Mon Aug 27 14:10:14 2018
+++ src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_iceland_dpm.c Fri Feb 14 14:34:58 2020
@@ -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"
Index: src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_iceland_ih.c
diff -u src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_iceland_ih.c:1.1 src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_iceland_ih.c:1.2
--- src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_iceland_ih.c:1.1 Mon Aug 27 14:10:14 2018
+++ src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_iceland_ih.c Fri Feb 14 14:34:58 2020
@@ -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"
Index: src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_iceland_smc.c
diff -u src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_iceland_smc.c:1.1 src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_iceland_smc.c:1.2
--- src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_iceland_smc.c:1.1 Mon Aug 27 14:10:14 2018
+++ src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_iceland_smc.c Fri Feb 14 14:34:58 2020
@@ -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"
Index: src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_tonga_dpm.c
diff -u src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_tonga_dpm.c:1.1 src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_tonga_dpm.c:1.2
--- src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_tonga_dpm.c:1.1 Mon Aug 27 14:10:14 2018
+++ src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_tonga_dpm.c Fri Feb 14 14:34:58 2020
@@ -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"
Index: src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_tonga_ih.c
diff -u src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_tonga_ih.c:1.1 src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_tonga_ih.c:1.2
--- src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_tonga_ih.c:1.1 Mon Aug 27 14:10:14 2018
+++ src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_tonga_ih.c Fri Feb 14 14:34:58 2020
@@ -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"
Index: src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_tonga_smc.c
diff -u src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_tonga_smc.c:1.1 src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_tonga_smc.c:1.2
--- src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_tonga_smc.c:1.1 Mon Aug 27 14:10:14 2018
+++ src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_tonga_smc.c Fri Feb 14 14:34:58 2020
@@ -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"
Index: src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_uvd_v5_0.c
diff -u src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_uvd_v5_0.c:1.1 src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_uvd_v5_0.c:1.2
--- src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_uvd_v5_0.c:1.1 Mon Aug 27 14:10:14 2018
+++ src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_uvd_v5_0.c Fri Feb 14 14:34:58 2020
@@ -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"
Index: src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_uvd_v6_0.c
diff -u src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_uvd_v6_0.c:1.1 src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_uvd_v6_0.c:1.2
--- src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_uvd_v6_0.c:1.1 Mon Aug 27 14:10:14 2018
+++ src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_uvd_v6_0.c Fri Feb 14 14:34:58 2020
@@ -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"
Index: src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_vce_v3_0.c
diff -u src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_vce_v3_0.c:1.1 src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_vce_v3_0.c:1.2
--- src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_vce_v3_0.c:1.1 Mon Aug 27 14:10:14 2018
+++ src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_vce_v3_0.c Fri Feb 14 14:34:58 2020
@@ -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"
Index: src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_fence.c
diff -u src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_fence.c:1.5 src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_fence.c:1.6
--- src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_fence.c:1.5 Fri Feb 14 04:35:19 2020
+++ src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_fence.c Fri Feb 14 14:34:58 2020
@@ -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>
Index: src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_ucode.c
diff -u src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_ucode.c:1.5 src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_ucode.c:1.6
--- src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_ucode.c:1.5 Fri Feb 14 04:35:19 2020
+++ src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_ucode.c Fri Feb 14 14:34:58 2020
@@ -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"
Index: src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_gfx_v8_0.c
diff -u src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_gfx_v8_0.c:1.3 src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_gfx_v8_0.c:1.4
--- src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_gfx_v8_0.c:1.3 Fri Feb 14 04:35:19 2020
+++ src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_gfx_v8_0.c Fri Feb 14 14:34:58 2020
@@ -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"
Index: src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_ih.c
diff -u src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_ih.c:1.3 src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_ih.c:1.4
--- src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_ih.c:1.3 Mon Aug 27 14:04:50 2018
+++ src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_ih.c Fri Feb 14 14:34:58 2020
@@ -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"
Index: src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_kv_dpm.c
diff -u src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_kv_dpm.c:1.3 src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_kv_dpm.c:1.4
--- src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_kv_dpm.c:1.3 Fri Feb 14 04:30:04 2020
+++ src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_kv_dpm.c Fri Feb 14 14:34:58 2020
@@ -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"
Index: src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_object.h
diff -u src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_object.h:1.3 src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_object.h:1.4
--- src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_object.h:1.3 Mon Aug 27 14:04:50 2018
+++ src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_object.h Fri Feb 14 14:34:58 2020
@@ -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"
Index: src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_ring.c
diff -u src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_ring.c:1.3 src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_ring.c:1.4
--- src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_ring.c:1.3 Mon Aug 27 14:04:50 2018
+++ src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_ring.c Fri Feb 14 14:34:58 2020
@@ -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>
Index: src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_uvd.c
diff -u src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_uvd.c:1.6 src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_uvd.c:1.7
--- src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_uvd.c:1.6 Fri Feb 14 04:35:19 2020
+++ src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_uvd.c Fri Feb 14 14:34:58 2020
@@ -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>
Index: src/sys/external/bsd/drm2/dist/drm/i915/i915_cmd_parser.c
diff -u src/sys/external/bsd/drm2/dist/drm/i915/i915_cmd_parser.c:1.21 src/sys/external/bsd/drm2/dist/drm/i915/i915_cmd_parser.c:1.22
--- src/sys/external/bsd/drm2/dist/drm/i915/i915_cmd_parser.c:1.21 Fri Feb 14 04:30:05 2020
+++ src/sys/external/bsd/drm2/dist/drm/i915/i915_cmd_parser.c Fri Feb 14 14:34:58 2020
@@ -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
Index: src/sys/external/bsd/drm2/dist/drm/i915/intel_dp.c
diff -u src/sys/external/bsd/drm2/dist/drm/i915/intel_dp.c:1.21 src/sys/external/bsd/drm2/dist/drm/i915/intel_dp.c:1.22
--- src/sys/external/bsd/drm2/dist/drm/i915/intel_dp.c:1.21 Fri Feb 14 04:36:11 2020
+++ src/sys/external/bsd/drm2/dist/drm/i915/intel_dp.c Fri Feb 14 14:34:58 2020
@@ -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>
Index: src/sys/external/bsd/drm2/dist/drm/i915/i915_drv.c
diff -u src/sys/external/bsd/drm2/dist/drm/i915/i915_drv.c:1.18 src/sys/external/bsd/drm2/dist/drm/i915/i915_drv.c:1.19
--- src/sys/external/bsd/drm2/dist/drm/i915/i915_drv.c:1.18 Fri Feb 14 04:37:09 2020
+++ src/sys/external/bsd/drm2/dist/drm/i915/i915_drv.c Fri Feb 14 14:34:58 2020
@@ -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"
Index: src/sys/external/bsd/drm2/dist/drm/i915/i915_irq.c
diff -u src/sys/external/bsd/drm2/dist/drm/i915/i915_irq.c:1.18 src/sys/external/bsd/drm2/dist/drm/i915/i915_irq.c:1.19
--- src/sys/external/bsd/drm2/dist/drm/i915/i915_irq.c:1.18 Fri Feb 14 04:36:11 2020
+++ src/sys/external/bsd/drm2/dist/drm/i915/i915_irq.c Fri Feb 14 14:34:58 2020
@@ -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
Index: src/sys/external/bsd/drm2/dist/drm/i915/intel_i2c.c
diff -u src/sys/external/bsd/drm2/dist/drm/i915/intel_i2c.c:1.18 src/sys/external/bsd/drm2/dist/drm/i915/intel_i2c.c:1.19
--- src/sys/external/bsd/drm2/dist/drm/i915/intel_i2c.c:1.18 Fri Feb 14 04:35:19 2020
+++ src/sys/external/bsd/drm2/dist/drm/i915/intel_i2c.c Fri Feb 14 14:34:58 2020
@@ -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 <airl...@linux.ie>
@@ -29,12 +29,11 @@
* Chris Wilson <ch...@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>
Index: src/sys/external/bsd/drm2/dist/drm/i915/i915_gem.c
diff -u src/sys/external/bsd/drm2/dist/drm/i915/i915_gem.c:1.58 src/sys/external/bsd/drm2/dist/drm/i915/i915_gem.c:1.59
--- src/sys/external/bsd/drm2/dist/drm/i915/i915_gem.c:1.58 Fri Feb 14 04:35:19 2020
+++ src/sys/external/bsd/drm2/dist/drm/i915/i915_gem.c Fri Feb 14 14:34:58 2020
@@ -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
#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>
Index: src/sys/external/bsd/drm2/dist/drm/i915/i915_gem_context.c
diff -u src/sys/external/bsd/drm2/dist/drm/i915/i915_gem_context.c:1.11 src/sys/external/bsd/drm2/dist/drm/i915/i915_gem_context.c:1.12
--- src/sys/external/bsd/drm2/dist/drm/i915/i915_gem_context.c:1.11 Fri Feb 14 04:36:56 2020
+++ src/sys/external/bsd/drm2/dist/drm/i915/i915_gem_context.c Fri Feb 14 14:34:58 2020
@@ -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"
Index: src/sys/external/bsd/drm2/dist/drm/i915/intel_ringbuffer.c
diff -u src/sys/external/bsd/drm2/dist/drm/i915/intel_ringbuffer.c:1.11 src/sys/external/bsd/drm2/dist/drm/i915/intel_ringbuffer.c:1.12
--- src/sys/external/bsd/drm2/dist/drm/i915/intel_ringbuffer.c:1.11 Thu Dec 5 20:03:09 2019
+++ src/sys/external/bsd/drm2/dist/drm/i915/intel_ringbuffer.c Fri Feb 14 14:34:58 2020
@@ -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>
Index: src/sys/external/bsd/drm2/dist/drm/i915/i915_gem_execbuffer.c
diff -u src/sys/external/bsd/drm2/dist/drm/i915/i915_gem_execbuffer.c:1.10 src/sys/external/bsd/drm2/dist/drm/i915/i915_gem_execbuffer.c:1.11
--- src/sys/external/bsd/drm2/dist/drm/i915/i915_gem_execbuffer.c:1.10 Fri Feb 14 04:36:56 2020
+++ src/sys/external/bsd/drm2/dist/drm/i915/i915_gem_execbuffer.c Fri Feb 14 14:34:58 2020
@@ -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_exe
#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)
Index: src/sys/external/bsd/drm2/dist/drm/i915/i915_gpu_error.c
diff -u src/sys/external/bsd/drm2/dist/drm/i915/i915_gpu_error.c:1.10 src/sys/external/bsd/drm2/dist/drm/i915/i915_gpu_error.c:1.11
--- src/sys/external/bsd/drm2/dist/drm/i915/i915_gpu_error.c:1.10 Mon Aug 27 16:14:55 2018
+++ src/sys/external/bsd/drm2/dist/drm/i915/i915_gpu_error.c Fri Feb 14 14:34:58 2020
@@ -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)
Index: src/sys/external/bsd/drm2/dist/drm/i915/i915_gem_gtt.c
diff -u src/sys/external/bsd/drm2/dist/drm/i915/i915_gem_gtt.c:1.16 src/sys/external/bsd/drm2/dist/drm/i915/i915_gem_gtt.c:1.17
--- src/sys/external/bsd/drm2/dist/drm/i915/i915_gem_gtt.c:1.16 Thu Dec 5 20:03:09 2019
+++ src/sys/external/bsd/drm2/dist/drm/i915/i915_gem_gtt.c Fri Feb 14 14:34:58 2020
@@ -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>
Index: src/sys/external/bsd/drm2/dist/drm/i915/intel_opregion.c
diff -u src/sys/external/bsd/drm2/dist/drm/i915/intel_opregion.c:1.16 src/sys/external/bsd/drm2/dist/drm/i915/intel_opregion.c:1.17
--- src/sys/external/bsd/drm2/dist/drm/i915/intel_opregion.c:1.16 Fri Feb 14 04:30:05 2020
+++ src/sys/external/bsd/drm2/dist/drm/i915/intel_opregion.c Fri Feb 14 14:34:58 2020
@@ -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....@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>
Index: src/sys/external/bsd/drm2/dist/drm/i915/i915_gem_stolen.c
diff -u src/sys/external/bsd/drm2/dist/drm/i915/i915_gem_stolen.c:1.13 src/sys/external/bsd/drm2/dist/drm/i915/i915_gem_stolen.c:1.14
--- src/sys/external/bsd/drm2/dist/drm/i915/i915_gem_stolen.c:1.13 Fri Feb 14 04:35:19 2020
+++ src/sys/external/bsd/drm2/dist/drm/i915/i915_gem_stolen.c Fri Feb 14 14:34:58 2020
@@ -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"
Index: src/sys/external/bsd/drm2/dist/drm/i915/intel_guc_loader.c
diff -u src/sys/external/bsd/drm2/dist/drm/i915/intel_guc_loader.c:1.13 src/sys/external/bsd/drm2/dist/drm/i915/intel_guc_loader.c:1.14
--- src/sys/external/bsd/drm2/dist/drm/i915/intel_guc_loader.c:1.13 Thu Sep 13 08:25:55 2018
+++ src/sys/external/bsd/drm2/dist/drm/i915/intel_guc_loader.c Fri Feb 14 14:34:58 2020
@@ -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....@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"
Index: src/sys/external/bsd/drm2/dist/drm/i915/intel_panel.c
diff -u src/sys/external/bsd/drm2/dist/drm/i915/intel_panel.c:1.13 src/sys/external/bsd/drm2/dist/drm/i915/intel_panel.c:1.14
--- src/sys/external/bsd/drm2/dist/drm/i915/intel_panel.c:1.13 Fri Feb 14 04:36:12 2020
+++ src/sys/external/bsd/drm2/dist/drm/i915/intel_panel.c Fri Feb 14 14:34:58 2020
@@ -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"
Index: src/sys/external/bsd/drm2/dist/drm/i915/i915_params.c
diff -u src/sys/external/bsd/drm2/dist/drm/i915/i915_params.c:1.3 src/sys/external/bsd/drm2/dist/drm/i915/i915_params.c:1.4
--- src/sys/external/bsd/drm2/dist/drm/i915/i915_params.c:1.3 Mon Aug 27 04:58:23 2018
+++ src/sys/external/bsd/drm2/dist/drm/i915/i915_params.c Fri Feb 14 14:34:58 2020
@@ -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 = {
Index: src/sys/external/bsd/drm2/dist/drm/i915/intel_csr.c
diff -u src/sys/external/bsd/drm2/dist/drm/i915/intel_csr.c:1.5 src/sys/external/bsd/drm2/dist/drm/i915/intel_csr.c:1.6
--- src/sys/external/bsd/drm2/dist/drm/i915/intel_csr.c:1.5 Thu Sep 13 08:25:55 2018
+++ src/sys/external/bsd/drm2/dist/drm/i915/intel_csr.c Fri Feb 14 14:34:58 2020
@@ -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"
Index: src/sys/external/bsd/drm2/dist/drm/i915/intel_display.c
diff -u src/sys/external/bsd/drm2/dist/drm/i915/intel_display.c:1.31 src/sys/external/bsd/drm2/dist/drm/i915/intel_display.c:1.32
--- src/sys/external/bsd/drm2/dist/drm/i915/intel_display.c:1.31 Fri Feb 14 09:39:37 2020
+++ src/sys/external/bsd/drm2/dist/drm/i915/intel_display.c Fri Feb 14 14:34:58 2020
@@ -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_displa
#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_displa
#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>
Index: src/sys/external/bsd/drm2/dist/drm/i915/intel_drv.h
diff -u src/sys/external/bsd/drm2/dist/drm/i915/intel_drv.h:1.12 src/sys/external/bsd/drm2/dist/drm/i915/intel_drv.h:1.13
--- src/sys/external/bsd/drm2/dist/drm/i915/intel_drv.h:1.12 Fri Feb 14 04:36:11 2020
+++ src/sys/external/bsd/drm2/dist/drm/i915/intel_drv.h Fri Feb 14 14:34:58 2020
@@ -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 <airl...@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>
Index: src/sys/external/bsd/drm2/dist/drm/i915/intel_fbdev.c
diff -u src/sys/external/bsd/drm2/dist/drm/i915/intel_fbdev.c:1.12 src/sys/external/bsd/drm2/dist/drm/i915/intel_fbdev.c:1.13
--- src/sys/external/bsd/drm2/dist/drm/i915/intel_fbdev.c:1.12 Fri Feb 14 09:39:57 2020
+++ src/sys/external/bsd/drm2/dist/drm/i915/intel_fbdev.c Fri Feb 14 14:34:58 2020
@@ -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.
#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>
Index: src/sys/external/bsd/drm2/dist/drm/i915/intel_uncore.c
diff -u src/sys/external/bsd/drm2/dist/drm/i915/intel_uncore.c:1.12 src/sys/external/bsd/drm2/dist/drm/i915/intel_uncore.c:1.13
--- src/sys/external/bsd/drm2/dist/drm/i915/intel_uncore.c:1.12 Fri Feb 14 04:36:56 2020
+++ src/sys/external/bsd/drm2/dist/drm/i915/intel_uncore.c Fri Feb 14 14:34:58 2020
@@ -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
Index: src/sys/external/bsd/drm2/dist/drm/i915/intel_hdmi.c
diff -u src/sys/external/bsd/drm2/dist/drm/i915/intel_hdmi.c:1.8 src/sys/external/bsd/drm2/dist/drm/i915/intel_hdmi.c:1.9
--- src/sys/external/bsd/drm2/dist/drm/i915/intel_hdmi.c:1.8 Fri Feb 14 04:36:11 2020
+++ src/sys/external/bsd/drm2/dist/drm/i915/intel_hdmi.c Fri Feb 14 14:34:58 2020
@@ -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 <airl...@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>
Index: src/sys/external/bsd/drm2/dist/drm/i915/intel_lvds.c
diff -u src/sys/external/bsd/drm2/dist/drm/i915/intel_lvds.c:1.9 src/sys/external/bsd/drm2/dist/drm/i915/intel_lvds.c:1.10
--- src/sys/external/bsd/drm2/dist/drm/i915/intel_lvds.c:1.9 Fri Feb 14 09:39:37 2020
+++ src/sys/external/bsd/drm2/dist/drm/i915/intel_lvds.c Fri Feb 14 14:34:58 2020
@@ -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
#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 {
Index: src/sys/external/bsd/drm2/dist/drm/i915/intel_overlay.c
diff -u src/sys/external/bsd/drm2/dist/drm/i915/intel_overlay.c:1.9 src/sys/external/bsd/drm2/dist/drm/i915/intel_overlay.c:1.10
--- src/sys/external/bsd/drm2/dist/drm/i915/intel_overlay.c:1.9 Fri Feb 14 04:36:12 2020
+++ src/sys/external/bsd/drm2/dist/drm/i915/intel_overlay.c Fri Feb 14 14:34:58 2020
@@ -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"
Index: src/sys/external/bsd/drm2/dist/drm/i915/intel_pm.c
diff -u src/sys/external/bsd/drm2/dist/drm/i915/intel_pm.c:1.23 src/sys/external/bsd/drm2/dist/drm/i915/intel_pm.c:1.24
--- src/sys/external/bsd/drm2/dist/drm/i915/intel_pm.c:1.23 Fri Feb 14 09:39:37 2020
+++ src/sys/external/bsd/drm2/dist/drm/i915/intel_pm.c Fri Feb 14 14:34:58 2020
@@ -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
#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>
Index: src/sys/external/bsd/drm2/dist/drm/i915/intel_ringbuffer.h
diff -u src/sys/external/bsd/drm2/dist/drm/i915/intel_ringbuffer.h:1.7 src/sys/external/bsd/drm2/dist/drm/i915/intel_ringbuffer.h:1.8
--- src/sys/external/bsd/drm2/dist/drm/i915/intel_ringbuffer.h:1.7 Thu Dec 5 20:03:09 2019
+++ src/sys/external/bsd/drm2/dist/drm/i915/intel_ringbuffer.h Fri Feb 14 14:34:58 2020
@@ -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"
Index: src/sys/external/bsd/drm2/dist/drm/i915/intel_sdvo.c
diff -u src/sys/external/bsd/drm2/dist/drm/i915/intel_sdvo.c:1.14 src/sys/external/bsd/drm2/dist/drm/i915/intel_sdvo.c:1.15
--- src/sys/external/bsd/drm2/dist/drm/i915/intel_sdvo.c:1.14 Fri Feb 14 09:39:38 2020
+++ src/sys/external/bsd/drm2/dist/drm/i915/intel_sdvo.c Fri Feb 14 14:34:58 2020
@@ -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 <airl...@linux.ie>
@@ -28,15 +28,12 @@
* Eric Anholt <e...@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>
Index: src/sys/external/bsd/drm2/dist/drm/nouveau/nouveau_bios.h
diff -u src/sys/external/bsd/drm2/dist/drm/nouveau/nouveau_bios.h:1.3 src/sys/external/bsd/drm2/dist/drm/nouveau/nouveau_bios.h:1.4
--- src/sys/external/bsd/drm2/dist/drm/nouveau/nouveau_bios.h:1.3 Mon Aug 27 04:58:24 2018
+++ src/sys/external/bsd/drm2/dist/drm/nouveau/nouveau_bios.h Fri Feb 14 14:34:58 2020
@@ -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
Index: src/sys/external/bsd/drm2/dist/drm/nouveau/nouveau_display.c
diff -u src/sys/external/bsd/drm2/dist/drm/nouveau/nouveau_display.c:1.3 src/sys/external/bsd/drm2/dist/drm/nouveau/nouveau_display.c:1.4
--- src/sys/external/bsd/drm2/dist/drm/nouveau/nouveau_display.c:1.3 Mon Aug 27 04:58:24 2018
+++ src/sys/external/bsd/drm2/dist/drm/nouveau/nouveau_display.c Fri Feb 14 14:34:58 2020
@@ -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>
Index: src/sys/external/bsd/drm2/dist/drm/nouveau/nouveau_connector.c
diff -u src/sys/external/bsd/drm2/dist/drm/nouveau/nouveau_connector.c:1.4 src/sys/external/bsd/drm2/dist/drm/nouveau/nouveau_connector.c:1.5
--- src/sys/external/bsd/drm2/dist/drm/nouveau/nouveau_connector.c:1.4 Mon Aug 27 04:58:24 2018
+++ src/sys/external/bsd/drm2/dist/drm/nouveau/nouveau_connector.c Fri Feb 14 14:34:58 2020
@@ -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>
Index: src/sys/external/bsd/drm2/dist/drm/nouveau/nouveau_fence.c
diff -u src/sys/external/bsd/drm2/dist/drm/nouveau/nouveau_fence.c:1.14 src/sys/external/bsd/drm2/dist/drm/nouveau/nouveau_fence.c:1.15
--- src/sys/external/bsd/drm2/dist/drm/nouveau/nouveau_fence.c:1.14 Tue Apr 16 10:00:04 2019
+++ src/sys/external/bsd/drm2/dist/drm/nouveau/nouveau_fence.c Fri Feb 14 14:34:58 2020
@@ -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>
Index: src/sys/external/bsd/drm2/dist/drm/nouveau/nouveau_gem.c
diff -u src/sys/external/bsd/drm2/dist/drm/nouveau/nouveau_gem.c:1.10 src/sys/external/bsd/drm2/dist/drm/nouveau/nouveau_gem.c:1.11
--- src/sys/external/bsd/drm2/dist/drm/nouveau/nouveau_gem.c:1.10 Fri Feb 14 04:38:48 2020
+++ src/sys/external/bsd/drm2/dist/drm/nouveau/nouveau_gem.c Fri Feb 14 14:34:58 2020
@@ -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"
Index: src/sys/external/bsd/drm2/dist/drm/nouveau/nouveau_nv50_display.c
diff -u src/sys/external/bsd/drm2/dist/drm/nouveau/nouveau_nv50_display.c:1.10 src/sys/external/bsd/drm2/dist/drm/nouveau/nouveau_nv50_display.c:1.11
--- src/sys/external/bsd/drm2/dist/drm/nouveau/nouveau_nv50_display.c:1.10 Mon Aug 27 14:48:21 2018
+++ src/sys/external/bsd/drm2/dist/drm/nouveau/nouveau_nv50_display.c Fri Feb 14 14:34:58 2020
@@ -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>
Index: src/sys/external/bsd/drm2/dist/drm/nouveau/dispnv04/nouveau_dispnv04_disp.c
diff -u src/sys/external/bsd/drm2/dist/drm/nouveau/dispnv04/nouveau_dispnv04_disp.c:1.4 src/sys/external/bsd/drm2/dist/drm/nouveau/dispnv04/nouveau_dispnv04_disp.c:1.5
--- src/sys/external/bsd/drm2/dist/drm/nouveau/dispnv04/nouveau_dispnv04_disp.c:1.4 Mon Aug 27 14:48:21 2018
+++ src/sys/external/bsd/drm2/dist/drm/nouveau/dispnv04/nouveau_dispnv04_disp.c Fri Feb 14 14:34:58 2020
@@ -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>
Index: src/sys/external/bsd/drm2/dist/drm/nouveau/dispnv04/nouveau_dispnv04_tvmodesnv17.c
diff -u src/sys/external/bsd/drm2/dist/drm/nouveau/dispnv04/nouveau_dispnv04_tvmodesnv17.c:1.4 src/sys/external/bsd/drm2/dist/drm/nouveau/dispnv04/nouveau_dispnv04_tvmodesnv17.c:1.5
--- src/sys/external/bsd/drm2/dist/drm/nouveau/dispnv04/nouveau_dispnv04_tvmodesnv17.c:1.4 Mon Aug 27 04:58:29 2018
+++ src/sys/external/bsd/drm2/dist/drm/nouveau/dispnv04/nouveau_dispnv04_tvmodesnv17.c Fri Feb 14 14:34:58 2020
@@ -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"
Index: src/sys/external/bsd/drm2/dist/drm/nouveau/dispnv04/nouveau_dispnv04_tvnv04.c
diff -u src/sys/external/bsd/drm2/dist/drm/nouveau/dispnv04/nouveau_dispnv04_tvnv04.c:1.4 src/sys/external/bsd/drm2/dist/drm/nouveau/dispnv04/nouveau_dispnv04_tvnv04.c:1.5
--- src/sys/external/bsd/drm2/dist/drm/nouveau/dispnv04/nouveau_dispnv04_tvnv04.c:1.4 Mon Aug 27 07:35:03 2018
+++ src/sys/external/bsd/drm2/dist/drm/nouveau/dispnv04/nouveau_dispnv04_tvnv04.c Fri Feb 14 14:34:58 2020
@@ -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"
Index: src/sys/external/bsd/drm2/dist/drm/nouveau/include/nvkm/core/device.h
diff -u src/sys/external/bsd/drm2/dist/drm/nouveau/include/nvkm/core/device.h:1.7 src/sys/external/bsd/drm2/dist/drm/nouveau/include/nvkm/core/device.h:1.8
--- src/sys/external/bsd/drm2/dist/drm/nouveau/include/nvkm/core/device.h:1.7 Wed Aug 29 19:31:35 2018
+++ src/sys/external/bsd/drm2/dist/drm/nouveau/include/nvkm/core/device.h Fri Feb 14 14:34:58 2020
@@ -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>
Index: src/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/engine/disp/nouveau_nvkm_engine_disp_gf119.c
diff -u src/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/engine/disp/nouveau_nvkm_engine_disp_gf119.c:1.2 src/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/engine/disp/nouveau_nvkm_engine_disp_gf119.c:1.3
--- src/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/engine/disp/nouveau_nvkm_engine_disp_gf119.c:1.2 Mon Aug 27 04:58:31 2018
+++ src/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/engine/disp/nouveau_nvkm_engine_disp_gf119.c Fri Feb 14 14:34:59 2020
@@ -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
#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)
{
Index: src/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/engine/disp/nouveau_nvkm_engine_disp_nv50.c
diff -u src/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/engine/disp/nouveau_nvkm_engine_disp_nv50.c:1.2 src/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/engine/disp/nouveau_nvkm_engine_disp_nv50.c:1.3
--- src/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/engine/disp/nouveau_nvkm_engine_disp_nv50.c:1.2 Mon Aug 27 04:58:31 2018
+++ src/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/engine/disp/nouveau_nvkm_engine_disp_nv50.c Fri Feb 14 14:34:59 2020
@@ -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
#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)
{
Index: src/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/engine/gr/nouveau_nvkm_engine_gr_gf100.c
diff -u src/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/engine/gr/nouveau_nvkm_engine_gr_gf100.c:1.3 src/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/engine/gr/nouveau_nvkm_engine_gr_gf100.c:1.4
--- src/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/engine/gr/nouveau_nvkm_engine_gr_gf100.c:1.3 Mon Aug 27 07:38:56 2018
+++ src/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/engine/gr/nouveau_nvkm_engine_gr_gf100.c Fri Feb 14 14:34:59 2020
@@ -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"
Index: src/sys/external/bsd/drm2/dist/drm/radeon/radeon.h
diff -u src/sys/external/bsd/drm2/dist/drm/radeon/radeon.h:1.8 src/sys/external/bsd/drm2/dist/drm/radeon/radeon.h:1.9
--- src/sys/external/bsd/drm2/dist/drm/radeon/radeon.h:1.8 Fri Feb 14 04:37:43 2020
+++ src/sys/external/bsd/drm2/dist/drm/radeon/radeon.h Fri Feb 14 14:34:59 2020
@@ -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>
Index: src/sys/external/bsd/drm2/dist/drm/radeon/radeon_bios.c
diff -u src/sys/external/bsd/drm2/dist/drm/radeon/radeon_bios.c:1.6 src/sys/external/bsd/drm2/dist/drm/radeon/radeon_bios.c:1.7
--- src/sys/external/bsd/drm2/dist/drm/radeon/radeon_bios.c:1.6 Mon Aug 27 13:55:59 2018
+++ src/sys/external/bsd/drm2/dist/drm/radeon/radeon_bios.c Fri Feb 14 14:34:59 2020
@@ -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.
#include <linux/slab.h>
#include <linux/acpi.h>
-#include <linux/string.h>
/*
* BIOS.
*/
Index: src/sys/external/bsd/drm2/dist/drm/radeon/radeon_i2c.c
diff -u src/sys/external/bsd/drm2/dist/drm/radeon/radeon_i2c.c:1.6 src/sys/external/bsd/drm2/dist/drm/radeon/radeon_i2c.c:1.7
--- src/sys/external/bsd/drm2/dist/drm/radeon/radeon_i2c.c:1.6 Fri Feb 14 04:35:20 2020
+++ src/sys/external/bsd/drm2/dist/drm/radeon/radeon_i2c.c Fri Feb 14 14:34:59 2020
@@ -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>
Index: src/sys/external/bsd/drm2/dist/drm/radeon/radeon_cik_sdma.c
diff -u src/sys/external/bsd/drm2/dist/drm/radeon/radeon_cik_sdma.c:1.1 src/sys/external/bsd/drm2/dist/drm/radeon/radeon_cik_sdma.c:1.2
--- src/sys/external/bsd/drm2/dist/drm/radeon/radeon_cik_sdma.c:1.1 Mon Aug 27 14:38:20 2018
+++ src/sys/external/bsd/drm2/dist/drm/radeon/radeon_cik_sdma.c Fri Feb 14 14:34:59 2020
@@ -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"
Index: src/sys/external/bsd/drm2/dist/drm/radeon/radeon_device.c
diff -u src/sys/external/bsd/drm2/dist/drm/radeon/radeon_device.c:1.9 src/sys/external/bsd/drm2/dist/drm/radeon/radeon_device.c:1.10
--- src/sys/external/bsd/drm2/dist/drm/radeon/radeon_device.c:1.9 Fri Feb 14 04:37:09 2020
+++ src/sys/external/bsd/drm2/dist/drm/radeon/radeon_device.c Fri Feb 14 14:34:59 2020
@@ -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_devic
#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"
Index: src/sys/external/bsd/drm2/dist/drm/radeon/radeon_drv.c
diff -u src/sys/external/bsd/drm2/dist/drm/radeon/radeon_drv.c:1.9 src/sys/external/bsd/drm2/dist/drm/radeon/radeon_drv.c:1.10
--- src/sys/external/bsd/drm2/dist/drm/radeon/radeon_drv.c:1.9 Tue Aug 28 03:41:39 2018
+++ src/sys/external/bsd/drm2/dist/drm/radeon/radeon_drv.c Fri Feb 14 14:34:59 2020
@@ -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
#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>
Index: src/sys/external/bsd/drm2/dist/drm/radeon/radeon_display.c
diff -u src/sys/external/bsd/drm2/dist/drm/radeon/radeon_display.c:1.10 src/sys/external/bsd/drm2/dist/drm/radeon/radeon_display.c:1.11
--- src/sys/external/bsd/drm2/dist/drm/radeon/radeon_display.c:1.10 Wed Jan 30 01:11:08 2019
+++ src/sys/external/bsd/drm2/dist/drm/radeon/radeon_display.c Fri Feb 14 14:34:59 2020
@@ -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_displ
#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>
Index: src/sys/external/bsd/drm2/dist/drm/radeon/radeon_evergreen.c
diff -u src/sys/external/bsd/drm2/dist/drm/radeon/radeon_evergreen.c:1.3 src/sys/external/bsd/drm2/dist/drm/radeon/radeon_evergreen.c:1.4
--- src/sys/external/bsd/drm2/dist/drm/radeon/radeon_evergreen.c:1.3 Fri Oct 4 12:29:05 2019
+++ src/sys/external/bsd/drm2/dist/drm/radeon/radeon_evergreen.c Fri Feb 14 14:34:59 2020
@@ -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>
Index: src/sys/external/bsd/drm2/dist/drm/radeon/radeon_ring.c
diff -u src/sys/external/bsd/drm2/dist/drm/radeon/radeon_ring.c:1.3 src/sys/external/bsd/drm2/dist/drm/radeon/radeon_ring.c:1.4
--- src/sys/external/bsd/drm2/dist/drm/radeon/radeon_ring.c:1.3 Mon Aug 27 04:58:36 2018
+++ src/sys/external/bsd/drm2/dist/drm/radeon/radeon_ring.c Fri Feb 14 14:34:59 2020
@@ -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"
Index: src/sys/external/bsd/drm2/dist/drm/radeon/radeon_si_dpm.c
diff -u src/sys/external/bsd/drm2/dist/drm/radeon/radeon_si_dpm.c:1.3 src/sys/external/bsd/drm2/dist/drm/radeon/radeon_si_dpm.c:1.4
--- src/sys/external/bsd/drm2/dist/drm/radeon/radeon_si_dpm.c:1.3 Fri Feb 14 04:29:42 2020
+++ src/sys/external/bsd/drm2/dist/drm/radeon/radeon_si_dpm.c Fri Feb 14 14:34:59 2020
@@ -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_dp
#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
Index: src/sys/external/bsd/drm2/dist/drm/radeon/radeon_r600.c
diff -u src/sys/external/bsd/drm2/dist/drm/radeon/radeon_r600.c:1.4 src/sys/external/bsd/drm2/dist/drm/radeon/radeon_r600.c:1.5
--- src/sys/external/bsd/drm2/dist/drm/radeon/radeon_r600.c:1.4 Fri Feb 14 04:35:20 2020
+++ src/sys/external/bsd/drm2/dist/drm/radeon/radeon_r600.c Fri Feb 14 14:34:59 2020
@@ -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>
Index: src/sys/external/bsd/drm2/dist/drm/ttm/ttm_bo.c
diff -u src/sys/external/bsd/drm2/dist/drm/ttm/ttm_bo.c:1.18 src/sys/external/bsd/drm2/dist/drm/ttm/ttm_bo.c:1.19
--- src/sys/external/bsd/drm2/dist/drm/ttm/ttm_bo.c:1.18 Fri Feb 14 04:37:28 2020
+++ src/sys/external/bsd/drm2/dist/drm/ttm/ttm_bo.c Fri Feb 14 14:34:59 2020
@@ -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
#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>
Index: src/sys/external/bsd/drm2/dist/drm/ttm/ttm_bo_util.c
diff -u src/sys/external/bsd/drm2/dist/drm/ttm/ttm_bo_util.c:1.18 src/sys/external/bsd/drm2/dist/drm/ttm/ttm_bo_util.c:1.19
--- src/sys/external/bsd/drm2/dist/drm/ttm/ttm_bo_util.c:1.18 Fri Feb 14 04:37:28 2020
+++ src/sys/external/bsd/drm2/dist/drm/ttm/ttm_bo_util.c Fri Feb 14 14:34:59 2020
@@ -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.
#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>
Index: src/sys/external/bsd/drm2/dist/drm/ttm/ttm_bo_manager.c
diff -u src/sys/external/bsd/drm2/dist/drm/ttm/ttm_bo_manager.c:1.3 src/sys/external/bsd/drm2/dist/drm/ttm/ttm_bo_manager.c:1.4
--- src/sys/external/bsd/drm2/dist/drm/ttm/ttm_bo_manager.c:1.3 Mon Aug 27 04:58:37 2018
+++ src/sys/external/bsd/drm2/dist/drm/ttm/ttm_bo_manager.c Fri Feb 14 14:34:59 2020
@@ -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_manag
#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
Index: src/sys/external/bsd/drm2/dist/drm/ttm/ttm_execbuf_util.c
diff -u src/sys/external/bsd/drm2/dist/drm/ttm/ttm_execbuf_util.c:1.4 src/sys/external/bsd/drm2/dist/drm/ttm/ttm_execbuf_util.c:1.5
--- src/sys/external/bsd/drm2/dist/drm/ttm/ttm_execbuf_util.c:1.4 Mon Aug 27 07:53:39 2018
+++ src/sys/external/bsd/drm2/dist/drm/ttm/ttm_execbuf_util.c Fri Feb 14 14:34:59 2020
@@ -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_
#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)
Index: src/sys/external/bsd/drm2/dist/drm/ttm/ttm_memory.c
diff -u src/sys/external/bsd/drm2/dist/drm/ttm/ttm_memory.c:1.5 src/sys/external/bsd/drm2/dist/drm/ttm/ttm_memory.c:1.6
--- src/sys/external/bsd/drm2/dist/drm/ttm/ttm_memory.c:1.5 Fri Feb 14 04:36:56 2020
+++ src/sys/external/bsd/drm2/dist/drm/ttm/ttm_memory.c Fri Feb 14 14:34:59 2020
@@ -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
#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
Index: src/sys/external/bsd/drm2/dist/drm/ttm/ttm_tt.c
diff -u src/sys/external/bsd/drm2/dist/drm/ttm/ttm_tt.c:1.11 src/sys/external/bsd/drm2/dist/drm/ttm/ttm_tt.c:1.12
--- src/sys/external/bsd/drm2/dist/drm/ttm/ttm_tt.c:1.11 Mon Aug 27 04:58:37 2018
+++ src/sys/external/bsd/drm2/dist/drm/ttm/ttm_tt.c Fri Feb 14 14:34:59 2020
@@ -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
#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>
Index: src/sys/external/bsd/drm2/dist/drm/via/via_dma.c
diff -u src/sys/external/bsd/drm2/dist/drm/via/via_dma.c:1.4 src/sys/external/bsd/drm2/dist/drm/via/via_dma.c:1.5
--- src/sys/external/bsd/drm2/dist/drm/via/via_dma.c:1.4 Fri Feb 14 04:36:56 2020
+++ src/sys/external/bsd/drm2/dist/drm/via/via_dma.c Fri Feb 14 14:34:59 2020
@@ -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)
Index: src/sys/external/bsd/drm2/dist/drm/via/via_dmablit.c
diff -u src/sys/external/bsd/drm2/dist/drm/via/via_dmablit.c:1.7 src/sys/external/bsd/drm2/dist/drm/via/via_dmablit.c:1.8
--- src/sys/external/bsd/drm2/dist/drm/via/via_dmablit.c:1.7 Fri Feb 14 04:37:43 2020
+++ src/sys/external/bsd/drm2/dist/drm/via/via_dmablit.c Fri Feb 14 14:34:59 2020
@@ -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.
#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)
Index: src/sys/external/bsd/drm2/dist/include/drm/drmP.h
diff -u src/sys/external/bsd/drm2/dist/include/drm/drmP.h:1.36 src/sys/external/bsd/drm2/dist/include/drm/drmP.h:1.37
--- src/sys/external/bsd/drm2/dist/include/drm/drmP.h:1.36 Tue Nov 5 23:29:28 2019
+++ src/sys/external/bsd/drm2/dist/include/drm/drmP.h Fri Feb 14 14:34:59 2020
@@ -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
Index: src/sys/external/bsd/drm2/include/linux/atomic.h
diff -u src/sys/external/bsd/drm2/include/linux/atomic.h:1.21 src/sys/external/bsd/drm2/include/linux/atomic.h:1.22
--- src/sys/external/bsd/drm2/include/linux/atomic.h:1.21 Sat Sep 28 12:34:56 2019
+++ src/sys/external/bsd/drm2/include/linux/atomic.h Fri Feb 14 14:34:59 2020
@@ -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()
Index: src/sys/external/bsd/drm2/include/linux/fs.h
diff -u src/sys/external/bsd/drm2/include/linux/fs.h:1.3 src/sys/external/bsd/drm2/include/linux/fs.h:1.4
--- src/sys/external/bsd/drm2/include/linux/fs.h:1.3 Fri Feb 14 04:36:56 2020
+++ src/sys/external/bsd/drm2/include/linux/fs.h Fri Feb 14 14:34:59 2020
@@ -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_ */
Index: src/sys/external/bsd/drm2/include/linux/interrupt.h
diff -u src/sys/external/bsd/drm2/include/linux/interrupt.h:1.3 src/sys/external/bsd/drm2/include/linux/interrupt.h:1.4
--- src/sys/external/bsd/drm2/include/linux/interrupt.h:1.3 Mon Aug 27 07:20:16 2018
+++ src/sys/external/bsd/drm2/include/linux/interrupt.h Fri Feb 14 14:34:59 2020
@@ -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_ */
Index: src/sys/external/bsd/drm2/include/linux/jiffies.h
diff -u src/sys/external/bsd/drm2/include/linux/jiffies.h:1.12 src/sys/external/bsd/drm2/include/linux/jiffies.h:1.13
--- src/sys/external/bsd/drm2/include/linux/jiffies.h:1.12 Mon Aug 27 13:57:50 2018
+++ src/sys/external/bsd/drm2/include/linux/jiffies.h Fri Feb 14 14:34:59 2020
@@ -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 */
Index: src/sys/external/bsd/drm2/include/linux/ktime.h
diff -u src/sys/external/bsd/drm2/include/linux/ktime.h:1.8 src/sys/external/bsd/drm2/include/linux/ktime.h:1.9
--- src/sys/external/bsd/drm2/include/linux/ktime.h:1.8 Thu Jan 2 15:42:26 2020
+++ src/sys/external/bsd/drm2/include/linux/ktime.h Fri Feb 14 14:34:59 2020
@@ -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 {
Index: src/sys/external/bsd/drm2/include/linux/mm_types.h
diff -u src/sys/external/bsd/drm2/include/linux/mm_types.h:1.4 src/sys/external/bsd/drm2/include/linux/mm_types.h:1.5
--- src/sys/external/bsd/drm2/include/linux/mm_types.h:1.4 Wed Jul 16 20:59:58 2014
+++ src/sys/external/bsd/drm2/include/linux/mm_types.h Fri Feb 14 14:34:59 2020
@@ -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;
};
Index: src/sys/external/bsd/drm2/include/linux/pm_runtime.h
diff -u src/sys/external/bsd/drm2/include/linux/pm_runtime.h:1.4 src/sys/external/bsd/drm2/include/linux/pm_runtime.h:1.5
--- src/sys/external/bsd/drm2/include/linux/pm_runtime.h:1.4 Mon Aug 27 07:30:00 2018
+++ src/sys/external/bsd/drm2/include/linux/pm_runtime.h Fri Feb 14 14:34:59 2020
@@ -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
Index: src/sys/external/bsd/drm2/include/linux/mutex.h
diff -u src/sys/external/bsd/drm2/include/linux/mutex.h:1.11 src/sys/external/bsd/drm2/include/linux/mutex.h:1.12
--- src/sys/external/bsd/drm2/include/linux/mutex.h:1.11 Mon Aug 27 07:34:03 2018
+++ src/sys/external/bsd/drm2/include/linux/mutex.h Fri Feb 14 14:34:59 2020
@@ -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 */
Index: src/sys/external/bsd/drm2/include/linux/pci.h
diff -u src/sys/external/bsd/drm2/include/linux/pci.h:1.38 src/sys/external/bsd/drm2/include/linux/pci.h:1.39
--- src/sys/external/bsd/drm2/include/linux/pci.h:1.38 Sat Jan 18 03:00:04 2020
+++ src/sys/external/bsd/drm2/include/linux/pci.h Fri Feb 14 14:34:59 2020
@@ -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>
Index: src/sys/external/bsd/drm2/include/linux/pm_qos.h
diff -u src/sys/external/bsd/drm2/include/linux/pm_qos.h:1.1 src/sys/external/bsd/drm2/include/linux/pm_qos.h:1.2
--- src/sys/external/bsd/drm2/include/linux/pm_qos.h:1.1 Wed Jul 16 20:56:25 2014
+++ src/sys/external/bsd/drm2/include/linux/pm_qos.h Fri Feb 14 14:34:59 2020
@@ -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;
};
