From: Fabrizio Castro <fabrizio.castro@bp.renesas.com>
To: Laurent Pinchart <Laurent.pinchart@ideasonboard.com>,
Geert Uytterhoeven <geert+renesas@glider.be>,
David Airlie <airlied@linux.ie>, Daniel Vetter <daniel@ffwll.ch>,
Rob Herring <robh+dt@kernel.org>,
Mark Rutland <mark.rutland@arm.com>,
Thierry Reding <thierry.reding@gmail.com>,
Maarten Lankhorst <maarten.lankhorst@linux.intel.com>,
Maxime Ripard <mripard@kernel.org>, Sean Paul <sean@poorly.run>,
Andrzej Hajda <a.hajda@samsung.com>
Cc: Fabrizio Castro <fabrizio.castro@bp.renesas.com>,
Sam Ravnborg <sam@ravnborg.org>,
Simon Horman <horms@verge.net.au>,
Magnus Damm <magnus.damm@gmail.com>,
Kieran Bingham <kieran.bingham+renesas@ideasonboard.com>,
dri-devel@lists.freedesktop.org, devicetree@vger.kernel.org,
linux-kernel@vger.kernel.org, linux-renesas-soc@vger.kernel.org,
Chris Paterson <Chris.Paterson2@renesas.com>,
Biju Das <biju.das@bp.renesas.com>,
Laurent Pinchart <laurent.pinchart@ideasonboard.com>,
Jacopo Mondi <jacopo+renesas@jmondi.org>,
ebiharaml@si-linux.co.jp
Subject: [PATCH v4 4/7] drm: rcar-du: lvds: Allow for even and odd pixels swap
Date: Fri, 6 Dec 2019 16:32:51 +0000 [thread overview]
Message-ID: <1575649974-31472-5-git-send-email-fabrizio.castro@bp.renesas.com> (raw)
In-Reply-To: <1575649974-31472-1-git-send-email-fabrizio.castro@bp.renesas.com>
DT properties dual-lvds-even-pixels and dual-lvds-odd-pixels
can be used to work out if the driver needs to swap even
and odd pixels around.
This patch makes use of the return value from function
drm_of_lvds_get_dual_link_pixel_order to determine if we
need to swap odd and even pixels around for things to work
properly.
Signed-off-by: Fabrizio Castro <fabrizio.castro@bp.renesas.com>
---
v3->v4:
* New patch extracted from patch:
"drm: rcar-du: lvds: Add dual-LVDS panels support"
---
drivers/gpu/drm/rcar-du/rcar_lvds.c | 46 +++++++++++++++++++++++++++++--------
1 file changed, 37 insertions(+), 9 deletions(-)
diff --git a/drivers/gpu/drm/rcar-du/rcar_lvds.c b/drivers/gpu/drm/rcar-du/rcar_lvds.c
index 6c1f171..cb2147c 100644
--- a/drivers/gpu/drm/rcar-du/rcar_lvds.c
+++ b/drivers/gpu/drm/rcar-du/rcar_lvds.c
@@ -71,6 +71,7 @@ struct rcar_lvds {
struct drm_bridge *companion;
bool dual_link;
+ bool stripe_swap_data;
};
#define bridge_to_rcar_lvds(b) \
@@ -441,12 +442,20 @@ static void rcar_lvds_enable(struct drm_bridge *bridge)
rcar_lvds_write(lvds, LVDCHCR, lvdhcr);
if (lvds->info->quirks & RCAR_LVDS_QUIRK_DUAL_LINK) {
- /*
- * Configure vertical stripe based on the mode of operation of
- * the connected device.
- */
- rcar_lvds_write(lvds, LVDSTRIPE,
- lvds->dual_link ? LVDSTRIPE_ST_ON : 0);
+ u32 lvdstripe = 0;
+
+ if (lvds->dual_link)
+ /*
+ * Configure vertical stripe based on the mode of
+ * operation of the connected device.
+ *
+ * ST_SWAP from LVD1STRIPE is reserved, do not set
+ * in the companion LVDS
+ */
+ lvdstripe = LVDSTRIPE_ST_ON |
+ (lvds->companion && lvds->stripe_swap_data ?
+ LVDSTRIPE_ST_SWAP : 0);
+ rcar_lvds_write(lvds, LVDSTRIPE, lvdstripe);
}
/*
@@ -702,17 +711,33 @@ static int rcar_lvds_parse_dt_companion(struct rcar_lvds *lvds)
dual_link = drm_of_lvds_get_dual_link_pixel_order(p0, p1);
of_node_put(p0);
of_node_put(p1);
- if (dual_link >= DRM_LVDS_DUAL_LINK_EVEN_ODD_PIXELS) {
+
+ switch (dual_link) {
+ case DRM_LVDS_DUAL_LINK_ODD_EVEN_PIXELS:
+ /*
+ * By default we generate even pixels from this encoder and odd
+ * pixels from the companion encoder, but since p0 is connected
+ * to the port expecting ood pixels, and p1 is connected to the
+ * port expecting even pixels, we need to swap even and odd
+ * pixels around.
+ */
+ lvds->stripe_swap_data = true;
+ lvds->dual_link = true;
+ break;
+ case DRM_LVDS_DUAL_LINK_EVEN_ODD_PIXELS:
lvds->dual_link = true;
- } else if (lvds->next_bridge && lvds->next_bridge->timings) {
+ break;
+ default:
/*
* Early dual-link bridge specific implementations populate the
* timings field of drm_bridge, read the dual_link flag off the
* bridge directly for backward compatibility.
*/
- lvds->dual_link = lvds->next_bridge->timings->dual_link;
+ if (lvds->next_bridge && lvds->next_bridge->timings)
+ lvds->dual_link = lvds->next_bridge->timings->dual_link;
}
+
if (!lvds->dual_link) {
dev_dbg(dev, "Single-link configuration detected\n");
goto done;
@@ -728,6 +753,9 @@ static int rcar_lvds_parse_dt_companion(struct rcar_lvds *lvds)
"Dual-link configuration detected (companion encoder %pOF)\n",
companion);
+ if (lvds->stripe_swap_data)
+ dev_dbg(dev, "Data swapping required\n");
+
companion_lvds = bridge_to_rcar_lvds(lvds->companion);
/*
--
2.7.4
next prev parent reply other threads:[~2019-12-06 16:33 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-12-06 16:32 [PATCH v4 0/7] Add dual-LVDS panel support to EK874 Fabrizio Castro
2019-12-06 16:32 ` [PATCH v4 1/7] drm: of: Add drm_of_lvds_get_dual_link_pixel_order Fabrizio Castro
2019-12-13 21:05 ` Laurent Pinchart
2019-12-16 17:52 ` Fabrizio Castro
2019-12-06 16:32 ` [PATCH v4 2/7] drm: rcar-du: lvds: Improve identification of panels Fabrizio Castro
2019-12-13 21:21 ` Laurent Pinchart
2019-12-16 18:00 ` Fabrizio Castro
2019-12-06 16:32 ` [PATCH v4 3/7] drm: rcar-du: lvds: Get dual link configuration from DT Fabrizio Castro
2019-12-13 21:30 ` Laurent Pinchart
2019-12-16 18:10 ` Fabrizio Castro
2019-12-06 16:32 ` Fabrizio Castro [this message]
2019-12-13 21:40 ` [PATCH v4 4/7] drm: rcar-du: lvds: Allow for even and odd pixels swap Laurent Pinchart
2019-12-16 18:36 ` Fabrizio Castro
2019-12-06 16:32 ` [PATCH v4 5/7] drm: rcar-du: lvds: Fix mode for companion encoder Fabrizio Castro
2019-12-13 21:41 ` Laurent Pinchart
2019-12-16 18:43 ` Fabrizio Castro
2019-12-06 16:32 ` [PATCH v4 6/7] dt-bindings: display: Add idk-2121wr binding Fabrizio Castro
2019-12-13 22:16 ` Laurent Pinchart
2019-12-06 16:32 ` [PATCH v4 7/7] arm64: dts: renesas: Add EK874 board with idk-2121wr display support Fabrizio Castro
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=1575649974-31472-5-git-send-email-fabrizio.castro@bp.renesas.com \
--to=fabrizio.castro@bp.renesas.com \
--cc=Chris.Paterson2@renesas.com \
--cc=Laurent.pinchart@ideasonboard.com \
--cc=a.hajda@samsung.com \
--cc=airlied@linux.ie \
--cc=biju.das@bp.renesas.com \
--cc=daniel@ffwll.ch \
--cc=devicetree@vger.kernel.org \
--cc=dri-devel@lists.freedesktop.org \
--cc=ebiharaml@si-linux.co.jp \
--cc=geert+renesas@glider.be \
--cc=horms@verge.net.au \
--cc=jacopo+renesas@jmondi.org \
--cc=kieran.bingham+renesas@ideasonboard.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-renesas-soc@vger.kernel.org \
--cc=maarten.lankhorst@linux.intel.com \
--cc=magnus.damm@gmail.com \
--cc=mark.rutland@arm.com \
--cc=mripard@kernel.org \
--cc=robh+dt@kernel.org \
--cc=sam@ravnborg.org \
--cc=sean@poorly.run \
--cc=thierry.reding@gmail.com \
/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).