 @@ -1,14 +1,14 @@
-/* $NetBSD: rk_dwhdmi.c,v 1.7 2021/12/19 11:01:10 riastradh Exp $ */
+/* $NetBSD: rk_dwhdmi.c,v 1.8 2023/04/11 08:40:19 riastradh Exp $ */
 /*-
  * Copyright (c) 2019 Jared D. McNeill <jmcneill@invisible.ca>
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -17,27 +17,27 @@
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
  * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
  * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
  * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
  * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
  * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
  * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
  * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rk_dwhdmi.c,v 1.7 2021/12/19 11:01:10 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rk_dwhdmi.c,v 1.8 2023/04/11 08:40:19 riastradh Exp $");
 #include <sys/param.h>
 #include <sys/bus.h>
 #include <sys/conf.h>
 #include <sys/device.h>
 #include <sys/intr.h>
 #include <sys/kernel.h>
 #include <sys/systm.h>
 #include <dev/fdt/fdt_port.h>
 #include <dev/fdt/fdtvar.h>
 #include <dev/fdt/syscon.h>
 @@ -96,74 +96,41 @@ struct rk_dwhdmi_softc {
 #define	to_rk_dwhdmi_encoder(x)	container_of(x, struct rk_dwhdmi_softc, sc_encoder)
 static void
 rk_dwhdmi_select_input(struct rk_dwhdmi_softc *sc, u_int crtc_index)
+{
 	const uint32_t write_mask = HDMI_LCDC_SEL << 16;
 	const uint32_t write_val = crtc_index == 0 ? HDMI_LCDC_SEL : 0;
 	syscon_lock(sc->sc_grf);
 	syscon_write_4(sc->sc_grf, RK3399_GRF_SOC_CON20, write_mask | write_val);
 	syscon_unlock(sc->sc_grf);
+}
 static bool
 rk_dwhdmi_encoder_mode_fixup(struct drm_encoder *encoder,
     const struct drm_display_mode *mode, struct drm_display_mode *adjusted_mode)
 	return true;
 static void
 rk_dwhdmi_encoder_mode_set(struct drm_encoder *encoder,
     struct drm_display_mode *mode, struct drm_display_mode *adjusted)
 static void
 rk_dwhdmi_encoder_enable(struct drm_encoder *encoder)
+{
 static void
 rk_dwhdmi_encoder_disable(struct drm_encoder *encoder)
 static void
 rk_dwhdmi_encoder_prepare(struct drm_encoder *encoder)
 	struct rk_dwhdmi_softc * const sc = to_rk_dwhdmi_encoder(encoder);
 	const u_int crtc_index = drm_crtc_index(encoder->crtc);
 	rk_dwhdmi_select_input(sc, crtc_index);
+}
 static void
 rk_dwhdmi_encoder_commit(struct drm_encoder *encoder)
 static const struct drm_encoder_funcs rk_dwhdmi_encoder_funcs = {
 	.destroy = drm_encoder_cleanup,
 };
 static const struct drm_encoder_helper_funcs rk_dwhdmi_encoder_helper_funcs = {
 	.prepare = rk_dwhdmi_encoder_prepare,
 	.mode_fixup = rk_dwhdmi_encoder_mode_fixup,
 	.mode_set = rk_dwhdmi_encoder_mode_set,
 	.enable = rk_dwhdmi_encoder_enable,
 	.disable = rk_dwhdmi_encoder_disable,
 	.commit = rk_dwhdmi_encoder_commit,
 };
 static int
 rk_dwhdmi_ep_activate(device_t dev, struct fdt_endpoint *ep, bool activate)
+{
 	struct rk_dwhdmi_softc * const sc = device_private(dev);
 	struct fdt_endpoint *in_ep = fdt_endpoint_remote(ep);
 	struct fdt_endpoint *out_ep, *out_rep;
 	struct drm_crtc *crtc;
 	int error;
 	if (sc->sc_activated != false) {
 		return 0;