From e03a63b8d4a60ee49e3277ac7f7ea4c2998e7938 Mon Sep 17 00:00:00 2001 From: Kieran Bingham Date: Thu, 10 Oct 2024 14:52:52 +0100 Subject: [PATCH] NotForUpstream: media: video-mux: Propagate controls to source The i.MX8MP makes calls on it's source device to determine the link-frequency that should be configured on the CSI2 receiver. When the source is behind a video mux, we need to pass this call through to the connected device. Map the control handler of the source device to the video-mux, essentially proxying all controls on the mux to the device which has it's link enabled. Signed-off-by: Kieran Bingham --- drivers/media/platform/video-mux.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/drivers/media/platform/video-mux.c b/drivers/media/platform/video-mux.c index a504a69ea25f9f..50118bc9617f41 100644 --- a/drivers/media/platform/video-mux.c +++ b/drivers/media/platform/video-mux.c @@ -69,6 +69,7 @@ static int video_mux_link_setup(struct media_entity *entity, const struct media_pad *remote, u32 flags) { struct v4l2_subdev *sd = media_entity_to_v4l2_subdev(entity); + struct v4l2_subdev *source_sd; struct video_mux *vmux = v4l2_subdev_to_video_mux(sd); u16 source_pad = entity->num_pads - 1; int ret = 0; @@ -111,6 +112,10 @@ static int video_mux_link_setup(struct media_entity *entity, *source_mbusformat = *v4l2_subdev_get_pad_format(sd, sd_state, vmux->active); v4l2_subdev_unlock_state(sd_state); + + source_sd = media_entity_to_v4l2_subdev(remote->entity); + vmux->subdev.ctrl_handler = source_sd->ctrl_handler; + } else { if (vmux->active != local->index) goto out; @@ -118,6 +123,8 @@ static int video_mux_link_setup(struct media_entity *entity, dev_dbg(sd->dev, "going inactive\n"); mux_control_deselect(vmux->mux); vmux->active = -1; + + vmux->subdev.ctrl_handler = NULL; } out: