 @@ -1,14 +1,14 @@
-/* $NetBSD: sunxi_mixer.c,v 1.4 2019/02/05 00:21:35 jmcneill Exp $ */
+/* $NetBSD: sunxi_mixer.c,v 1.5 2019/02/05 21:01:38 jmcneill 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: sunxi_mixer.c,v 1.4 2019/02/05 00:21:35 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sunxi_mixer.c,v 1.5 2019/02/05 21:01:38 jmcneill Exp $");
 #include <sys/param.h>
 #include <sys/bus.h>
 #include <sys/device.h>
 #include <sys/intr.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/conf.h>
 #include <drm/drmP.h>
 #include <drm/drm_crtc.h>
 #include <drm/drm_crtc_helper.h>
 #include <drm/drm_plane_helper.h>
 @@ -212,72 +212,97 @@ struct sunxi_mixer_softc {
 #define	VSU_READ(sc, reg)				\
 	bus_space_read_4((sc)->sc_bst, (sc)->sc_bsh, VSU_BASE + (reg))
 #define	VSU_WRITE(sc, reg, val)			\
 	bus_space_write_4((sc)->sc_bst, (sc)->sc_bsh, VSU_BASE + (reg), (val))
 #define	CSC_READ(sc, n, reg)				\
 	bus_space_read_4((sc)->sc_bst, (sc)->sc_bsh, CSC_BASE(n) + (reg))
 #define	CSC_WRITE(sc, n, reg, val)			\
 	bus_space_write_4((sc)->sc_bst, (sc)->sc_bsh, CSC_BASE(n) + (reg), (val))
 #define	to_sunxi_mixer_crtc(x)		container_of(x, struct sunxi_mixer_crtc, base)
 #define	to_sunxi_mixer_overlay(x)	container_of(x, struct sunxi_mixer_overlay, base)
 static int
 sunxi_mixer_mode_do_set_base(struct drm_crtc *crtc, struct drm_framebuffer *fb,
     int x, int y, int atomic)
+{
 	struct sunxi_mixer_crtc *mixer_crtc = to_sunxi_mixer_crtc(crtc);
 	struct sunxi_mixer_softc * const sc = mixer_crtc->sc;
 	struct sunxi_drm_framebuffer *sfb = atomic?
 	    to_sunxi_drm_framebuffer(fb) :
 	    to_sunxi_drm_framebuffer(crtc->primary->fb);
 	uint64_t paddr = (uint64_t)sfb->obj->dmamap->dm_segs[0].ds_addr;
 	uint32_t haddr = (paddr >> 32) & OVL_UI_TOP_HADD_LAYER0;
 	uint32_t laddr = paddr & 0xffffffff;
 	/* Framebuffer start address */
 	OVL_UI_WRITE(sc, OVL_UI_TOP_HADD, haddr);
 	OVL_UI_WRITE(sc, OVL_UI_TOP_LADD(0), laddr);
 	return 0;
+}
 static void
 sunxi_mixer_destroy(struct drm_crtc *crtc)
+{
 	drm_crtc_cleanup(crtc);
+}
 static int
 sunxi_mixer_page_flip(struct drm_crtc *crtc, struct drm_framebuffer *fb,
     struct drm_pending_vblank_event *event, uint32_t flags)
+{
 	struct sunxi_mixer_crtc *mixer_crtc = to_sunxi_mixer_crtc(crtc);
 	struct sunxi_mixer_softc * const sc = mixer_crtc->sc;
 	unsigned long irqflags;
 	drm_crtc_wait_one_vblank(crtc);
 	sunxi_mixer_mode_do_set_base(crtc, fb, 0, 0, true);
 	/* Commit settings */
 	GLB_WRITE(sc, GLB_DBUFFER, GLB_DBUFFER_DOUBLE_BUFFER_RDY);
 	if (event) {
 		spin_lock_irqsave(&crtc->dev->event_lock, irqflags);
 		drm_send_vblank_event(crtc->dev, drm_crtc_index(crtc), event);
 		spin_unlock_irqrestore(&crtc->dev->event_lock, irqflags);
+	}
 	return 0;
+}
 static const struct drm_crtc_funcs sunxi_mixer_crtc_funcs = {
 	.set_config = drm_crtc_helper_set_config,
 	.page_flip = sunxi_mixer_page_flip,
 	.destroy = sunxi_mixer_destroy,
 };
 static void
 sunxi_mixer_dpms(struct drm_crtc *crtc, int mode)
+{
+}
 static bool
 sunxi_mixer_mode_fixup(struct drm_crtc *crtc,
     const struct drm_display_mode *mode, struct drm_display_mode *adjusted_mode)
+{
 	return true;
+}
 static int
 sunxi_mixer_mode_do_set_base(struct drm_crtc *crtc, struct drm_framebuffer *fb,
     int x, int y, int atomic)
 	struct sunxi_mixer_crtc *mixer_crtc = to_sunxi_mixer_crtc(crtc);
 	struct sunxi_mixer_softc * const sc = mixer_crtc->sc;
 	struct sunxi_drm_framebuffer *sfb = atomic?
 	    to_sunxi_drm_framebuffer(fb) :
 	    to_sunxi_drm_framebuffer(crtc->primary->fb);
 	uint64_t paddr = (uint64_t)sfb->obj->dmamap->dm_segs[0].ds_addr;
 	uint32_t haddr = (paddr >> 32) & OVL_UI_TOP_HADD_LAYER0;
 	uint32_t laddr = paddr & 0xffffffff;
 	/* Framebuffer start address */
 	OVL_UI_WRITE(sc, OVL_UI_TOP_HADD, haddr);
 	OVL_UI_WRITE(sc, OVL_UI_TOP_LADD(0), laddr);
 	return 0;
 static int
 sunxi_mixer_mode_set(struct drm_crtc *crtc, struct drm_display_mode *mode,
     struct drm_display_mode *adjusted_mode, int x, int y,
     struct drm_framebuffer *old_fb)
+{
 	struct sunxi_mixer_crtc *mixer_crtc = to_sunxi_mixer_crtc(crtc);
 	struct sunxi_mixer_softc * const sc = mixer_crtc->sc;
 	uint32_t val;
 	const uint32_t size = ((adjusted_mode->vdisplay - 1) << 16) |
 			      (adjusted_mode->hdisplay - 1);
 	const uint32_t offset = (y << 16) | x;
 	/* Set global size */