From patchwork Tue Sep 26 06:59:09 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chen-Yu Tsai X-Patchwork-Id: 9971139 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id BDA2660393 for ; Tue, 26 Sep 2017 06:59:32 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id AF4FC20683 for ; Tue, 26 Sep 2017 06:59:32 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id A3D5D28653; Tue, 26 Sep 2017 06:59:32 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.2 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 369B520683 for ; Tue, 26 Sep 2017 06:59:32 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 574A86E022; Tue, 26 Sep 2017 06:59:30 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from wens.csie.org (unknown [140.112.30.76]) by gabe.freedesktop.org (Postfix) with ESMTPS id A6AF16E022 for ; Tue, 26 Sep 2017 06:59:29 +0000 (UTC) Received: by wens.csie.org (Postfix, from userid 1000) id 63496600A9; Tue, 26 Sep 2017 14:59:25 +0800 (CST) From: Chen-Yu Tsai To: Mark Brown , Maxime Ripard , David Airlie , Michael Turquette , Stephen Boyd , Rob Herring , Mark Rutland Subject: [PATCH v2 03/13] drm/sun4i: tcon: Add support for demuxing TCON output on A31 Date: Tue, 26 Sep 2017 14:59:09 +0800 Message-Id: <20170926065919.24446-4-wens@csie.org> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20170926065919.24446-1-wens@csie.org> References: <20170926065919.24446-1-wens@csie.org> Cc: devicetree@vger.kernel.org, linux-sunxi@googlegroups.com, linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, Chen-Yu Tsai , linux-clk@vger.kernel.org, linux-arm-kernel@lists.infradead.org X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Virus-Scanned: ClamAV using ClamSMTP On systems with 2 TCONs such as the A31, it is possible to demux the output of the TCONs to one encoder. Add support for this for the A31. Signed-off-by: Chen-Yu Tsai --- drivers/gpu/drm/sun4i/sun4i_tcon.c | 61 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 61 insertions(+) diff --git a/drivers/gpu/drm/sun4i/sun4i_tcon.c b/drivers/gpu/drm/sun4i/sun4i_tcon.c index e853dfe51389..770b843a6fa9 100644 --- a/drivers/gpu/drm/sun4i/sun4i_tcon.c +++ b/drivers/gpu/drm/sun4i/sun4i_tcon.c @@ -14,9 +14,12 @@ #include #include #include +#include #include #include +#include + #include #include #include @@ -109,11 +112,69 @@ void sun4i_tcon_enable_vblank(struct sun4i_tcon *tcon, bool enable) } EXPORT_SYMBOL(sun4i_tcon_enable_vblank); +static struct sun4i_tcon *sun4i_get_first_tcon(struct drm_device *drm) +{ + struct sun4i_drv *drv = drm->dev_private; + struct sun4i_tcon *tcon; + + list_for_each_entry(tcon, &drv->tcon_list, list) + if (tcon->id == 0) + return tcon; + + dev_warn(drm->dev, + "TCON0 not found, display output muxing may not work\n"); + + return tcon; +} + +static int _sun6i_tcon_set_mux(struct drm_encoder *encoder) +{ + struct sun4i_tcon *tcon = sun4i_get_first_tcon(encoder->dev); + int tcon_id = drm_crtc_to_sun4i_crtc(encoder->crtc)->tcon->id; + u32 shift; + + DRM_DEBUG_DRIVER("Muxing encoder %s to CRTC %s (TCON %d)\n", + encoder->name, encoder->crtc->name, tcon_id); + + /* Only 2 TCONs */ + if (tcon_id >= 2) + return -EINVAL; + + switch (encoder->encoder_type) { + case DRM_MODE_ENCODER_TMDS: + /* HDMI */ + shift = 8; + break; + case DRM_MODE_ENCODER_DSI: + /* No MIPI DSI on A31s */ + if (of_device_is_compatible(tcon->dev->of_node, + "allwinner,sun6i-a31s-tcon")) + return -EINVAL; + shift = 0; + break; + default: + return -EINVAL; + } + + regmap_update_bits(tcon->regs, SUN4I_TCON_MUX_CTRL_REG, + 0x3 << shift, tcon_id << shift); + + return 0; +} + void sun4i_tcon_set_mux(struct sun4i_tcon *tcon, int channel, struct drm_encoder *encoder) { + /* Get the device node of the display engine */ + struct device_node *node = encoder->dev->dev->of_node; u32 val; + if (of_device_is_compatible(node, "allwinner,sun6i-a31-display-engine") || + of_device_is_compatible(node, "allwinner,sun6i-a31s-display-engine")) { + _sun6i_tcon_set_mux(encoder); + return; + } + if (!tcon->quirks->has_unknown_mux) return;