media: adv748x: Store the TX sink in HDMI/AFE

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@ideasonboard.com>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Jacopo Mondi <jacopo+renesas@jmondi.org>
Reviewed-by: Niklas Söderlund <niklas.soderlund+renesas@ragnatech.se>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>

diff --git a/drivers/media/i2c/adv748x/adv748x-afe.c b/drivers/media/i2c/adv748x/adv748x-afe.c
index 71714634efb08bd434daa5ab12ae3b46a101b3ca..dbbb1e4d63637a33b8b8b1f333c15232d5394308 100644 (file)
--- 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 353b6b9bf6a795804499a2e6c3465fba9e191e28..2091cda50935691fcdd859c45579d2e06f48ec5a 100644 (file)
--- 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 35d027941482a8927676961e64df36d2a7254eba..c557f8fdf11a8a81ffc20fb53264237b6c23ec81 100644 (file)
--- 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 d22270f5e2c170c3fb7091ffe6e0136cddc788af..934a9d9a75c81314492bd29174e94916f68e982d 100644 (file)
--- 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;