From: Chen-Yu Tsai <wens@csie.org>
To: Mark Brown <broonie@kernel.org>,
Maxime Ripard <maxime.ripard@free-electrons.com>,
David Airlie <airlied@linux.ie>,
Michael Turquette <mturquette@baylibre.com>,
Stephen Boyd <sboyd@codeaurora.org>,
Rob Herring <robh+dt@kernel.org>,
Mark Rutland <mark.rutland@arm.com>
Cc: Chen-Yu Tsai <wens@csie.org>,
dri-devel@lists.freedesktop.org,
linux-arm-kernel@lists.infradead.org, linux-clk@vger.kernel.org,
devicetree@vger.kernel.org, linux-kernel@vger.kernel.org,
linux-sunxi@googlegroups.com
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 [thread overview]
Message-ID: <20170926065919.24446-4-wens@csie.org> (raw)
In-Reply-To: <20170926065919.24446-1-wens@csie.org>
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 <wens@csie.org>
---
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 <drm/drm_atomic_helper.h>
#include <drm/drm_crtc.h>
#include <drm/drm_crtc_helper.h>
+#include <drm/drm_encoder.h>
#include <drm/drm_modes.h>
#include <drm/drm_of.h>
+#include <uapi/drm/drm_mode.h>
+
#include <linux/component.h>
#include <linux/ioport.h>
#include <linux/of_address.h>
@@ -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;
--
2.14.1
next prev parent reply other threads:[~2017-09-26 6:59 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-09-26 6:59 [PATCH v2 00/13] drm/sun4i: hdmi: Support HDMI controller on A31 Chen-Yu Tsai
2017-09-26 6:59 ` [PATCH v2 01/13] clk: sunxi-ng: sun6i: Export video PLLs Chen-Yu Tsai
2017-09-26 9:24 ` Maxime Ripard
2017-09-26 6:59 ` [PATCH v2 02/13] clk: sunxi-ng: sun6i: Rename HDMI DDC clock to avoid name collision Chen-Yu Tsai
2017-09-26 9:32 ` Maxime Ripard
2017-09-27 3:45 ` Chen-Yu Tsai
2017-09-26 6:59 ` Chen-Yu Tsai [this message]
2017-09-26 9:56 ` [PATCH v2 03/13] drm/sun4i: tcon: Add support for demuxing TCON output on A31 Maxime Ripard
2017-09-27 4:03 ` Chen-Yu Tsai
2017-09-26 6:59 ` [PATCH v2 04/13] drm/sun4i: hdmi: Disable clks in bind function error path and unbind function Chen-Yu Tsai
2017-09-26 9:56 ` Maxime Ripard
2017-09-26 6:59 ` [PATCH v2 05/13] drm/sun4i: hdmi: create a regmap for later use Chen-Yu Tsai
2017-09-26 9:56 ` Maxime Ripard
2017-09-26 6:59 ` [PATCH v2 06/13] drm/sun4i: hdmi: Allow using second PLL as TMDS clk parent Chen-Yu Tsai
2017-09-26 9:58 ` Maxime Ripard
2017-09-26 6:59 ` [PATCH v2 07/13] dt-bindings: display: sun4i: Add binding for A31 HDMI controller Chen-Yu Tsai
2017-09-26 6:59 ` [PATCH v2 08/13] regmap: add iopoll-like polling macro for regmap_field Chen-Yu Tsai
2017-09-26 6:59 ` [PATCH v2 09/13] drm/sun4i: hdmi: Add support for controller hardware variants Chen-Yu Tsai
2017-09-26 10:01 ` Maxime Ripard
2017-09-26 6:59 ` [PATCH v2 10/13] drm/sun4i: hdmi: Add A31 specific DDC register definitions Chen-Yu Tsai
2017-09-26 10:02 ` Maxime Ripard
2017-09-26 6:59 ` [PATCH v2 11/13] drm/sun4i: hdmi: Add support for A31's HDMI controller Chen-Yu Tsai
2017-09-26 10:02 ` Maxime Ripard
2017-09-26 6:59 ` [PATCH v2 12/13] ARM: dts: sun6i: Add device node for " Chen-Yu Tsai
2017-09-26 6:59 ` [PATCH v2 13/13] ARM: dts: sun6i: Enable HDMI support on some A31/A31s devices Chen-Yu Tsai
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170926065919.24446-4-wens@csie.org \
--to=wens@csie.org \
--cc=airlied@linux.ie \
--cc=broonie@kernel.org \
--cc=devicetree@vger.kernel.org \
--cc=dri-devel@lists.freedesktop.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-clk@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-sunxi@googlegroups.com \
--cc=mark.rutland@arm.com \
--cc=maxime.ripard@free-electrons.com \
--cc=mturquette@baylibre.com \
--cc=robh+dt@kernel.org \
--cc=sboyd@codeaurora.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox