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

Commit 9dbed95b authored by Laurent Pinchart's avatar Laurent Pinchart Committed by Mauro Carvalho Chehab
Browse files

[media] v4l: vsp1: Fix multi-line comment style 



Fix all multi-line comments to comply with the kernel coding style.

Signed-off-by: default avatarLaurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@s-opensource.com>
parent f2074708

drivers/media/platform/vsp1/vsp1_bru.c

+18 −9
Original line number Diff line number Diff line
@@ -251,7 +251,8 @@ static int bru_set_selection(struct v4l2_subdev *subdev, 
	sel->r.left = clamp_t(unsigned int, sel->r.left, 0, format->width - 1);

	sel->r.top = clamp_t(unsigned int, sel->r.top, 0, format->height - 1);



	/* Scaling isn't supported, the compose rectangle size must be identical

	/*

	 * Scaling isn't supported, the compose rectangle size must be identical

	 * to the sink format size.

	 */

	format = vsp1_entity_get_pad_format(&bru->entity, config, sel->pad);
@@ -300,13 +301,15 @@ static void bru_configure(struct vsp1_entity *entity, 
	format = vsp1_entity_get_pad_format(&bru->entity, bru->entity.config,

					    bru->entity.source_pad);



	/* The hardware is extremely flexible but we have no userspace API to

	/*

	 * The hardware is extremely flexible but we have no userspace API to

	 * expose all the parameters, nor is it clear whether we would have use

	 * cases for all the supported modes. Let's just harcode the parameters

	 * to sane default values for now.

	 */



	/* Disable dithering and enable color data normalization unless the

	/*

	 * Disable dithering and enable color data normalization unless the

	 * format at the pipeline output is premultiplied.

	 */

	flags = pipe->output ? pipe->output->format.flags : 0;
@@ -314,7 +317,8 @@ static void bru_configure(struct vsp1_entity *entity, 
		       flags & V4L2_PIX_FMT_FLAG_PREMUL_ALPHA ?

		       0 : VI6_BRU_INCTRL_NRM);



	/* Set the background position to cover the whole output image and

	/*

	 * Set the background position to cover the whole output image and

	 * configure its color.

	 */

	vsp1_bru_write(bru, dl, VI6_BRU_VIRRPF_SIZE,
@@ -325,7 +329,8 @@ static void bru_configure(struct vsp1_entity *entity, 
	vsp1_bru_write(bru, dl, VI6_BRU_VIRRPF_COL, bru->bgcolor |

		       (0xff << VI6_BRU_VIRRPF_COL_A_SHIFT));



	/* Route BRU input 1 as SRC input to the ROP unit and configure the ROP

	/*

	 * Route BRU input 1 as SRC input to the ROP unit and configure the ROP

	 * unit with a NOP operation to make BRU input 1 available as the

	 * Blend/ROP unit B SRC input.

	 */
@@ -337,7 +342,8 @@ static void bru_configure(struct vsp1_entity *entity, 
		bool premultiplied = false;

		u32 ctrl = 0;



		/* Configure all Blend/ROP units corresponding to an enabled BRU

		/*

		 * Configure all Blend/ROP units corresponding to an enabled BRU

		 * input for alpha blending. Blend/ROP units corresponding to

		 * disabled BRU inputs are used in ROP NOP mode to ignore the

		 * SRC input.
@@ -352,13 +358,15 @@ static void bru_configure(struct vsp1_entity *entity, 
			     |  VI6_BRU_CTRL_AROP(VI6_ROP_NOP);

		}



		/* Select the virtual RPF as the Blend/ROP unit A DST input to

		/*

		 * Select the virtual RPF as the Blend/ROP unit A DST input to

		 * serve as a background color.

		 */

		if (i == 0)

			ctrl |= VI6_BRU_CTRL_DSTSEL_VRPF;



		/* Route BRU inputs 0 to 3 as SRC inputs to Blend/ROP units A to

		/*

		 * Route BRU inputs 0 to 3 as SRC inputs to Blend/ROP units A to

		 * D in that order. The Blend/ROP unit B SRC is hardwired to the

		 * ROP unit output, the corresponding register bits must be set

		 * to 0.
@@ -368,7 +376,8 @@ static void bru_configure(struct vsp1_entity *entity, 


		vsp1_bru_write(bru, dl, VI6_BRU_CTRL(i), ctrl);



		/* Harcode the blending formula to

		/*

		 * Harcode the blending formula to

		 *

		 *	DSTc = DSTc * (1 - SRCa) + SRCc * SRCa

		 *	DSTa = DSTa * (1 - SRCa) + SRCa

drivers/media/platform/vsp1/vsp1_dl.c

+18 −9
Original line number Diff line number Diff line
@@ -240,7 +240,8 @@ static struct vsp1_dl_list *vsp1_dl_list_alloc(struct vsp1_dl_manager *dlm) 
	INIT_LIST_HEAD(&dl->fragments);

	dl->dlm = dlm;



	/* Initialize the display list body and allocate DMA memory for the body

	/*

	 * Initialize the display list body and allocate DMA memory for the body

	 * and the optional header. Both are allocated together to avoid memory

	 * fragmentation, with the header located right after the body in

	 * memory.
@@ -511,7 +512,8 @@ void vsp1_dl_list_commit(struct vsp1_dl_list *dl) 
		goto done;

	}



	/* Once the UPD bit has been set the hardware can start processing the

	/*

	 * Once the UPD bit has been set the hardware can start processing the

	 * display list at any time and we can't touch the address and size

	 * registers. In that case mark the update as pending, it will be

	 * queued up to the hardware by the frame end interrupt handler.
@@ -523,7 +525,8 @@ void vsp1_dl_list_commit(struct vsp1_dl_list *dl) 
		goto done;

	}



	/* Program the hardware with the display list body address and size.

	/*

	 * Program the hardware with the display list body address and size.

	 * The UPD bit will be cleared by the device when the display list is

	 * processed.

	 */
@@ -547,7 +550,8 @@ void vsp1_dlm_irq_display_start(struct vsp1_dl_manager *dlm) 
{

	spin_lock(&dlm->lock);



	/* The display start interrupt signals the end of the display list

	/*

	 * The display start interrupt signals the end of the display list

	 * processing by the device. The active display list, if any, won't be

	 * accessed anymore and can be reused.

	 */
@@ -566,14 +570,16 @@ void vsp1_dlm_irq_frame_end(struct vsp1_dl_manager *dlm) 
	__vsp1_dl_list_put(dlm->active);

	dlm->active = NULL;



	/* Header mode is used for mem-to-mem pipelines only. We don't need to

	/*

	 * Header mode is used for mem-to-mem pipelines only. We don't need to

	 * perform any operation as there can't be any new display list queued

	 * in that case.

	 */

	if (dlm->mode == VSP1_DL_MODE_HEADER)

		goto done;



	/* The UPD bit set indicates that the commit operation raced with the

	/*

	 * The UPD bit set indicates that the commit operation raced with the

	 * interrupt and occurred after the frame end event and UPD clear but

	 * before interrupt processing. The hardware hasn't taken the update

	 * into account yet, we'll thus skip one frame and retry.
@@ -581,7 +587,8 @@ void vsp1_dlm_irq_frame_end(struct vsp1_dl_manager *dlm) 
	if (vsp1_read(vsp1, VI6_DL_BODY_SIZE) & VI6_DL_BODY_SIZE_UPD)

		goto done;



	/* The device starts processing the queued display list right after the

	/*

	 * The device starts processing the queued display list right after the

	 * frame end interrupt. The display list thus becomes active.

	 */

	if (dlm->queued) {
@@ -589,7 +596,8 @@ void vsp1_dlm_irq_frame_end(struct vsp1_dl_manager *dlm) 
		dlm->queued = NULL;

	}



	/* Now that the UPD bit has been cleared we can queue the next display

	/*

	 * Now that the UPD bit has been cleared we can queue the next display

	 * list to the hardware if one has been prepared.

	 */

	if (dlm->pending) {
@@ -615,7 +623,8 @@ void vsp1_dlm_setup(struct vsp1_device *vsp1) 
		 | VI6_DL_CTRL_DC2 | VI6_DL_CTRL_DC1 | VI6_DL_CTRL_DC0

		 | VI6_DL_CTRL_DLE;



	/* The DRM pipeline operates with display lists in Continuous Frame

	/*

	 * The DRM pipeline operates with display lists in Continuous Frame

	 * Mode, all other pipelines use manual start.

	 */

	if (vsp1->drm)

drivers/media/platform/vsp1/vsp1_drm.c

+14 −7
Original line number Diff line number Diff line
@@ -78,7 +78,8 @@ int vsp1_du_setup_lif(struct device *dev, const struct vsp1_du_lif_config *cfg) 
	int ret;



	if (!cfg) {

		/* NULL configuration means the CRTC is being disabled, stop

		/*

		 * NULL configuration means the CRTC is being disabled, stop

		 * the pipeline and turn the light off.

		 */

		ret = vsp1_pipeline_stop(pipe);
@@ -106,7 +107,8 @@ int vsp1_du_setup_lif(struct device *dev, const struct vsp1_du_lif_config *cfg) 
	dev_dbg(vsp1->dev, "%s: configuring LIF with format %ux%u\n",

		__func__, cfg->width, cfg->height);



	/* Configure the format at the BRU sinks and propagate it through the

	/*

	 * Configure the format at the BRU sinks and propagate it through the

	 * pipeline.

	 */

	memset(&format, 0, sizeof(format));
@@ -175,7 +177,8 @@ int vsp1_du_setup_lif(struct device *dev, const struct vsp1_du_lif_config *cfg) 
		__func__, format.format.width, format.format.height,

		format.format.code);



	/* Verify that the format at the output of the pipeline matches the

	/*

	 * Verify that the format at the output of the pipeline matches the

	 * requested frame size and media bus code.

	 */

	if (format.format.width != cfg->width ||
@@ -185,7 +188,8 @@ int vsp1_du_setup_lif(struct device *dev, const struct vsp1_du_lif_config *cfg) 
		return -EPIPE;

	}



	/* Mark the pipeline as streaming and enable the VSP1. This will store

	/*

	 * Mark the pipeline as streaming and enable the VSP1. This will store

	 * the pipeline pointer in all entities, which the s_stream handlers

	 * will need. We don't start the entities themselves right at this point

	 * as there's no plane configured yet, so we can't start processing
@@ -317,7 +321,8 @@ static int vsp1_du_setup_rpf_pipe(struct vsp1_device *vsp1, 
	const struct v4l2_rect *crop;

	int ret;



	/* Configure the format on the RPF sink pad and propagate it up to the

	/*

	 * Configure the format on the RPF sink pad and propagate it up to the

	 * BRU sink pad.

	 */

	crop = &vsp1->drm->inputs[rpf->entity.index].crop;
@@ -356,7 +361,8 @@ static int vsp1_du_setup_rpf_pipe(struct vsp1_device *vsp1, 
		__func__, sel.r.left, sel.r.top, sel.r.width, sel.r.height,

		rpf->entity.index);



	/* RPF source, hardcode the format to ARGB8888 to turn on format

	/*

	 * RPF source, hardcode the format to ARGB8888 to turn on format

	 * conversion if needed.

	 */

	format.pad = RWPF_PAD_SOURCE;
@@ -528,7 +534,8 @@ int vsp1_drm_create_links(struct vsp1_device *vsp1) 
	unsigned int i;

	int ret;



	/* VSPD instances require a BRU to perform composition and a LIF to

	/*

	 * VSPD instances require a BRU to perform composition and a LIF to

	 * output to the DU.

	 */

	if (!vsp1->bru || !vsp1->lif)

drivers/media/platform/vsp1/vsp1_drv.c

+8 −4
Original line number Diff line number Diff line
@@ -170,7 +170,8 @@ static int vsp1_uapi_create_links(struct vsp1_device *vsp1) 
	}



	for (i = 0; i < vsp1->info->wpf_count; ++i) {

		/* Connect the video device to the WPF. All connections are

		/*

		 * Connect the video device to the WPF. All connections are

		 * immutable.

		 */

		struct vsp1_rwpf *wpf = vsp1->wpf[i];
@@ -227,7 +228,8 @@ static int vsp1_create_entities(struct vsp1_device *vsp1) 
	media_device_init(mdev);



	vsp1->media_ops.link_setup = vsp1_entity_link_setup;

	/* Don't perform link validation when the userspace API is disabled as

	/*

	 * Don't perform link validation when the userspace API is disabled as

	 * the pipeline is configured internally by the driver in that case, and

	 * its configuration can thus be trusted.

	 */
@@ -279,7 +281,8 @@ static int vsp1_create_entities(struct vsp1_device *vsp1) 


	list_add_tail(&vsp1->hst->entity.list_dev, &vsp1->entities);



	/* The LIF is only supported when used in conjunction with the DU, in

	/*

	 * The LIF is only supported when used in conjunction with the DU, in

	 * which case the userspace API is disabled. If the userspace API is

	 * enabled skip the LIF, even when present.

	 */
@@ -391,7 +394,8 @@ static int vsp1_create_entities(struct vsp1_device *vsp1) 
	if (ret < 0)

		goto done;



	/* Register subdev nodes if the userspace API is enabled or initialize

	/*

	 * Register subdev nodes if the userspace API is enabled or initialize

	 * the DRM pipeline otherwise.

	 */

	if (vsp1->info->uapi) {

drivers/media/platform/vsp1/vsp1_entity.c

+6 −3
Original line number Diff line number Diff line
@@ -199,7 +199,8 @@ int vsp1_subdev_enum_mbus_code(struct v4l2_subdev *subdev, 
		struct v4l2_subdev_pad_config *config;

		struct v4l2_mbus_framefmt *format;



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

		/*

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

		 * is always identical to the source format.

		 */

		if (code->index)
@@ -263,7 +264,8 @@ int vsp1_subdev_enum_frame_size(struct v4l2_subdev *subdev, 
		fse->min_height = min_height;

		fse->max_height = max_height;

	} else {

		/* The size on the source pad are fixed and always identical to

		/*

		 * The size on the source pad are fixed and always identical to

		 * the size on the sink pad.

		 */

		fse->min_width = format->width;
@@ -407,7 +409,8 @@ int vsp1_entity_init(struct vsp1_device *vsp1, struct vsp1_entity *entity, 


	vsp1_entity_init_cfg(subdev, NULL);



	/* Allocate the pad configuration to store formats and selection

	/*

	 * Allocate the pad configuration to store formats and selection

	 * rectangles.

	 */

	entity->config = v4l2_subdev_alloc_pad_config(&entity->subdev);