Module Name: src
Committed By: riastradh
Date: Sun Dec 19 11:01:11 UTC 2021
Modified Files:
src/sys/arch/arm/rockchip: rk_drm.c rk_dwhdmi.c rk_fb.c rk_vop.c
src/sys/arch/arm/sunxi: sunxi_drm.c sunxi_dwhdmi.c sunxi_fb.c
sunxi_lcdc.c sunxi_mixer.c
src/sys/dev/fdt: fdt_panel.c hdmi_connector.c
src/sys/dev/i2c: anxedp.c
src/sys/dev/ic: anx_dp.c anx_dp.h dw_hdmi.c dw_hdmi.h
Log Message:
Sort includes.
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/arm/rockchip/rk_drm.c
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/arm/rockchip/rk_dwhdmi.c
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/arm/rockchip/rk_fb.c
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/arm/rockchip/rk_vop.c
cvs rdiff -u -r1.16 -r1.17 src/sys/arch/arm/sunxi/sunxi_drm.c
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/arm/sunxi/sunxi_dwhdmi.c
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/arm/sunxi/sunxi_fb.c
cvs rdiff -u -r1.13 -r1.14 src/sys/arch/arm/sunxi/sunxi_lcdc.c
cvs rdiff -u -r1.17 -r1.18 src/sys/arch/arm/sunxi/sunxi_mixer.c
cvs rdiff -u -r1.5 -r1.6 src/sys/dev/fdt/fdt_panel.c
cvs rdiff -u -r1.3 -r1.4 src/sys/dev/fdt/hdmi_connector.c
cvs rdiff -u -r1.7 -r1.8 src/sys/dev/i2c/anxedp.c
cvs rdiff -u -r1.3 -r1.4 src/sys/dev/ic/anx_dp.c src/sys/dev/ic/anx_dp.h
cvs rdiff -u -r1.8 -r1.9 src/sys/dev/ic/dw_hdmi.c
cvs rdiff -u -r1.7 -r1.8 src/sys/dev/ic/dw_hdmi.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/arch/arm/rockchip/rk_drm.c
diff -u src/sys/arch/arm/rockchip/rk_drm.c:1.8 src/sys/arch/arm/rockchip/rk_drm.c:1.9
--- src/sys/arch/arm/rockchip/rk_drm.c:1.8 Sun Dec 19 11:00:46 2021
+++ src/sys/arch/arm/rockchip/rk_drm.c Sun Dec 19 11:01:10 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: rk_drm.c,v 1.8 2021/12/19 11:00:46 riastradh Exp $ */
+/* $NetBSD: rk_drm.c,v 1.9 2021/12/19 11:01:10 riastradh Exp $ */
/*-
* Copyright (c) 2019 Jared D. McNeill <jmcne...@invisible.ca>
@@ -27,32 +27,32 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rk_drm.c,v 1.8 2021/12/19 11:00:46 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rk_drm.c,v 1.9 2021/12/19 11:01:10 riastradh Exp $");
#include <sys/param.h>
#include <sys/bus.h>
+#include <sys/conf.h>
#include <sys/device.h>
#include <sys/intr.h>
-#include <sys/systm.h>
#include <sys/kernel.h>
-#include <sys/conf.h>
+#include <sys/systm.h>
+#include <uvm/uvm_device.h>
#include <uvm/uvm_extern.h>
#include <uvm/uvm_object.h>
-#include <uvm/uvm_device.h>
+
+#include <dev/fdt/fdt_port.h>
+#include <dev/fdt/fdtvar.h>
+
+#include <arm/rockchip/rk_drm.h>
#include <drm/drm_auth.h>
-#include <drm/drm_drv.h>
#include <drm/drm_crtc_helper.h>
+#include <drm/drm_drv.h>
#include <drm/drm_fb_helper.h>
#include <drm/drm_fourcc.h>
#include <drm/drm_vblank.h>
-#include <dev/fdt/fdtvar.h>
-#include <dev/fdt/fdt_port.h>
-
-#include <arm/rockchip/rk_drm.h>
-
#define RK_DRM_MAX_WIDTH 3840
#define RK_DRM_MAX_HEIGHT 2160
Index: src/sys/arch/arm/rockchip/rk_dwhdmi.c
diff -u src/sys/arch/arm/rockchip/rk_dwhdmi.c:1.6 src/sys/arch/arm/rockchip/rk_dwhdmi.c:1.7
--- src/sys/arch/arm/rockchip/rk_dwhdmi.c:1.6 Sun Dec 19 11:00:46 2021
+++ src/sys/arch/arm/rockchip/rk_dwhdmi.c Sun Dec 19 11:01:10 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: rk_dwhdmi.c,v 1.6 2021/12/19 11:00:46 riastradh Exp $ */
+/* $NetBSD: rk_dwhdmi.c,v 1.7 2021/12/19 11:01:10 riastradh Exp $ */
/*-
* Copyright (c) 2019 Jared D. McNeill <jmcne...@invisible.ca>
@@ -27,25 +27,25 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rk_dwhdmi.c,v 1.6 2021/12/19 11:00:46 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rk_dwhdmi.c,v 1.7 2021/12/19 11:01:10 riastradh Exp $");
#include <sys/param.h>
#include <sys/bus.h>
+#include <sys/conf.h>
#include <sys/device.h>
#include <sys/intr.h>
-#include <sys/systm.h>
#include <sys/kernel.h>
-#include <sys/conf.h>
-
-#include <drm/drm_drv.h>
-#include <drm/drm_crtc_helper.h>
+#include <sys/systm.h>
-#include <dev/fdt/fdtvar.h>
#include <dev/fdt/fdt_port.h>
+#include <dev/fdt/fdtvar.h>
#include <dev/fdt/syscon.h>
#include <dev/ic/dw_hdmi.h>
+#include <drm/drm_drv.h>
+#include <drm/drm_crtc_helper.h>
+
#define RK3399_GRF_SOC_CON20 0x6250
#define HDMI_LCDC_SEL __BIT(6)
Index: src/sys/arch/arm/rockchip/rk_fb.c
diff -u src/sys/arch/arm/rockchip/rk_fb.c:1.3 src/sys/arch/arm/rockchip/rk_fb.c:1.4
--- src/sys/arch/arm/rockchip/rk_fb.c:1.3 Sun Dec 19 11:00:46 2021
+++ src/sys/arch/arm/rockchip/rk_fb.c Sun Dec 19 11:01:10 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: rk_fb.c,v 1.3 2021/12/19 11:00:46 riastradh Exp $ */
+/* $NetBSD: rk_fb.c,v 1.4 2021/12/19 11:01:10 riastradh Exp $ */
/*-
* Copyright (c) 2015-2019 Jared McNeill <jmcne...@invisible.ca>
@@ -29,7 +29,7 @@
#include "opt_wsdisplay_compat.h"
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rk_fb.c,v 1.3 2021/12/19 11:00:46 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rk_fb.c,v 1.4 2021/12/19 11:01:10 riastradh Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -37,11 +37,11 @@ __KERNEL_RCSID(0, "$NetBSD: rk_fb.c,v 1.
#include <dev/fdt/fdtvar.h>
+#include <arm/rockchip/rk_drm.h>
+
#include <drm/drm_drv.h>
#include <drm/drmfb.h>
-#include <arm/rockchip/rk_drm.h>
-
static int rk_fb_match(device_t, cfdata_t, void *);
static void rk_fb_attach(device_t, device_t, void *);
Index: src/sys/arch/arm/rockchip/rk_vop.c
diff -u src/sys/arch/arm/rockchip/rk_vop.c:1.11 src/sys/arch/arm/rockchip/rk_vop.c:1.12
--- src/sys/arch/arm/rockchip/rk_vop.c:1.11 Sun Dec 19 11:00:46 2021
+++ src/sys/arch/arm/rockchip/rk_vop.c Sun Dec 19 11:01:10 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: rk_vop.c,v 1.11 2021/12/19 11:00:46 riastradh Exp $ */
+/* $NetBSD: rk_vop.c,v 1.12 2021/12/19 11:01:10 riastradh Exp $ */
/*-
* Copyright (c) 2019 Jared D. McNeill <jmcne...@invisible.ca>
@@ -27,28 +27,28 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rk_vop.c,v 1.11 2021/12/19 11:00:46 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rk_vop.c,v 1.12 2021/12/19 11:01:10 riastradh Exp $");
#include <sys/param.h>
#include <sys/bus.h>
+#include <sys/conf.h>
#include <sys/device.h>
#include <sys/intr.h>
-#include <sys/systm.h>
#include <sys/kernel.h>
-#include <sys/conf.h>
#include <sys/sysctl.h>
+#include <sys/systm.h>
+
+#include <dev/fdt/fdt_port.h>
+#include <dev/fdt/fdtvar.h>
+
+#include <arm/rockchip/rk_drm.h>
-#include <drm/drm_drv.h>
#include <drm/drm_crtc.h>
#include <drm/drm_crtc_helper.h>
+#include <drm/drm_drv.h>
#include <drm/drm_fourcc.h>
#include <drm/drm_plane_helper.h>
-#include <dev/fdt/fdtvar.h>
-#include <dev/fdt/fdt_port.h>
-
-#include <arm/rockchip/rk_drm.h>
-
#define VOP_REG_CFG_DONE 0x0000
#define REG_LOAD_EN __BIT(0)
#define VOP_SYS_CTRL 0x0008
Index: src/sys/arch/arm/sunxi/sunxi_drm.c
diff -u src/sys/arch/arm/sunxi/sunxi_drm.c:1.16 src/sys/arch/arm/sunxi/sunxi_drm.c:1.17
--- src/sys/arch/arm/sunxi/sunxi_drm.c:1.16 Sun Dec 19 11:00:46 2021
+++ src/sys/arch/arm/sunxi/sunxi_drm.c Sun Dec 19 11:01:10 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: sunxi_drm.c,v 1.16 2021/12/19 11:00:46 riastradh Exp $ */
+/* $NetBSD: sunxi_drm.c,v 1.17 2021/12/19 11:01:10 riastradh Exp $ */
/*-
* Copyright (c) 2019 Jared D. McNeill <jmcne...@invisible.ca>
@@ -27,19 +27,24 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sunxi_drm.c,v 1.16 2021/12/19 11:00:46 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sunxi_drm.c,v 1.17 2021/12/19 11:01:10 riastradh Exp $");
#include <sys/param.h>
#include <sys/bus.h>
+#include <sys/conf.h>
#include <sys/device.h>
#include <sys/intr.h>
-#include <sys/systm.h>
#include <sys/kernel.h>
-#include <sys/conf.h>
+#include <sys/systm.h>
+#include <uvm/uvm_device.h>
#include <uvm/uvm_extern.h>
#include <uvm/uvm_object.h>
-#include <uvm/uvm_device.h>
+
+#include <dev/fdt/fdt_port.h>
+#include <dev/fdt/fdtvar.h>
+
+#include <arm/sunxi/sunxi_drm.h>
#include <drm/drm_auth.h>
#include <drm/drm_crtc_helper.h>
@@ -48,11 +53,6 @@ __KERNEL_RCSID(0, "$NetBSD: sunxi_drm.c,
#include <drm/drm_fourcc.h>
#include <drm/drm_vblank.h>
-#include <dev/fdt/fdtvar.h>
-#include <dev/fdt/fdt_port.h>
-
-#include <arm/sunxi/sunxi_drm.h>
-
#define SUNXI_DRM_MAX_WIDTH 3840
#define SUNXI_DRM_MAX_HEIGHT 2160
Index: src/sys/arch/arm/sunxi/sunxi_dwhdmi.c
diff -u src/sys/arch/arm/sunxi/sunxi_dwhdmi.c:1.10 src/sys/arch/arm/sunxi/sunxi_dwhdmi.c:1.11
--- src/sys/arch/arm/sunxi/sunxi_dwhdmi.c:1.10 Sun Dec 19 11:00:46 2021
+++ src/sys/arch/arm/sunxi/sunxi_dwhdmi.c Sun Dec 19 11:01:10 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: sunxi_dwhdmi.c,v 1.10 2021/12/19 11:00:46 riastradh Exp $ */
+/* $NetBSD: sunxi_dwhdmi.c,v 1.11 2021/12/19 11:01:10 riastradh Exp $ */
/*-
* Copyright (c) 2019 Jared D. McNeill <jmcne...@invisible.ca>
@@ -27,25 +27,25 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sunxi_dwhdmi.c,v 1.10 2021/12/19 11:00:46 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sunxi_dwhdmi.c,v 1.11 2021/12/19 11:01:10 riastradh Exp $");
#include <sys/param.h>
#include <sys/bus.h>
+#include <sys/conf.h>
#include <sys/device.h>
#include <sys/intr.h>
-#include <sys/systm.h>
#include <sys/kernel.h>
-#include <sys/conf.h>
-
-#include <drm/drm_drv.h>
+#include <sys/systm.h>
-#include <dev/fdt/fdtvar.h>
#include <dev/fdt/fdt_port.h>
+#include <dev/fdt/fdtvar.h>
#include <dev/ic/dw_hdmi.h>
#include <arm/sunxi/sunxi_hdmiphy.h>
+#include <drm/drm_drv.h>
+
enum {
DWHDMI_PORT_INPUT = 0,
DWHDMI_PORT_OUTPUT = 1,
Index: src/sys/arch/arm/sunxi/sunxi_fb.c
diff -u src/sys/arch/arm/sunxi/sunxi_fb.c:1.4 src/sys/arch/arm/sunxi/sunxi_fb.c:1.5
--- src/sys/arch/arm/sunxi/sunxi_fb.c:1.4 Sun Dec 19 11:00:46 2021
+++ src/sys/arch/arm/sunxi/sunxi_fb.c Sun Dec 19 11:01:10 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: sunxi_fb.c,v 1.4 2021/12/19 11:00:46 riastradh Exp $ */
+/* $NetBSD: sunxi_fb.c,v 1.5 2021/12/19 11:01:10 riastradh Exp $ */
/*-
* Copyright (c) 2015-2019 Jared McNeill <jmcne...@invisible.ca>
@@ -29,7 +29,7 @@
#include "opt_wsdisplay_compat.h"
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sunxi_fb.c,v 1.4 2021/12/19 11:00:46 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sunxi_fb.c,v 1.5 2021/12/19 11:01:10 riastradh Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -37,11 +37,11 @@ __KERNEL_RCSID(0, "$NetBSD: sunxi_fb.c,v
#include <dev/fdt/fdtvar.h>
+#include <arm/sunxi/sunxi_drm.h>
+
#include <drm/drm_drv.h>
#include <drm/drmfb.h>
-#include <arm/sunxi/sunxi_drm.h>
-
static int sunxi_fb_match(device_t, cfdata_t, void *);
static void sunxi_fb_attach(device_t, device_t, void *);
Index: src/sys/arch/arm/sunxi/sunxi_lcdc.c
diff -u src/sys/arch/arm/sunxi/sunxi_lcdc.c:1.13 src/sys/arch/arm/sunxi/sunxi_lcdc.c:1.14
--- src/sys/arch/arm/sunxi/sunxi_lcdc.c:1.13 Sun Dec 19 11:00:46 2021
+++ src/sys/arch/arm/sunxi/sunxi_lcdc.c Sun Dec 19 11:01:10 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: sunxi_lcdc.c,v 1.13 2021/12/19 11:00:46 riastradh Exp $ */
+/* $NetBSD: sunxi_lcdc.c,v 1.14 2021/12/19 11:01:10 riastradh Exp $ */
/*-
* Copyright (c) 2019 Jared D. McNeill <jmcne...@invisible.ca>
@@ -27,25 +27,25 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sunxi_lcdc.c,v 1.13 2021/12/19 11:00:46 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sunxi_lcdc.c,v 1.14 2021/12/19 11:01:10 riastradh Exp $");
#include <sys/param.h>
#include <sys/bus.h>
+#include <sys/conf.h>
#include <sys/device.h>
#include <sys/intr.h>
-#include <sys/systm.h>
#include <sys/kernel.h>
-#include <sys/conf.h>
-
-#include <drm/drm_drv.h>
-#include <drm/drm_crtc_helper.h>
-#include <drm/drm_vblank.h>
+#include <sys/systm.h>
-#include <dev/fdt/fdtvar.h>
#include <dev/fdt/fdt_port.h>
+#include <dev/fdt/fdtvar.h>
#include <arm/sunxi/sunxi_drm.h>
+#include <drm/drm_crtc_helper.h>
+#include <drm/drm_drv.h>
+#include <drm/drm_vblank.h>
+
#define TCON_GCTL_REG 0x000
#define TCON_GCTL_TCON_EN __BIT(31)
#define TCON_GCTL_GAMMA_EN __BIT(30)
Index: src/sys/arch/arm/sunxi/sunxi_mixer.c
diff -u src/sys/arch/arm/sunxi/sunxi_mixer.c:1.17 src/sys/arch/arm/sunxi/sunxi_mixer.c:1.18
--- src/sys/arch/arm/sunxi/sunxi_mixer.c:1.17 Sun Dec 19 11:00:46 2021
+++ src/sys/arch/arm/sunxi/sunxi_mixer.c Sun Dec 19 11:01:10 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: sunxi_mixer.c,v 1.17 2021/12/19 11:00:46 riastradh Exp $ */
+/* $NetBSD: sunxi_mixer.c,v 1.18 2021/12/19 11:01:10 riastradh Exp $ */
/*-
* Copyright (c) 2019 Jared D. McNeill <jmcne...@invisible.ca>
@@ -27,29 +27,29 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sunxi_mixer.c,v 1.17 2021/12/19 11:00:46 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sunxi_mixer.c,v 1.18 2021/12/19 11:01:10 riastradh Exp $");
#include <sys/param.h>
#include <sys/bus.h>
+#include <sys/conf.h>
#include <sys/device.h>
#include <sys/intr.h>
-#include <sys/systm.h>
#include <sys/kernel.h>
-#include <sys/conf.h>
#include <sys/sysctl.h>
+#include <sys/systm.h>
+
+#include <dev/fdt/fdt_port.h>
+#include <dev/fdt/fdtvar.h>
+
+#include <arm/sunxi/sunxi_drm.h>
-#include <drm/drm_drv.h>
#include <drm/drm_crtc.h>
#include <drm/drm_crtc_helper.h>
+#include <drm/drm_drv.h>
#include <drm/drm_fourcc.h>
#include <drm/drm_plane_helper.h>
#include <drm/drm_vblank.h>
-#include <dev/fdt/fdtvar.h>
-#include <dev/fdt/fdt_port.h>
-
-#include <arm/sunxi/sunxi_drm.h>
-
#define MIXER_CURSOR_MAXWIDTH 256
#define MIXER_CURSOR_MAXHEIGHT 256
Index: src/sys/dev/fdt/fdt_panel.c
diff -u src/sys/dev/fdt/fdt_panel.c:1.5 src/sys/dev/fdt/fdt_panel.c:1.6
--- src/sys/dev/fdt/fdt_panel.c:1.5 Sun Dec 19 11:00:46 2021
+++ src/sys/dev/fdt/fdt_panel.c Sun Dec 19 11:01:10 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: fdt_panel.c,v 1.5 2021/12/19 11:00:46 riastradh Exp $ */
+/* $NetBSD: fdt_panel.c,v 1.6 2021/12/19 11:01:10 riastradh Exp $ */
/*-
* Copyright (c) 2019 Jonathan A. Kollasch <jakll...@kollasch.net>
@@ -27,22 +27,22 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fdt_panel.c,v 1.5 2021/12/19 11:00:46 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fdt_panel.c,v 1.6 2021/12/19 11:01:10 riastradh Exp $");
#include <sys/param.h>
#include <sys/bus.h>
#include <sys/device.h>
-#include <sys/systm.h>
#include <sys/gpio.h>
+#include <sys/systm.h>
-#include <dev/fdt/fdtvar.h>
#include <dev/fdt/fdt_port.h>
+#include <dev/fdt/fdtvar.h>
#include <dev/i2c/ddcvar.h>
#include <drm/drm_drv.h>
-#include <drm/drm_panel.h>
#include <drm/drm_edid.h>
+#include <drm/drm_panel.h>
static const struct device_compatible_entry compat_data[] = {
{ .compat = "simple-panel" },
Index: src/sys/dev/fdt/hdmi_connector.c
diff -u src/sys/dev/fdt/hdmi_connector.c:1.3 src/sys/dev/fdt/hdmi_connector.c:1.4
--- src/sys/dev/fdt/hdmi_connector.c:1.3 Sun Dec 19 11:00:46 2021
+++ src/sys/dev/fdt/hdmi_connector.c Sun Dec 19 11:01:10 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: hdmi_connector.c,v 1.3 2021/12/19 11:00:46 riastradh Exp $ */
+/* $NetBSD: hdmi_connector.c,v 1.4 2021/12/19 11:01:10 riastradh Exp $ */
/*-
* Copyright (c) 2019 Jared McNeill <jmcne...@invisible.ca>
@@ -27,22 +27,22 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: hdmi_connector.c,v 1.3 2021/12/19 11:00:46 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hdmi_connector.c,v 1.4 2021/12/19 11:01:10 riastradh Exp $");
#include <sys/param.h>
#include <sys/bus.h>
#include <sys/device.h>
-#include <sys/systm.h>
#include <sys/gpio.h>
+#include <sys/systm.h>
-#include <dev/fdt/fdtvar.h>
#include <dev/fdt/fdt_port.h>
+#include <dev/fdt/fdtvar.h>
#include <dev/i2c/ddcvar.h>
-#include <drm/drm_drv.h>
#include <drm/drm_crtc.h>
#include <drm/drm_crtc_helper.h>
+#include <drm/drm_drv.h>
#include <drm/drm_edid.h>
#include <drm/drm_probe_helper.h>
Index: src/sys/dev/i2c/anxedp.c
diff -u src/sys/dev/i2c/anxedp.c:1.7 src/sys/dev/i2c/anxedp.c:1.8
--- src/sys/dev/i2c/anxedp.c:1.7 Sun Dec 19 11:00:47 2021
+++ src/sys/dev/i2c/anxedp.c Sun Dec 19 11:01:10 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: anxedp.c,v 1.7 2021/12/19 11:00:47 riastradh Exp $ */
+/* $NetBSD: anxedp.c,v 1.8 2021/12/19 11:01:10 riastradh Exp $ */
/*-
* Copyright (c) 2019 Jared D. McNeill <jmcne...@invisible.ca>
@@ -27,31 +27,30 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: anxedp.c,v 1.7 2021/12/19 11:00:47 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: anxedp.c,v 1.8 2021/12/19 11:01:10 riastradh Exp $");
#include <sys/param.h>
#include <sys/bus.h>
+#include <sys/conf.h>
#include <sys/device.h>
#include <sys/intr.h>
-#include <sys/systm.h>
#include <sys/kernel.h>
-#include <sys/conf.h>
+#include <sys/systm.h>
#include <dev/ic/dw_hdmi.h>
-#include <dev/i2c/i2cvar.h>
-#include <dev/i2c/ddcvar.h>
#include <dev/i2c/ddcreg.h>
-#include <dev/videomode/videomode.h>
+#include <dev/i2c/ddcvar.h>
+#include <dev/i2c/i2cvar.h>
#include <dev/videomode/edidvar.h>
-#include <dev/fdt/fdtvar.h>
#include <dev/fdt/fdt_port.h>
+#include <dev/fdt/fdtvar.h>
-#include <drm/drm_drv.h>
#include <drm/drm_connector.h>
#include <drm/drm_crtc.h>
#include <drm/drm_crtc_helper.h>
+#include <drm/drm_drv.h>
#include <drm/drm_edid.h>
#include <drm/drm_probe_helper.h>
Index: src/sys/dev/ic/anx_dp.c
diff -u src/sys/dev/ic/anx_dp.c:1.3 src/sys/dev/ic/anx_dp.c:1.4
--- src/sys/dev/ic/anx_dp.c:1.3 Sun Dec 19 11:00:47 2021
+++ src/sys/dev/ic/anx_dp.c Sun Dec 19 11:01:11 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: anx_dp.c,v 1.3 2021/12/19 11:00:47 riastradh Exp $ */
+/* $NetBSD: anx_dp.c,v 1.4 2021/12/19 11:01:11 riastradh Exp $ */
/*-
* Copyright (c) 2019 Jonathan A. Kollasch <jakll...@kollasch.net>
@@ -27,15 +27,15 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: anx_dp.c,v 1.3 2021/12/19 11:00:47 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: anx_dp.c,v 1.4 2021/12/19 11:01:11 riastradh Exp $");
#include <sys/param.h>
#include <sys/bus.h>
+#include <sys/conf.h>
#include <sys/device.h>
#include <sys/intr.h>
-#include <sys/systm.h>
#include <sys/kernel.h>
-#include <sys/conf.h>
+#include <sys/systm.h>
#include <dev/ic/anx_dp.h>
@@ -43,10 +43,10 @@ __KERNEL_RCSID(0, "$NetBSD: anx_dp.c,v 1
#include <dev/audio/audio_dai.h>
#endif
-#include <drm/drm_drv.h>
#include <drm/drm_crtc.h>
#include <drm/drm_crtc_helper.h>
#include <drm/drm_dp_helper.h>
+#include <drm/drm_drv.h>
#include <drm/drm_edid.h>
#define ANXDP_DP_TX_VERSION 0x010
Index: src/sys/dev/ic/anx_dp.h
diff -u src/sys/dev/ic/anx_dp.h:1.3 src/sys/dev/ic/anx_dp.h:1.4
--- src/sys/dev/ic/anx_dp.h:1.3 Sun Dec 19 11:00:47 2021
+++ src/sys/dev/ic/anx_dp.h Sun Dec 19 11:01:11 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: anx_dp.h,v 1.3 2021/12/19 11:00:47 riastradh Exp $ */
+/* $NetBSD: anx_dp.h,v 1.4 2021/12/19 11:01:11 riastradh Exp $ */
/*-
* Copyright (c) 2019 Jonathan A. Kollasch <jakll...@kollasch.net>
@@ -33,10 +33,10 @@
#include <dev/audio/audio_dai.h>
#endif
-#include <drm/drm_drv.h>
#include <drm/drm_bridge.h>
#include <drm/drm_connector.h>
#include <drm/drm_dp_helper.h>
+#include <drm/drm_drv.h>
#include <drm/drm_panel.h>
#include <drm/drm_probe_helper.h>
Index: src/sys/dev/ic/dw_hdmi.c
diff -u src/sys/dev/ic/dw_hdmi.c:1.8 src/sys/dev/ic/dw_hdmi.c:1.9
--- src/sys/dev/ic/dw_hdmi.c:1.8 Sun Dec 19 11:00:47 2021
+++ src/sys/dev/ic/dw_hdmi.c Sun Dec 19 11:01:11 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: dw_hdmi.c,v 1.8 2021/12/19 11:00:47 riastradh Exp $ */
+/* $NetBSD: dw_hdmi.c,v 1.9 2021/12/19 11:01:11 riastradh Exp $ */
/*-
* Copyright (c) 2019 Jared D. McNeill <jmcne...@invisible.ca>
@@ -27,29 +27,29 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dw_hdmi.c,v 1.8 2021/12/19 11:00:47 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dw_hdmi.c,v 1.9 2021/12/19 11:01:11 riastradh Exp $");
#include <sys/param.h>
#include <sys/bus.h>
+#include <sys/conf.h>
#include <sys/device.h>
#include <sys/intr.h>
-#include <sys/systm.h>
#include <sys/kernel.h>
-#include <sys/conf.h>
+#include <sys/systm.h>
#include <dev/ic/dw_hdmi.h>
-#include <dev/i2c/i2cvar.h>
-#include <dev/i2c/ddcvar.h>
#include <dev/i2c/ddcreg.h>
-#include <dev/videomode/videomode.h>
+#include <dev/i2c/ddcvar.h>
+#include <dev/i2c/i2cvar.h>
#include <dev/videomode/edidvar.h>
+#include <dev/videomode/videomode.h>
#include <dev/audio/audio_dai.h>
-#include <drm/drm_drv.h>
#include <drm/drm_crtc.h>
#include <drm/drm_crtc_helper.h>
+#include <drm/drm_drv.h>
#include <drm/drm_edid.h>
#include <drm/drm_probe_helper.h>
Index: src/sys/dev/ic/dw_hdmi.h
diff -u src/sys/dev/ic/dw_hdmi.h:1.7 src/sys/dev/ic/dw_hdmi.h:1.8
--- src/sys/dev/ic/dw_hdmi.h:1.7 Sun Dec 19 11:00:47 2021
+++ src/sys/dev/ic/dw_hdmi.h Sun Dec 19 11:01:11 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: dw_hdmi.h,v 1.7 2021/12/19 11:00:47 riastradh Exp $ */
+/* $NetBSD: dw_hdmi.h,v 1.8 2021/12/19 11:01:11 riastradh Exp $ */
/*-
* Copyright (c) 2019 Jared D. McNeill <jmcne...@invisible.ca>
@@ -34,9 +34,9 @@
#include <dev/audio/audio_dai.h>
-#include <drm/drm_drv.h>
#include <drm/drm_bridge.h>
#include <drm/drm_connector.h>
+#include <drm/drm_drv.h>
#include <drm/drm_modes.h>
struct dwhdmi_softc;
