Hi Jacopo,
Thanks for your work.
On 2019-01-10 15:02:12 +0100, 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.
>
> Reviewed-by: Kieran Bingham <kieran.bingham+renesas@xxxxxxxxxxxxxxxx>
> Reviewed-by: Laurent Pinchart <laurent.pinchart@xxxxxxxxxxxxxxxx>
> Signed-off-by: Jacopo Mondi <jacopo+renesas@xxxxxxxxxx>
Reviewed-by: Niklas Söderlund <niklas.soderlund+renesas@xxxxxxxxxxxx>
> ---
> 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 353b6b9bf6a7..2091cda50935 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 d22270f5e2c1..934a9d9a75c8 100644
> --- a/drivers/media/i2c/adv748x/adv748x.h
> +++ b/drivers/media/i2c/adv748x/adv748x.h
> @@ -121,6 +121,8 @@ struct adv748x_hdmi {
> struct v4l2_dv_timings timings;
> struct v4l2_fract aspect_ratio;
>
> + struct adv748x_csi2 *tx;
> +
> struct {
> u8 edid[512];
> u32 present;
> @@ -151,6 +153,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;
> --
> 2.20.1
>
--
Regards,
Niklas Söderlund
