From: Kieran Bingham <kieran.bingham@ideasonboard.com>
To: Jacopo Mondi <jacopo+renesas@jmondi.org>,
laurent.pinchart@ideasonboard.com,
niklas.soderlund+renesas@ragnatech.se
Cc: linux-media@vger.kernel.org, linux-renesas-soc@vger.kernel.org
Subject: Re: [PATCH v2 5/6] media: adv748x: Store the TX sink in HDMI/AFE
Date: Mon, 7 Jan 2019 10:45:20 +0000 [thread overview]
Message-ID: <a5936df6-b1c3-5bc6-0fa6-b2dd80de811a@ideasonboard.com> (raw)
In-Reply-To: <20190106155413.30666-6-jacopo+renesas@jmondi.org>
Hi Jacopo,
On 06/01/2019 15:54, Jacopo Mondi wrote:
> Both the AFE and HDMI s_stream routines (adv748x_afe_s_stream() and
> adv748x_hdmi_s_stream()) have to enable the CSI-2 TX they are streaming video
> data to.
>
> With the introduction of dynamic routing between HDMI and AFE entities to
> TXA, the video stream sink needs to be set at run time, and not statically
> selected as the s_stream functions are currently doing.
>
> To fix this, store a reference to the active CSI-2 TX sink for both HDMI and
> AFE sources, and operate on it when starting/stopping the stream.
>
Great - decouples the AFE/HDMI from a specific TX.
Reviewed-by: Kieran Bingham <kieran.bingham+renesas@ideasonboard.com>
> Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
> Signed-off-by: Jacopo Mondi <jacopo+renesas@jmondi.org>
> ---
> drivers/media/i2c/adv748x/adv748x-afe.c | 2 +-
> drivers/media/i2c/adv748x/adv748x-csi2.c | 15 +++++++++++++--
> drivers/media/i2c/adv748x/adv748x-hdmi.c | 2 +-
> drivers/media/i2c/adv748x/adv748x.h | 4 ++++
> 4 files changed, 19 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/media/i2c/adv748x/adv748x-afe.c b/drivers/media/i2c/adv748x/adv748x-afe.c
> index 71714634efb0..dbbb1e4d6363 100644
> --- a/drivers/media/i2c/adv748x/adv748x-afe.c
> +++ b/drivers/media/i2c/adv748x/adv748x-afe.c
> @@ -282,7 +282,7 @@ static int adv748x_afe_s_stream(struct v4l2_subdev *sd, int enable)
> goto unlock;
> }
>
> - ret = adv748x_tx_power(&state->txb, enable);
> + ret = adv748x_tx_power(afe->tx, enable);
> if (ret)
> goto unlock;
>
> diff --git a/drivers/media/i2c/adv748x/adv748x-csi2.c b/drivers/media/i2c/adv748x/adv748x-csi2.c
> index de3944615e64..c835f6379337 100644
> --- a/drivers/media/i2c/adv748x/adv748x-csi2.c
> +++ b/drivers/media/i2c/adv748x/adv748x-csi2.c
> @@ -88,14 +88,25 @@ static int adv748x_csi2_registered(struct v4l2_subdev *sd)
> is_txb(tx));
> if (ret)
> return ret;
> +
> + /* TXB can output AFE signals only. */
> + if (is_txb(tx))
> + state->afe.tx = tx;
> }
>
> /* Register link to HDMI for TXA only. */
> if (is_txb(tx) || !is_hdmi_enabled(state))
> return 0;
>
> - return adv748x_csi2_register_link(tx, sd->v4l2_dev, &state->hdmi.sd,
> - ADV748X_HDMI_SOURCE, true);
> + ret = adv748x_csi2_register_link(tx, sd->v4l2_dev, &state->hdmi.sd,
> + ADV748X_HDMI_SOURCE, true);
> + if (ret)
> + return ret;
> +
> + /* The default HDMI output is TXA. */
> + state->hdmi.tx = tx;
> +
> + return 0;
> }
>
> static const struct v4l2_subdev_internal_ops adv748x_csi2_internal_ops = {
> diff --git a/drivers/media/i2c/adv748x/adv748x-hdmi.c b/drivers/media/i2c/adv748x/adv748x-hdmi.c
> index 35d027941482..c557f8fdf11a 100644
> --- a/drivers/media/i2c/adv748x/adv748x-hdmi.c
> +++ b/drivers/media/i2c/adv748x/adv748x-hdmi.c
> @@ -358,7 +358,7 @@ static int adv748x_hdmi_s_stream(struct v4l2_subdev *sd, int enable)
>
> mutex_lock(&state->mutex);
>
> - ret = adv748x_tx_power(&state->txa, enable);
> + ret = adv748x_tx_power(hdmi->tx, enable);
> if (ret)
> goto done;
>
> diff --git a/drivers/media/i2c/adv748x/adv748x.h b/drivers/media/i2c/adv748x/adv748x.h
> index d8d94053301b..6eb2e4a95eed 100644
> --- a/drivers/media/i2c/adv748x/adv748x.h
> +++ b/drivers/media/i2c/adv748x/adv748x.h
> @@ -122,6 +122,8 @@ struct adv748x_hdmi {
> struct v4l2_dv_timings timings;
> struct v4l2_fract aspect_ratio;
>
> + struct adv748x_csi2 *tx;
> +
> struct {
> u8 edid[512];
> u32 present;
> @@ -152,6 +154,8 @@ struct adv748x_afe {
> struct v4l2_subdev sd;
> struct v4l2_mbus_framefmt format;
>
> + struct adv748x_csi2 *tx;
> +
> bool streaming;
> v4l2_std_id curr_norm;
> unsigned int input;
>
--
Regards
--
Kieran
next prev parent reply other threads:[~2019-01-07 10:45 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-01-06 15:54 [PATCH v2 0/6] media: adv748x: Implement dynamic routing support Jacopo Mondi
2019-01-06 15:54 ` [PATCH v2 1/6] media: adv748x: Add is_txb() Jacopo Mondi
2019-01-07 9:49 ` Kieran Bingham
2019-01-07 10:05 ` Jacopo Mondi
2019-01-07 10:38 ` Kieran Bingham
2019-01-09 0:04 ` Laurent Pinchart
2019-01-06 15:54 ` [PATCH v2 2/6] media: adv748x: Rename reset procedures Jacopo Mondi
2019-01-07 9:59 ` Kieran Bingham
2019-01-06 15:54 ` [PATCH v2 3/6] media: adv748x: csi2: Link AFE with TXA and TXB Jacopo Mondi
2019-01-07 10:35 ` Kieran Bingham
2019-01-09 0:11 ` Laurent Pinchart
2019-01-06 15:54 ` [PATCH v2 4/6] media: adv748x: Store the source subdevice in TX Jacopo Mondi
2019-01-07 10:41 ` Kieran Bingham
2019-01-06 15:54 ` [PATCH v2 5/6] media: adv748x: Store the TX sink in HDMI/AFE Jacopo Mondi
2019-01-07 10:45 ` Kieran Bingham [this message]
2019-01-06 15:54 ` [PATCH v2 6/6] media: adv748x: Implement TX link_setup callback Jacopo Mondi
2019-01-07 12:36 ` Kieran Bingham
2019-01-09 0:15 ` Laurent Pinchart
2019-01-09 14:15 ` Kieran Bingham
2019-01-10 8:58 ` Jacopo Mondi
2019-01-10 10:05 ` Kieran Bingham
2019-01-10 8:51 ` Jacopo Mondi
2019-01-10 9:27 ` Laurent Pinchart
2019-01-09 14:17 ` Kieran Bingham
2019-01-10 10:01 ` Jacopo Mondi
2019-01-10 13:40 ` Jacopo Mondi
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=a5936df6-b1c3-5bc6-0fa6-b2dd80de811a@ideasonboard.com \
--to=kieran.bingham@ideasonboard.com \
--cc=jacopo+renesas@jmondi.org \
--cc=laurent.pinchart@ideasonboard.com \
--cc=linux-media@vger.kernel.org \
--cc=linux-renesas-soc@vger.kernel.org \
--cc=niklas.soderlund+renesas@ragnatech.se \
/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).