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

Commit 6ad9ba9c authored by Laurent Pinchart's avatar Laurent Pinchart Committed by Mauro Carvalho Chehab
Browse files

[media] v4l: vsp1: Factorize media bus codes enumeration code 



Most of the entities can't perform format conversion and implement the
same media bus enumeration function. Factorize the code into a single
implementation.

Signed-off-by: default avatarLaurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@osg.samsung.com>
parent 3f557220

drivers/media/platform/vsp1/vsp1_bru.c

+2 −24
Original line number Diff line number Diff line
@@ -76,31 +76,9 @@ static int bru_enum_mbus_code(struct v4l2_subdev *subdev, 
		MEDIA_BUS_FMT_ARGB8888_1X32,

		MEDIA_BUS_FMT_AYUV8_1X32,

	};

	struct vsp1_bru *bru = to_bru(subdev);



	if (code->pad == BRU_PAD_SINK(0)) {

		if (code->index >= ARRAY_SIZE(codes))

			return -EINVAL;



		code->code = codes[code->index];

	} else {

		struct v4l2_subdev_pad_config *config;

		struct v4l2_mbus_framefmt *format;



		if (code->index)

			return -EINVAL;



		config = vsp1_entity_get_pad_config(&bru->entity, cfg,

						    code->which);

		if (!config)

			return -EINVAL;



		format = vsp1_entity_get_pad_format(&bru->entity, config,

						    BRU_PAD_SINK(0));

		code->code = format->code;

	}



	return 0;

	return vsp1_subdev_enum_mbus_code(subdev, cfg, code, codes,

					  ARRAY_SIZE(codes));

}



static int bru_enum_frame_size(struct v4l2_subdev *subdev,

drivers/media/platform/vsp1/vsp1_entity.c

+46 −0
Original line number Diff line number Diff line
@@ -141,6 +141,52 @@ int vsp1_subdev_get_pad_format(struct v4l2_subdev *subdev, 
	return 0;

}



/*

 * vsp1_subdev_enum_mbus_code - Subdev pad enum_mbus_code handler

 * @subdev: V4L2 subdevice

 * @cfg: V4L2 subdev pad configuration

 * @code: Media bus code enumeration

 * @codes: Array of supported media bus codes

 * @ncodes: Number of supported media bus codes

 *

 * This function implements the subdev enum_mbus_code pad operation for entities

 * that do not support format conversion. It enumerates the given supported

 * media bus codes on the sink pad and reports a source pad format identical to

 * the sink pad.

 */

int vsp1_subdev_enum_mbus_code(struct v4l2_subdev *subdev,

			       struct v4l2_subdev_pad_config *cfg,

			       struct v4l2_subdev_mbus_code_enum *code,

			       const unsigned int *codes, unsigned int ncodes)

{

	struct vsp1_entity *entity = to_vsp1_entity(subdev);



	if (code->pad == 0) {

		if (code->index >= ncodes)

			return -EINVAL;



		code->code = codes[code->index];

	} else {

		struct v4l2_subdev_pad_config *config;

		struct v4l2_mbus_framefmt *format;



		/* The entity can't perform format conversion, the sink format

		 * is always identical to the source format.

		 */

		if (code->index)

			return -EINVAL;



		config = vsp1_entity_get_pad_config(entity, cfg, code->which);

		if (!config)

			return -EINVAL;



		format = vsp1_entity_get_pad_format(entity, config, 0);

		code->code = format->code;

	}



	return 0;

}



/* -----------------------------------------------------------------------------

 * Media Operations

 */

drivers/media/platform/vsp1/vsp1_entity.h

+4 −0
Original line number Diff line number Diff line
@@ -130,5 +130,9 @@ void vsp1_entity_route_setup(struct vsp1_entity *source, 
int vsp1_subdev_get_pad_format(struct v4l2_subdev *subdev,

			       struct v4l2_subdev_pad_config *cfg,

			       struct v4l2_subdev_format *fmt);

int vsp1_subdev_enum_mbus_code(struct v4l2_subdev *subdev,

			       struct v4l2_subdev_pad_config *cfg,

			       struct v4l2_subdev_mbus_code_enum *code,

			       const unsigned int *codes, unsigned int ncodes);



#endif /* __VSP1_ENTITY_H__ */

drivers/media/platform/vsp1/vsp1_lif.c

+2 −27
Original line number Diff line number Diff line
@@ -45,34 +45,9 @@ static int lif_enum_mbus_code(struct v4l2_subdev *subdev, 
		MEDIA_BUS_FMT_ARGB8888_1X32,

		MEDIA_BUS_FMT_AYUV8_1X32,

	};

	struct vsp1_lif *lif = to_lif(subdev);



	if (code->pad == LIF_PAD_SINK) {

		if (code->index >= ARRAY_SIZE(codes))

			return -EINVAL;



		code->code = codes[code->index];

	} else {

		struct v4l2_subdev_pad_config *config;

		struct v4l2_mbus_framefmt *format;



		/* The LIF can't perform format conversion, the sink format is

		 * always identical to the source format.

		 */

		if (code->index)

			return -EINVAL;



		config = vsp1_entity_get_pad_config(&lif->entity, cfg,

						    code->which);

		if (!config)

			return -EINVAL;



		format = vsp1_entity_get_pad_format(&lif->entity, config,

						    LIF_PAD_SINK);

		code->code = format->code;

	}



	return 0;

	return vsp1_subdev_enum_mbus_code(subdev, cfg, code, codes,

					  ARRAY_SIZE(codes));

}



static int lif_enum_frame_size(struct v4l2_subdev *subdev,

drivers/media/platform/vsp1/vsp1_lut.c

+2 −27
Original line number Diff line number Diff line
@@ -71,34 +71,9 @@ static int lut_enum_mbus_code(struct v4l2_subdev *subdev, 
		MEDIA_BUS_FMT_AHSV8888_1X32,

		MEDIA_BUS_FMT_AYUV8_1X32,

	};

	struct vsp1_lut *lut = to_lut(subdev);



	if (code->pad == LUT_PAD_SINK) {

		if (code->index >= ARRAY_SIZE(codes))

			return -EINVAL;



		code->code = codes[code->index];

	} else {

		struct v4l2_subdev_pad_config *config;

		struct v4l2_mbus_framefmt *format;



		/* The LUT can't perform format conversion, the sink format is

		 * always identical to the source format.

		 */

		if (code->index)

			return -EINVAL;



		config = vsp1_entity_get_pad_config(&lut->entity, cfg,

						    code->which);

		if (!config)

			return -EINVAL;



		format = vsp1_entity_get_pad_format(&lut->entity, config,

						    LUT_PAD_SINK);

		code->code = format->code;

	}



	return 0;

	return vsp1_subdev_enum_mbus_code(subdev, cfg, code, codes,

					  ARRAY_SIZE(codes));

}



static int lut_enum_frame_size(struct v4l2_subdev *subdev,