Commit a33df6ac authored by Jacopo Mondi's avatar Jacopo Mondi Committed by Mauro Carvalho Chehab
Browse files

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: default avatarKieran Bingham <kieran.bingham+renesas@ideasonboard.com>
Reviewed-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: default avatarJacopo Mondi <jacopo+renesas@jmondi.org>
Reviewed-by: default avatarNiklas Söderlund <niklas.soderlund+renesas@ragnatech.se>
Signed-off-by: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+samsung@kernel.org>
parent 3361b9c4

drivers/media/i2c/adv748x/adv748x-afe.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

drivers/media/i2c/adv748x/adv748x-csi2.c

+13 −2
Original line number Diff line number Diff line
@@ -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,

	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 = {

drivers/media/i2c/adv748x/adv748x-hdmi.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

drivers/media/i2c/adv748x/adv748x.h

+4 −0
Original line number Diff line number Diff line
@@ -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;