From: Maxime Ripard <maxime@cerno.tech>
To: Chen-Yu Tsai <wens@csie.org>, Maxime Ripard <maxime@cerno.tech>,
dri-devel@lists.freedesktop.org
Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>,
Thomas Zimmermann <tzimmermann@suse.de>,
Daniel Vetter <daniel.vetter@intel.com>,
David Airlie <airlied@linux.ie>,
devicetree@vger.kernel.org, Mark Rutland <mark.rutland@arm.com>,
Rob Herring <robh+dt@kernel.org>,
Frank Rowand <frowand.list@gmail.com>,
Laurent Pinchart <laurent.pinchart@ideasonboard.com>,
linux-arm-kernel@lists.infradead.org
Subject: [PATCH v2 3/4] drm/sun4i: tcon: Support the LVDS Dual-Link on the A20
Date: Thu, 30 Jul 2020 11:35:03 +0200 [thread overview]
Message-ID: <100f5fe3391366e9bbc76ebec1edbf8c0aeb715a.1596101672.git-series.maxime@cerno.tech> (raw)
In-Reply-To: <cover.7029eefe5c5350920f91d4cd4cbc061466752f3c.1596101672.git-series.maxime@cerno.tech>
The A20 can use its second TCON as the secondary LVDS link in a dual-link
setup, with the TCON0 being the main link. Extend a bit the parsing code to
leverage the DRM dual-link code, register only the LVDS output on the
primary TCON, and add the needed bits to setup the TCON properly.
Signed-off-by: Maxime Ripard <maxime@cerno.tech>
---
drivers/gpu/drm/sun4i/sun4i_tcon.c | 36 +++++++++++++++++++++++++++++++-
drivers/gpu/drm/sun4i/sun4i_tcon.h | 4 +++-
2 files changed, 40 insertions(+)
diff --git a/drivers/gpu/drm/sun4i/sun4i_tcon.c b/drivers/gpu/drm/sun4i/sun4i_tcon.c
index d03ad75f9900..ed2abf6eb18b 100644
--- a/drivers/gpu/drm/sun4i/sun4i_tcon.c
+++ b/drivers/gpu/drm/sun4i/sun4i_tcon.c
@@ -487,6 +487,9 @@ static void sun4i_tcon0_mode_set_lvds(struct sun4i_tcon *tcon,
else
reg |= SUN4I_TCON0_LVDS_IF_DATA_POL_NORMAL;
+ if (tcon->lvds_dual_link)
+ reg |= SUN4I_TCON0_LVDS_IF_DUAL_LINK;
+
if (sun4i_tcon_get_pixel_depth(encoder) == 24)
reg |= SUN4I_TCON0_LVDS_IF_BITWIDTH_24BITS;
else
@@ -896,6 +899,16 @@ static int sun4i_tcon_register_panel(struct drm_device *drm,
return sun4i_rgb_init(drm, tcon);
/*
+ * Only the TCON0 will be relevant for the LVDS output, so if
+ * our ID is something else, let's prevent our TCON from
+ * registering its own LVDS output
+ */
+ if (tcon->id) {
+ dev_info(dev, "Secondary TCON, disabling panel output");
+ return 0;
+ }
+
+ /*
* This can only be made optional since we've had DT
* nodes without the LVDS reset properties.
*
@@ -941,6 +954,28 @@ static int sun4i_tcon_register_panel(struct drm_device *drm,
return -ENODEV;
}
+ /*
+ * If we don't have a second TCON, we will never be able to do
+ * dual-link LVDS, so we don't have much more to do.
+ */
+ companion = of_parse_phandle(dev->of_node, "allwinner,lvds-companion", 0);
+ if (!companion)
+ return 0;
+
+ /*
+ * Let's do a sanity check on the dual-link setup to make sure
+ * everything is properly described.
+ */
+ ret = drm_of_lvds_get_dual_link_pixel_order(dev->of_node, 1, 0,
+ companion, 1, 0);
+ if (ret < 0) {
+ dev_err(dev, "Invalid Dual-Link Configuration.\n");
+ return ret;
+ }
+
+ dev_info(dev, "Primary TCON, enabling LVDS Dual-Link");
+ tcon->lvds_dual_link = true;
+
return sun4i_lvds_init(drm, tcon);
}
@@ -1500,6 +1535,7 @@ static const struct sun4i_tcon_quirks sun7i_a20_tcon0_quirks = {
};
static const struct sun4i_tcon_quirks sun7i_a20_quirks = {
+ .supports_lvds = true,
.has_channel_0 = true,
.has_channel_1 = true,
.dclk_min_div = 4,
diff --git a/drivers/gpu/drm/sun4i/sun4i_tcon.h b/drivers/gpu/drm/sun4i/sun4i_tcon.h
index cfbf4e6c1679..51c4e09cdd13 100644
--- a/drivers/gpu/drm/sun4i/sun4i_tcon.h
+++ b/drivers/gpu/drm/sun4i/sun4i_tcon.h
@@ -98,6 +98,7 @@
#define SUN4I_TCON0_LVDS_IF_REG 0x84
#define SUN4I_TCON0_LVDS_IF_EN BIT(31)
+#define SUN4I_TCON0_LVDS_IF_DUAL_LINK BIT(30)
#define SUN4I_TCON0_LVDS_IF_BITWIDTH_MASK BIT(26)
#define SUN4I_TCON0_LVDS_IF_BITWIDTH_18BITS (1 << 26)
#define SUN4I_TCON0_LVDS_IF_BITWIDTH_24BITS (0 << 26)
@@ -274,6 +275,9 @@ struct sun4i_tcon {
/* Associated crtc */
struct sun4i_crtc *crtc;
+ /* Is the LVDS link a dual-channel link? */
+ bool lvds_dual_link;
+
int id;
/* TCON list management */
--
git-series 0.9.1
next prev parent reply other threads:[~2020-07-30 9:35 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-30 9:35 [PATCH v2 0/4] drm/sun4i: Add support for dual-link LVDS on the A20 Maxime Ripard
2020-07-30 9:35 ` [PATCH v2 1/4] drm/of: Change the prototype of drm_of_lvds_get_dual_link_pixel_order Maxime Ripard
2020-08-31 20:28 ` Laurent Pinchart
2020-09-01 13:23 ` Maxime Ripard
2020-09-02 0:10 ` Laurent Pinchart
2020-07-30 9:35 ` [PATCH v2 2/4] drm/sun4i: tcon: Refactor the LVDS and panel probing Maxime Ripard
2020-08-29 6:43 ` Chen-Yu Tsai
2020-10-05 14:18 ` Maxime Ripard
2020-10-05 14:28 ` Chen-Yu Tsai
2020-08-31 20:38 ` Laurent Pinchart
2020-07-30 9:35 ` Maxime Ripard [this message]
2020-08-29 6:55 ` [PATCH v2 3/4] drm/sun4i: tcon: Support the LVDS Dual-Link on the A20 Chen-Yu Tsai
2020-08-31 20:43 ` Laurent Pinchart
2020-07-30 9:35 ` [PATCH v2 4/4] [DO NOT MERGE] ARM: dts: sun7i: Enable LVDS Dual-Link on the Cubieboard Maxime Ripard
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=100f5fe3391366e9bbc76ebec1edbf8c0aeb715a.1596101672.git-series.maxime@cerno.tech \
--to=maxime@cerno.tech \
--cc=airlied@linux.ie \
--cc=daniel.vetter@intel.com \
--cc=devicetree@vger.kernel.org \
--cc=dri-devel@lists.freedesktop.org \
--cc=frowand.list@gmail.com \
--cc=laurent.pinchart@ideasonboard.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=maarten.lankhorst@linux.intel.com \
--cc=mark.rutland@arm.com \
--cc=robh+dt@kernel.org \
--cc=tzimmermann@suse.de \
--cc=wens@csie.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;
as well as URLs for NNTP newsgroup(s).