Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fd32d534 authored by Chris Lesiak's avatar Chris Lesiak Committed by Mauro Carvalho Chehab
Browse files

media: platform: video-mux: propagate format from sink to source 



Propagate the v4l2_mbus_framefmt to the source pad when either a sink
pad is activated or when the format of the active sink pad changes.

Signed-off-by: default avatarChris Lesiak <chris.lesiak@licor.com>
Reviewed-by: default avatarPhilipp Zabel <p.zabel@pengutronix.de>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+samsung@kernel.org>
parent 65dc760b

drivers/media/platform/video-mux.c

+15 −1
Original line number Diff line number Diff line
@@ -45,6 +45,7 @@ static int video_mux_link_setup(struct media_entity *entity, 
{

	struct v4l2_subdev *sd = media_entity_to_v4l2_subdev(entity);

	struct video_mux *vmux = v4l2_subdev_to_video_mux(sd);

	u16 source_pad = entity->num_pads - 1;

	int ret = 0;



	/*
@@ -74,6 +75,9 @@ static int video_mux_link_setup(struct media_entity *entity, 
		if (ret < 0)

			goto out;

		vmux->active = local->index;



		/* Propagate the active format to the source */

		vmux->format_mbus[source_pad] = vmux->format_mbus[vmux->active];

	} else {

		if (vmux->active != local->index)

			goto out;
@@ -162,14 +166,20 @@ static int video_mux_set_format(struct v4l2_subdev *sd, 
			    struct v4l2_subdev_format *sdformat)

{

	struct video_mux *vmux = v4l2_subdev_to_video_mux(sd);

	struct v4l2_mbus_framefmt *mbusformat;

	struct v4l2_mbus_framefmt *mbusformat, *source_mbusformat;

	struct media_pad *pad = &vmux->pads[sdformat->pad];

	u16 source_pad = sd->entity.num_pads - 1;



	mbusformat = __video_mux_get_pad_format(sd, cfg, sdformat->pad,

					    sdformat->which);

	if (!mbusformat)

		return -EINVAL;



	source_mbusformat = __video_mux_get_pad_format(sd, cfg, source_pad,

						       sdformat->which);

	if (!source_mbusformat)

		return -EINVAL;



	mutex_lock(&vmux->lock);



	/* Source pad mirrors active sink pad, no limitations on sink pads */
@@ -178,6 +188,10 @@ static int video_mux_set_format(struct v4l2_subdev *sd, 


	*mbusformat = sdformat->format;



	/* Propagate the format from an active sink to source */

	if ((pad->flags & MEDIA_PAD_FL_SINK) && (pad->index == vmux->active))

		*source_mbusformat = sdformat->format;



	mutex_unlock(&vmux->lock);



	return 0;