From: Boris Brezillon <boris.brezillon@collabora.com>
To: dri-devel@lists.freedesktop.org
Cc: Nikita Yushchenko <nikita.yoush@cogentembedded.com>,
Mark Rutland <mark.rutland@arm.com>,
Jernej Skrabec <jernej.skrabec@siol.net>,
Neil Armstrong <narmstrong@baylibre.com>,
Andrey Smirnov <andrew.smirnov@gmail.com>,
Jonas Karlman <jonas@kwiboo.se>, Rob Herring <robh+dt@kernel.org>,
Andrzej Hajda <a.hajda@samsung.com>,
devicetree@vger.kernel.org,
Thierry Reding <thierry.reding@gmail.com>,
Laurent Pinchart <Laurent.pinchart@ideasonboard.com>,
Boris Brezillon <boris.brezillon@collabora.com>,
intel-gfx-trybot@lists.freedesktop.org, kernel@collabora.com,
Sam Ravnborg <sam@ravnborg.org>, Chris Healy <cphealy@gmail.com>
Subject: [PATCH v10 08/12] drm/bridge: lvds-codec: Implement basic bus format negotiation
Date: Tue, 28 Jan 2020 14:55:10 +0100 [thread overview]
Message-ID: <20200128135514.108171-9-boris.brezillon@collabora.com> (raw)
In-Reply-To: <20200128135514.108171-1-boris.brezillon@collabora.com>
Some DPI -> LVDS encoders might support several input bus width. Add a
DT property to describe the bus width used on a specific design.
v10:
* Add changelog to the commit message
v8 -> v9:
* No changes
v7:
* Fix a use-after-release problem
* Get rid of the data-mapping parsing
* Use kmalloc instead of kcalloc.
v4 -> v6:
* Not part of the series
v3:
* Use bus-width for the rgb24/rgb18 distinction
* Adjust code to match core changes
* Get rid of of_get_data_mapping()
* Don't implement ->atomic_check() (the core now takes care of bus
flags propagation)
v2:
* Make the bus-format negotiation logic more generic
Signed-off-by: Boris Brezillon <boris.brezillon@collabora.com>
---
drivers/gpu/drm/bridge/lvds-codec.c | 64 ++++++++++++++++++++++++++---
1 file changed, 58 insertions(+), 6 deletions(-)
diff --git a/drivers/gpu/drm/bridge/lvds-codec.c b/drivers/gpu/drm/bridge/lvds-codec.c
index 5f04cc11227e..f4fd8472c335 100644
--- a/drivers/gpu/drm/bridge/lvds-codec.c
+++ b/drivers/gpu/drm/bridge/lvds-codec.c
@@ -11,6 +11,7 @@
#include <linux/of_graph.h>
#include <linux/platform_device.h>
+#include <drm/drm_atomic_helper.h>
#include <drm/drm_bridge.h>
#include <drm/drm_panel.h>
@@ -19,6 +20,7 @@ struct lvds_codec {
struct drm_bridge *panel_bridge;
struct gpio_desc *powerdown_gpio;
u32 connector_type;
+ u32 input_fmt;
};
static int lvds_codec_attach(struct drm_bridge *bridge)
@@ -48,18 +50,47 @@ static void lvds_codec_disable(struct drm_bridge *bridge)
gpiod_set_value_cansleep(lvds_codec->powerdown_gpio, 1);
}
+static u32 *
+lvds_codec_atomic_get_input_bus_fmts(struct drm_bridge *bridge,
+ struct drm_bridge_state *bridge_state,
+ struct drm_crtc_state *crtc_state,
+ struct drm_connector_state *conn_state,
+ u32 output_fmt,
+ unsigned int *num_input_fmts)
+{
+ struct lvds_codec *lvds_codec = container_of(bridge,
+ struct lvds_codec, bridge);
+ u32 *input_fmts;
+
+ input_fmts = kmalloc(sizeof(*input_fmts), GFP_KERNEL);
+ if (!input_fmts) {
+ *num_input_fmts = 0;
+ return NULL;
+ }
+
+ *num_input_fmts = 1;
+ input_fmts[0] = lvds_codec->input_fmt;
+ return input_fmts;
+}
+
static struct drm_bridge_funcs funcs = {
.attach = lvds_codec_attach,
.enable = lvds_codec_enable,
.disable = lvds_codec_disable,
+ .atomic_reset = drm_atomic_helper_bridge_reset,
+ .atomic_duplicate_state = drm_atomic_helper_bridge_duplicate_state,
+ .atomic_destroy_state = drm_atomic_helper_bridge_destroy_state,
+ .atomic_get_input_bus_fmts = lvds_codec_atomic_get_input_bus_fmts,
};
static int lvds_codec_probe(struct platform_device *pdev)
{
struct device *dev = &pdev->dev;
- struct device_node *panel_node;
+ struct device_node *np;
struct drm_panel *panel;
struct lvds_codec *lvds_codec;
+ u32 input_bus_width;
+ int err;
lvds_codec = devm_kzalloc(dev, sizeof(*lvds_codec), GFP_KERNEL);
if (!lvds_codec)
@@ -69,22 +100,43 @@ static int lvds_codec_probe(struct platform_device *pdev)
lvds_codec->powerdown_gpio = devm_gpiod_get_optional(dev, "powerdown",
GPIOD_OUT_HIGH);
if (IS_ERR(lvds_codec->powerdown_gpio)) {
- int err = PTR_ERR(lvds_codec->powerdown_gpio);
+ err = PTR_ERR(lvds_codec->powerdown_gpio);
if (err != -EPROBE_DEFER)
dev_err(dev, "powerdown GPIO failure: %d\n", err);
return err;
}
+ np = of_graph_get_port_by_id(dev->of_node, 0);
+ if (!np) {
+ dev_dbg(dev, "port 0 not found\n");
+ return -ENXIO;
+ }
+
+ err = of_property_read_u32(np, "bus-width", &input_bus_width);
+ of_node_put(np);
+
+ if (err) {
+ lvds_codec->input_fmt = MEDIA_BUS_FMT_FIXED;
+ } else if (input_bus_width == 18) {
+ lvds_codec->input_fmt = MEDIA_BUS_FMT_RGB666_1X18;
+ } else if (input_bus_width == 24) {
+ lvds_codec->input_fmt = MEDIA_BUS_FMT_RGB888_1X24;
+ } else {
+ dev_dbg(dev, "unsupported bus-width value %u on port 0\n",
+ input_bus_width);
+ return -ENOTSUPP;
+ }
+
/* Locate the panel DT node. */
- panel_node = of_graph_get_remote_node(dev->of_node, 1, 0);
- if (!panel_node) {
+ np = of_graph_get_remote_node(dev->of_node, 1, 0);
+ if (!np) {
dev_dbg(dev, "panel DT node not found\n");
return -ENXIO;
}
- panel = of_drm_find_panel(panel_node);
- of_node_put(panel_node);
+ panel = of_drm_find_panel(np);
+ of_node_put(np);
if (IS_ERR(panel)) {
dev_dbg(dev, "panel not found, deferring probe\n");
return PTR_ERR(panel);
--
2.24.1
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
next prev parent reply other threads:[~2020-01-28 13:55 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-01-28 13:55 [PATCH v10 00/12] drm: Add support for bus-format negotiation Boris Brezillon
2020-01-28 13:55 ` [PATCH v10 01/12] drm/bridge: Add a drm_bridge_state object Boris Brezillon
2020-01-28 13:55 ` [PATCH v10 02/12] drm/rcar-du: Plug atomic state hooks to the default implementation Boris Brezillon
2020-01-28 13:55 ` [PATCH v10 03/12] drm/bridge: analogix: " Boris Brezillon
2020-01-28 13:55 ` [PATCH v10 04/12] drm/bridge: Patch atomic hooks to take a drm_bridge_state Boris Brezillon
2020-01-28 13:55 ` [PATCH v10 05/12] drm/bridge: Add an ->atomic_check() hook Boris Brezillon
2020-01-28 13:55 ` [PATCH v10 06/12] drm/bridge: Add the necessary bits to support bus format negotiation Boris Brezillon
2020-01-28 13:55 ` [PATCH v10 07/12] drm/imx: pd: Use bus format/flags provided by the bridge when available Boris Brezillon
2020-01-28 13:55 ` Boris Brezillon [this message]
2020-02-24 23:03 ` [PATCH v10 08/12] drm/bridge: lvds-codec: Implement basic bus format negotiation Laurent Pinchart
2020-02-25 6:15 ` Sam Ravnborg
2020-02-25 8:44 ` Boris Brezillon
2020-01-28 13:55 ` [PATCH v10 09/12] dt-bindings: display: bridge: lvds-codec: Add new bus-width prop Boris Brezillon
2020-01-31 17:12 ` Sam Ravnborg
2020-01-31 17:23 ` Boris Brezillon
2020-02-24 22:31 ` Laurent Pinchart
2020-02-25 9:13 ` Boris Brezillon
2020-03-09 10:35 ` Boris Brezillon
2020-01-28 13:55 ` [PATCH v10 10/12] drm/bridge: panel: Propage bus format/flags Boris Brezillon
2020-01-31 17:25 ` Boris Brezillon
2020-02-24 22:34 ` Laurent Pinchart
2020-02-25 8:45 ` Boris Brezillon
2020-01-28 13:55 ` [PATCH v10 11/12] drm/panel: simple: Fix the lt089ac29000 bus_format Boris Brezillon
2020-01-28 13:55 ` [PATCH v10 12/12] ARM: dts: imx: imx51-zii-rdu1: Fix the display pipeline definition Boris Brezillon
2020-01-31 15:42 ` [PATCH v10 00/12] drm: Add support for bus-format negotiation Boris Brezillon
2020-01-31 16:51 ` Sam Ravnborg
2020-01-31 18:08 ` Daniel Vetter
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=20200128135514.108171-9-boris.brezillon@collabora.com \
--to=boris.brezillon@collabora.com \
--cc=Laurent.pinchart@ideasonboard.com \
--cc=a.hajda@samsung.com \
--cc=andrew.smirnov@gmail.com \
--cc=cphealy@gmail.com \
--cc=devicetree@vger.kernel.org \
--cc=dri-devel@lists.freedesktop.org \
--cc=intel-gfx-trybot@lists.freedesktop.org \
--cc=jernej.skrabec@siol.net \
--cc=jonas@kwiboo.se \
--cc=kernel@collabora.com \
--cc=mark.rutland@arm.com \
--cc=narmstrong@baylibre.com \
--cc=nikita.yoush@cogentembedded.com \
--cc=robh+dt@kernel.org \
--cc=sam@ravnborg.org \
--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).