From: Sascha Hauer <s.hauer@pengutronix.de>
To: Barebox List <barebox@lists.infradead.org>
Subject: [PATCH 3/3] video: ipuv3: imx-ldb: Support video modes in ldb node
Date: Tue, 22 Sep 2015 09:19:19 +0200 [thread overview]
Message-ID: <1442906359-17286-4-git-send-email-s.hauer@pengutronix.de> (raw)
In-Reply-To: <1442906359-17286-1-git-send-email-s.hauer@pengutronix.de>
We used to support video modes directly in the ldb device node, that
was lost in: 5bda17e video: ipuv3: Replace ipu_output with VPL.
Add this support back.
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
---
drivers/video/imx-ipu-v3/imx-ldb.c | 24 ++++++++++++++++++++----
1 file changed, 20 insertions(+), 4 deletions(-)
diff --git a/drivers/video/imx-ipu-v3/imx-ldb.c b/drivers/video/imx-ipu-v3/imx-ldb.c
index 2f49ed2..f502f19 100644
--- a/drivers/video/imx-ipu-v3/imx-ldb.c
+++ b/drivers/video/imx-ipu-v3/imx-ldb.c
@@ -282,9 +282,18 @@ static int imx_ldb_ioctl(struct vpl *vpl, unsigned int port,
V4L2_PIX_FMT_RGB24 : V4L2_PIX_FMT_BGR666;
return 0;
- default:
- return vpl_ioctl(vpl, imx_ldb_ch->output_port, cmd, data);
+ case VPL_GET_VIDEOMODES:
+ if (imx_ldb_ch->modes) {
+ struct display_timings *timings = data;
+ timings->num_modes = imx_ldb_ch->modes->num_modes;
+ timings->modes = imx_ldb_ch->modes->modes;
+ return 0;
+ }
+
+ break;
}
+
+ return vpl_ioctl(vpl, imx_ldb_ch->output_port, cmd, data);
}
static int imx_ldb_probe(struct device_d *dev)
@@ -329,8 +338,15 @@ static int imx_ldb_probe(struct device_d *dev)
/* The output port is port@4 with mux or port@1 without mux */
port = of_graph_get_port_by_id(child, channel->output_port);
if (!port) {
- dev_warn(dev, "No port found for %s\n", child->full_name);
- continue;
+ /*
+ * No output port found, see if we can get modes from the
+ * ldb node.
+ */
+ channel->modes = of_get_display_timings(child);
+ if (!channel->modes) {
+ dev_warn(dev, "No port found for %s\n", child->full_name);
+ continue;
+ }
}
channel->vpl.node = child;
--
2.5.1
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
prev parent reply other threads:[~2015-09-22 7:19 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-09-22 7:19 video: imx-ipu-v3: ldb fixes Sascha Hauer
2015-09-22 7:19 ` [PATCH 1/3] video: ipuv3: Do not crash when no mode is found Sascha Hauer
2015-09-22 7:19 ` [PATCH 2/3] video: ipuv3: imx-ldb: remove unused variable Sascha Hauer
2015-09-22 7:19 ` Sascha Hauer [this message]
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=1442906359-17286-4-git-send-email-s.hauer@pengutronix.de \
--to=s.hauer@pengutronix.de \
--cc=barebox@lists.infradead.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