leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

media: adv748x: Implement TX link_setup callback

Browse Source 
When the adv748x driver is informed about a link being created from HDMI or
AFE to a CSI-2 TX output, the 'link_setup()' callback is invoked. Make
sure to implement proper routing management at link setup time, to route
the selected video stream to the desired TX output.

Signed-off-by: Jacopo Mondi <jacopo+renesas@jmondi.org>
Reviewed-by: Kieran Bingham <kieran.bingham+renesas@ideasonboard.com>
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>
This commit is contained in:
Jacopo Mondi 2019-01-10 09:02:13 -05:00 committed by Mauro Carvalho Chehab
parent a33df6ac31
commit 9423ca350d
2 changed files with 49 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
drivers/media/i2c/adv748x/adv748x-core.c
View File

@ -335,6 +335,51 @@ int adv748x_tx_power(struct adv748x_csi2 *tx, bool on)
/* -----------------------------------------------------------------------------
* Media Operations
*/
static int adv748x_link_setup(struct media_entity *entity,
const struct media_pad *local,
const struct media_pad *remote, u32 flags)
{
struct v4l2_subdev *rsd = media_entity_to_v4l2_subdev(remote->entity);
struct v4l2_subdev *sd = media_entity_to_v4l2_subdev(entity);
struct adv748x_state *state = v4l2_get_subdevdata(sd);
struct adv748x_csi2 *tx = adv748x_sd_to_csi2(sd);
bool enable = flags & MEDIA_LNK_FL_ENABLED;
u8 io10_mask = ADV748X_IO_10_CSI1_EN |
ADV748X_IO_10_CSI4_EN |
ADV748X_IO_10_CSI4_IN_SEL_AFE;
u8 io10 = 0;
/* Refuse to enable multiple links to the same TX at the same time. */
if (enable && tx->src)
return -EINVAL;
/* Set or clear the source (HDMI or AFE) and the current TX. */
if (rsd == &state->afe.sd)
state->afe.tx = enable ? tx : NULL;
else
state->hdmi.tx = enable ? tx : NULL;
tx->src = enable ? rsd : NULL;
if (state->afe.tx) {
/* AFE Requires TXA enabled, even when output to TXB */
io10 |= ADV748X_IO_10_CSI4_EN;
if (is_txa(tx))
io10 |= ADV748X_IO_10_CSI4_IN_SEL_AFE;
else
io10 |= ADV748X_IO_10_CSI1_EN;
}
if (state->hdmi.tx)
io10 |= ADV748X_IO_10_CSI4_EN;
return io_clrset(state, ADV748X_IO_10, io10_mask, io10);
}
static const struct media_entity_operations adv748x_tx_media_ops = {
.link_setup = adv748x_link_setup,
.link_validate = v4l2_subdev_link_validate,
};
static const struct media_entity_operations adv748x_media_ops = {
.link_validate = v4l2_subdev_link_validate,
@ -516,7 +561,8 @@ void adv748x_subdev_init(struct v4l2_subdev *sd, struct adv748x_state *state,
state->client->addr, ident);
sd->entity.function = function;
sd->entity.ops = &adv748x_media_ops;
sd->entity.ops = is_tx(adv748x_sd_to_csi2(sd)) ?
&adv748x_tx_media_ops : &adv748x_media_ops;
}
static int adv748x_parse_csi2_lanes(struct adv748x_state *state,

2
drivers/media/i2c/adv748x/adv748x.h
View File

@ -94,6 +94,7 @@ struct adv748x_csi2 {
#define is_tx_enabled(_tx) ((_tx)->state->endpoints[(_tx)->port] != NULL)
#define is_txa(_tx) ((_tx) == &(_tx)->state->txa)
#define is_txb(_tx) ((_tx) == &(_tx)->state->txb)
#define is_tx(_tx) (is_txa(_tx) || is_txb(_tx))
#define is_afe_enabled(_state) \
((_state)->endpoints[ADV748X_PORT_AIN0] != NULL || \
@ -223,6 +224,7 @@ struct adv748x_state {
#define ADV748X_IO_10_CSI4_EN BIT(7)
#define ADV748X_IO_10_CSI1_EN BIT(6)
#define ADV748X_IO_10_PIX_OUT_EN BIT(5)
#define ADV748X_IO_10_CSI4_IN_SEL_AFE BIT(3)
#define ADV748X_IO_CHIP_REV_ID_1 0xdf
#define ADV748X_IO_CHIP_REV_ID_2 0xe0