Module Name:    src
Committed By:   jakllsch
Date:           Thu Dec 19 00:35:01 UTC 2019

Modified Files:
        src/sys/dev/fdt: files.fdt
Added Files:
        src/sys/dev/fdt: fdt_panel.c

Log Message:
Add another panel@fdt driver, this time for DRM-style panels.

To do: migrate away from other panel driver.


To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 src/sys/dev/fdt/fdt_panel.c
cvs rdiff -u -r1.48 -r1.49 src/sys/dev/fdt/files.fdt

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/dev/fdt/files.fdt
diff -u src/sys/dev/fdt/files.fdt:1.48 src/sys/dev/fdt/files.fdt:1.49
--- src/sys/dev/fdt/files.fdt:1.48	Sun Nov 17 19:30:42 2019
+++ src/sys/dev/fdt/files.fdt	Thu Dec 19 00:35:01 2019
@@ -1,4 +1,4 @@
-# $NetBSD: files.fdt,v 1.48 2019/11/17 19:30:42 jmcneill Exp $
+# $NetBSD: files.fdt,v 1.49 2019/12/19 00:35:01 jakllsch Exp $
 
 include	"external/bsd/libfdt/conf/files.libfdt"
 
@@ -45,6 +45,9 @@ device	panel: fdt_port
 attach	panel at fdt with fdt_panel
 file	dev/fdt/panel_fdt.c			fdt_panel
 
+attach	panel at fdt with panel_fdt: drmkms
+file	dev/fdt/fdt_panel.c			panel_fdt
+
 device	dispcon: fdt_port, drmkms, ddc_read_edid
 attach	dispcon at fdt with dispcon_hdmi
 file	dev/fdt/hdmi_connector.c		dispcon_hdmi

Added files:

Index: src/sys/dev/fdt/fdt_panel.c
diff -u /dev/null src/sys/dev/fdt/fdt_panel.c:1.1
--- /dev/null	Thu Dec 19 00:35:01 2019
+++ src/sys/dev/fdt/fdt_panel.c	Thu Dec 19 00:35:01 2019
@@ -0,0 +1,163 @@
+/* $NetBSD: fdt_panel.c,v 1.1 2019/12/19 00:35:01 jakllsch Exp $ */
+
+/*-
+ * Copyright (c) 2019 Jonathan A. Kollasch <jakll...@kollasch.net>
+ * 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.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * 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: fdt_panel.c,v 1.1 2019/12/19 00:35:01 jakllsch Exp $");
+
+#include <sys/param.h>
+#include <sys/bus.h>
+#include <sys/device.h>
+#include <sys/systm.h>
+#include <sys/gpio.h>
+
+#include <dev/fdt/fdtvar.h>
+#include <dev/fdt/fdt_port.h>
+
+#include <dev/i2c/ddcvar.h>
+
+#include <drm/drmP.h>
+#include <drm/drm_panel.h>
+#include <drm/drm_edid.h>
+
+static const char * const compatible[] = {
+	"simple-panel",
+	NULL
+};
+
+struct panel_fdt_softc {
+	device_t			sc_dev;
+	struct fdt_device_ports		sc_ports;
+	struct drm_panel		sc_panel;
+	struct fdtbus_gpio_pin *	sc_enable;
+	struct fdtbus_regulator *	sc_regulator;
+};
+
+#define	to_panel_fdt(x)	container_of(x, struct panel_fdt_softc, sc_panel)
+
+static int
+panel_fdt_enable(struct drm_panel * panel)
+{
+	struct panel_fdt_softc * const sc = to_panel_fdt(panel);
+
+        if (sc->sc_enable) {
+		fdtbus_gpio_write(sc->sc_enable, true);
+        }
+
+	if (!cold)
+		kpause("panele", false, mstohz(200), NULL);
+
+	return 0;
+}
+
+static int
+panel_fdt_prepare(struct drm_panel * panel)
+{
+	struct panel_fdt_softc * const sc = to_panel_fdt(panel);
+
+        if (sc->sc_regulator) {
+                fdtbus_regulator_enable(sc->sc_regulator);
+        }
+
+	if (cold)
+		delay(210000);
+	else
+		kpause("panelp", false, mstohz(210), NULL);
+
+	return 0;
+}
+
+static const struct drm_panel_funcs panel_fdt_funcs = {
+	.disable = NULL,
+	.enable = panel_fdt_enable,
+	.get_modes = NULL,
+	.get_timings = NULL,
+	.prepare = panel_fdt_prepare,
+	.unprepare = NULL,
+};
+
+static int
+panel_fdt_ep_activate(device_t dev, struct fdt_endpoint *ep, bool activate)
+{
+	struct fdt_endpoint *rep = fdt_endpoint_remote(ep);
+
+	if (fdt_endpoint_port_index(ep) != 0)
+		return EINVAL;
+
+	if (fdt_endpoint_type(rep) != EP_DRM_ENCODER)
+		return EINVAL;
+
+	return 0;
+}
+
+static void *
+panel_fdt_ep_get_data(device_t dev, struct fdt_endpoint *ep)
+{
+	struct panel_fdt_softc * const sc = device_private(dev);
+
+	return &sc->sc_panel;
+}
+
+static int
+panel_fdt_match(device_t parent, cfdata_t cf, void *aux)
+{
+	struct fdt_attach_args * const faa = aux;
+
+	return of_match_compatible(faa->faa_phandle, compatible);
+}
+
+static void
+panel_fdt_attach(device_t parent, device_t self, void *aux)
+{
+	struct panel_fdt_softc * const sc = device_private(self);
+	struct fdt_attach_args * const faa = aux;
+	const int phandle = faa->faa_phandle;
+
+	aprint_naive("\n");
+	aprint_normal(": panel\n");
+
+	sc->sc_dev = self;
+
+	/* required for "simple-panel" */
+        sc->sc_regulator = fdtbus_regulator_acquire(phandle, "power-supply");
+
+	/* optional for "simple-panel" */
+	sc->sc_enable = fdtbus_gpio_acquire_index(phandle,
+	    "enable-gpios", 0, GPIO_PIN_OUTPUT);
+
+	sc->sc_ports.dp_ep_activate = panel_fdt_ep_activate;
+	sc->sc_ports.dp_ep_get_data = panel_fdt_ep_get_data;
+	fdt_ports_register(&sc->sc_ports, self, phandle, EP_DRM_PANEL);
+
+	drm_panel_init(&sc->sc_panel);
+	sc->sc_panel.funcs = &panel_fdt_funcs;
+
+	drm_panel_add(&sc->sc_panel);
+}
+
+CFATTACH_DECL_NEW(panel_fdt, sizeof(struct panel_fdt_softc),
+	panel_fdt_match, panel_fdt_attach, NULL, NULL);

Reply via email to