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

[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
...@@ -251,7 +251,8 @@ static int bru_set_selection(struct v4l2_subdev *subdev, ...@@ -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.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); 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. * to the sink format size.
*/ */
format = vsp1_entity_get_pad_format(&bru->entity, config, sel->pad); format = vsp1_entity_get_pad_format(&bru->entity, config, sel->pad);
...@@ -300,13 +301,15 @@ static void bru_configure(struct vsp1_entity *entity, ...@@ -300,13 +301,15 @@ static void bru_configure(struct vsp1_entity *entity,
format = vsp1_entity_get_pad_format(&bru->entity, bru->entity.config, format = vsp1_entity_get_pad_format(&bru->entity, bru->entity.config,
bru->entity.source_pad); 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 * 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 * cases for all the supported modes. Let's just harcode the parameters
* to sane default values for now. * 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. * format at the pipeline output is premultiplied.
*/ */
flags = pipe->output ? pipe->output->format.flags : 0; flags = pipe->output ? pipe->output->format.flags : 0;
...@@ -314,7 +317,8 @@ static void bru_configure(struct vsp1_entity *entity, ...@@ -314,7 +317,8 @@ static void bru_configure(struct vsp1_entity *entity,
flags & V4L2_PIX_FMT_FLAG_PREMUL_ALPHA ? flags & V4L2_PIX_FMT_FLAG_PREMUL_ALPHA ?
0 : VI6_BRU_INCTRL_NRM); 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. * configure its color.
*/ */
vsp1_bru_write(bru, dl, VI6_BRU_VIRRPF_SIZE, vsp1_bru_write(bru, dl, VI6_BRU_VIRRPF_SIZE,
...@@ -325,7 +329,8 @@ static void bru_configure(struct vsp1_entity *entity, ...@@ -325,7 +329,8 @@ static void bru_configure(struct vsp1_entity *entity,
vsp1_bru_write(bru, dl, VI6_BRU_VIRRPF_COL, bru->bgcolor | vsp1_bru_write(bru, dl, VI6_BRU_VIRRPF_COL, bru->bgcolor |
(0xff << VI6_BRU_VIRRPF_COL_A_SHIFT)); (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 * unit with a NOP operation to make BRU input 1 available as the
* Blend/ROP unit B SRC input. * Blend/ROP unit B SRC input.
*/ */
...@@ -337,7 +342,8 @@ static void bru_configure(struct vsp1_entity *entity, ...@@ -337,7 +342,8 @@ static void bru_configure(struct vsp1_entity *entity,
bool premultiplied = false; bool premultiplied = false;
u32 ctrl = 0; 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 * input for alpha blending. Blend/ROP units corresponding to
* disabled BRU inputs are used in ROP NOP mode to ignore the * disabled BRU inputs are used in ROP NOP mode to ignore the
* SRC input. * SRC input.
...@@ -352,13 +358,15 @@ static void bru_configure(struct vsp1_entity *entity, ...@@ -352,13 +358,15 @@ static void bru_configure(struct vsp1_entity *entity,
| VI6_BRU_CTRL_AROP(VI6_ROP_NOP); | 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. * serve as a background color.
*/ */
if (i == 0) if (i == 0)
ctrl |= VI6_BRU_CTRL_DSTSEL_VRPF; 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 * D in that order. The Blend/ROP unit B SRC is hardwired to the
* ROP unit output, the corresponding register bits must be set * ROP unit output, the corresponding register bits must be set
* to 0. * to 0.
...@@ -368,7 +376,8 @@ static void bru_configure(struct vsp1_entity *entity, ...@@ -368,7 +376,8 @@ static void bru_configure(struct vsp1_entity *entity,
vsp1_bru_write(bru, dl, VI6_BRU_CTRL(i), ctrl); 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 * DSTc = DSTc * (1 - SRCa) + SRCc * SRCa
* DSTa = DSTa * (1 - SRCa) + SRCa * DSTa = DSTa * (1 - SRCa) + SRCa
......
...@@ -240,7 +240,8 @@ static struct vsp1_dl_list *vsp1_dl_list_alloc(struct vsp1_dl_manager *dlm) ...@@ -240,7 +240,8 @@ static struct vsp1_dl_list *vsp1_dl_list_alloc(struct vsp1_dl_manager *dlm)
INIT_LIST_HEAD(&dl->fragments); INIT_LIST_HEAD(&dl->fragments);
dl->dlm = dlm; 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 * and the optional header. Both are allocated together to avoid memory
* fragmentation, with the header located right after the body in * fragmentation, with the header located right after the body in
* memory. * memory.
...@@ -511,7 +512,8 @@ void vsp1_dl_list_commit(struct vsp1_dl_list *dl) ...@@ -511,7 +512,8 @@ void vsp1_dl_list_commit(struct vsp1_dl_list *dl)
goto done; 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 * 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 * registers. In that case mark the update as pending, it will be
* queued up to the hardware by the frame end interrupt handler. * 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) ...@@ -523,7 +525,8 @@ void vsp1_dl_list_commit(struct vsp1_dl_list *dl)
goto done; 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 * The UPD bit will be cleared by the device when the display list is
* processed. * processed.
*/ */
...@@ -547,7 +550,8 @@ void vsp1_dlm_irq_display_start(struct vsp1_dl_manager *dlm) ...@@ -547,7 +550,8 @@ void vsp1_dlm_irq_display_start(struct vsp1_dl_manager *dlm)
{ {
spin_lock(&dlm->lock); 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 * processing by the device. The active display list, if any, won't be
* accessed anymore and can be reused. * accessed anymore and can be reused.
*/ */
...@@ -566,14 +570,16 @@ void vsp1_dlm_irq_frame_end(struct vsp1_dl_manager *dlm) ...@@ -566,14 +570,16 @@ void vsp1_dlm_irq_frame_end(struct vsp1_dl_manager *dlm)
__vsp1_dl_list_put(dlm->active); __vsp1_dl_list_put(dlm->active);
dlm->active = NULL; 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 * perform any operation as there can't be any new display list queued
* in that case. * in that case.
*/ */
if (dlm->mode == VSP1_DL_MODE_HEADER) if (dlm->mode == VSP1_DL_MODE_HEADER)
goto done; 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 * interrupt and occurred after the frame end event and UPD clear but
* before interrupt processing. The hardware hasn't taken the update * before interrupt processing. The hardware hasn't taken the update
* into account yet, we'll thus skip one frame and retry. * 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) ...@@ -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) if (vsp1_read(vsp1, VI6_DL_BODY_SIZE) & VI6_DL_BODY_SIZE_UPD)
goto done; 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. * frame end interrupt. The display list thus becomes active.
*/ */
if (dlm->queued) { if (dlm->queued) {
...@@ -589,7 +596,8 @@ void vsp1_dlm_irq_frame_end(struct vsp1_dl_manager *dlm) ...@@ -589,7 +596,8 @@ void vsp1_dlm_irq_frame_end(struct vsp1_dl_manager *dlm)
dlm->queued = NULL; 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. * list to the hardware if one has been prepared.
*/ */
if (dlm->pending) { if (dlm->pending) {
...@@ -615,7 +623,8 @@ void vsp1_dlm_setup(struct vsp1_device *vsp1) ...@@ -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_DC2 | VI6_DL_CTRL_DC1 | VI6_DL_CTRL_DC0
| VI6_DL_CTRL_DLE; | 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. * Mode, all other pipelines use manual start.
*/ */
if (vsp1->drm) if (vsp1->drm)
......
...@@ -78,7 +78,8 @@ int vsp1_du_setup_lif(struct device *dev, const struct vsp1_du_lif_config *cfg) ...@@ -78,7 +78,8 @@ int vsp1_du_setup_lif(struct device *dev, const struct vsp1_du_lif_config *cfg)
int ret; int ret;
if (!cfg) { 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. * the pipeline and turn the light off.
*/ */
ret = vsp1_pipeline_stop(pipe); ret = vsp1_pipeline_stop(pipe);
...@@ -106,7 +107,8 @@ int vsp1_du_setup_lif(struct device *dev, const struct vsp1_du_lif_config *cfg) ...@@ -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", dev_dbg(vsp1->dev, "%s: configuring LIF with format %ux%u\n",
__func__, cfg->width, cfg->height); __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. * pipeline.
*/ */
memset(&format, 0, sizeof(format)); memset(&format, 0, sizeof(format));
...@@ -175,7 +177,8 @@ int vsp1_du_setup_lif(struct device *dev, const struct vsp1_du_lif_config *cfg) ...@@ -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, __func__, format.format.width, format.format.height,
format.format.code); 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. * requested frame size and media bus code.
*/ */
if (format.format.width != cfg->width || 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) ...@@ -185,7 +188,8 @@ int vsp1_du_setup_lif(struct device *dev, const struct vsp1_du_lif_config *cfg)
return -EPIPE; 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 * the pipeline pointer in all entities, which the s_stream handlers
* will need. We don't start the entities themselves right at this point * 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 * 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, ...@@ -317,7 +321,8 @@ static int vsp1_du_setup_rpf_pipe(struct vsp1_device *vsp1,
const struct v4l2_rect *crop; const struct v4l2_rect *crop;
int ret; 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. * BRU sink pad.
*/ */
crop = &vsp1->drm->inputs[rpf->entity.index].crop; crop = &vsp1->drm->inputs[rpf->entity.index].crop;
...@@ -356,7 +361,8 @@ static int vsp1_du_setup_rpf_pipe(struct vsp1_device *vsp1, ...@@ -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, __func__, sel.r.left, sel.r.top, sel.r.width, sel.r.height,
rpf->entity.index); 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. * conversion if needed.
*/ */
format.pad = RWPF_PAD_SOURCE; format.pad = RWPF_PAD_SOURCE;
...@@ -528,7 +534,8 @@ int vsp1_drm_create_links(struct vsp1_device *vsp1) ...@@ -528,7 +534,8 @@ int vsp1_drm_create_links(struct vsp1_device *vsp1)
unsigned int i; unsigned int i;
int ret; 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. * output to the DU.
*/ */
if (!vsp1->bru || !vsp1->lif) if (!vsp1->bru || !vsp1->lif)
......
...@@ -170,7 +170,8 @@ static int vsp1_uapi_create_links(struct vsp1_device *vsp1) ...@@ -170,7 +170,8 @@ static int vsp1_uapi_create_links(struct vsp1_device *vsp1)
} }
for (i = 0; i < vsp1->info->wpf_count; ++i) { 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. * immutable.
*/ */
struct vsp1_rwpf *wpf = vsp1->wpf[i]; struct vsp1_rwpf *wpf = vsp1->wpf[i];
...@@ -227,7 +228,8 @@ static int vsp1_create_entities(struct vsp1_device *vsp1) ...@@ -227,7 +228,8 @@ static int vsp1_create_entities(struct vsp1_device *vsp1)
media_device_init(mdev); media_device_init(mdev);
vsp1->media_ops.link_setup = vsp1_entity_link_setup; 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 * the pipeline is configured internally by the driver in that case, and
* its configuration can thus be trusted. * its configuration can thus be trusted.
*/ */
...@@ -279,7 +281,8 @@ static int vsp1_create_entities(struct vsp1_device *vsp1) ...@@ -279,7 +281,8 @@ static int vsp1_create_entities(struct vsp1_device *vsp1)
list_add_tail(&vsp1->hst->entity.list_dev, &vsp1->entities); 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 * which case the userspace API is disabled. If the userspace API is
* enabled skip the LIF, even when present. * enabled skip the LIF, even when present.
*/ */
...@@ -391,7 +394,8 @@ static int vsp1_create_entities(struct vsp1_device *vsp1) ...@@ -391,7 +394,8 @@ static int vsp1_create_entities(struct vsp1_device *vsp1)
if (ret < 0) if (ret < 0)
goto done; 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. * the DRM pipeline otherwise.
*/ */
if (vsp1->info->uapi) { if (vsp1->info->uapi) {
......
...@@ -199,7 +199,8 @@ int vsp1_subdev_enum_mbus_code(struct v4l2_subdev *subdev, ...@@ -199,7 +199,8 @@ int vsp1_subdev_enum_mbus_code(struct v4l2_subdev *subdev,
struct v4l2_subdev_pad_config *config; struct v4l2_subdev_pad_config *config;
struct v4l2_mbus_framefmt *format; 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. * is always identical to the source format.
*/ */
if (code->index) if (code->index)
...@@ -263,7 +264,8 @@ int vsp1_subdev_enum_frame_size(struct v4l2_subdev *subdev, ...@@ -263,7 +264,8 @@ int vsp1_subdev_enum_frame_size(struct v4l2_subdev *subdev,
fse->min_height = min_height; fse->min_height = min_height;
fse->max_height = max_height; fse->max_height = max_height;
} else { } 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. * the size on the sink pad.
*/ */
fse->min_width = format->width; fse->min_width = format->width;
...@@ -407,7 +409,8 @@ int vsp1_entity_init(struct vsp1_device *vsp1, struct vsp1_entity *entity, ...@@ -407,7 +409,8 @@ int vsp1_entity_init(struct vsp1_device *vsp1, struct vsp1_entity *entity,
vsp1_entity_init_cfg(subdev, NULL); 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. * rectangles.
*/ */
entity->config = v4l2_subdev_alloc_pad_config(&entity->subdev); entity->config = v4l2_subdev_alloc_pad_config(&entity->subdev);
......
...@@ -84,7 +84,8 @@ static int hsit_set_format(struct v4l2_subdev *subdev, ...@@ -84,7 +84,8 @@ static int hsit_set_format(struct v4l2_subdev *subdev,
format = vsp1_entity_get_pad_format(&hsit->entity, config, fmt->pad); format = vsp1_entity_get_pad_format(&hsit->entity, config, fmt->pad);
if (fmt->pad == HSIT_PAD_SOURCE) { if (fmt->pad == HSIT_PAD_SOURCE) {
/* The HST and HSI output format code and resolution can't be /*
* The HST and HSI output format code and resolution can't be
* modified. * modified.
*/ */
fmt->format = *format; fmt->format = *format;
......
...@@ -84,7 +84,8 @@ static int lif_set_format(struct v4l2_subdev *subdev, ...@@ -84,7 +84,8 @@ static int lif_set_format(struct v4l2_subdev *subdev,
format = vsp1_entity_get_pad_format(&lif->entity, config, fmt->pad); format = vsp1_entity_get_pad_format(&lif->entity, config, fmt->pad);
if (fmt->pad == LIF_PAD_SOURCE) { if (fmt->pad == LIF_PAD_SOURCE) {
/* The LIF source format is always identical to its sink /*
* The LIF source format is always identical to its sink
* format. * format.
*/ */
fmt->format = *format; fmt->format = *format;
...@@ -176,7 +177,8 @@ struct vsp1_lif *vsp1_lif_create(struct vsp1_device *vsp1) ...@@ -176,7 +177,8 @@ struct vsp1_lif *vsp1_lif_create(struct vsp1_device *vsp1)
lif->entity.ops = &lif_entity_ops; lif->entity.ops = &lif_entity_ops;
lif->entity.type = VSP1_ENTITY_LIF; lif->entity.type = VSP1_ENTITY_LIF;
/* The LIF is never exposed to userspace, but media entity registration /*
* The LIF is never exposed to userspace, but media entity registration
* requires a function to be set. Use PROC_VIDEO_PIXEL_FORMATTER just to * requires a function to be set. Use PROC_VIDEO_PIXEL_FORMATTER just to
* avoid triggering a WARN_ON(), the value won't be seen anywhere. * avoid triggering a WARN_ON(), the value won't be seen anywhere.
*/ */
......
...@@ -251,7 +251,8 @@ int vsp1_pipeline_stop(struct vsp1_pipeline *pipe) ...@@ -251,7 +251,8 @@ int vsp1_pipeline_stop(struct vsp1_pipeline *pipe)
int ret; int ret;
if (pipe->lif) { if (pipe->lif) {
/* When using display lists in continuous frame mode the only /*
* When using display lists in continuous frame mode the only
* way to stop the pipeline is to reset the hardware. * way to stop the pipeline is to reset the hardware.
*/ */
ret = vsp1_reset_wpf(pipe->output->entity.vsp1, ret = vsp1_reset_wpf(pipe->output->entity.vsp1,
...@@ -322,7 +323,8 @@ void vsp1_pipeline_propagate_alpha(struct vsp1_pipeline *pipe, ...@@ -322,7 +323,8 @@ void vsp1_pipeline_propagate_alpha(struct vsp1_pipeline *pipe,
if (!pipe->uds) if (!pipe->uds)
return; return;
/* The BRU background color has a fixed alpha value set to 255, the /*
* The BRU background color has a fixed alpha value set to 255, the
* output alpha value is thus always equal to 255. * output alpha value is thus always equal to 255.
*/ */
if (pipe->uds_input->type == VSP1_ENTITY_BRU) if (pipe->uds_input->type == VSP1_ENTITY_BRU)
...@@ -337,7 +339,8 @@ void vsp1_pipelines_suspend(struct vsp1_device *vsp1) ...@@ -337,7 +339,8 @@ void vsp1_pipelines_suspend(struct vsp1_device *vsp1)
unsigned int i; unsigned int i;
int ret; int ret;
/* To avoid increasing the system suspend time needlessly, loop over the /*
* To avoid increasing the system suspend time needlessly, loop over the
* pipelines twice, first to set them all to the stopping state, and * pipelines twice, first to set them all to the stopping state, and
* then to wait for the stop to complete. * then to wait for the stop to complete.
*/ */
......
...@@ -195,7 +195,8 @@ static void rpf_configure(struct vsp1_entity *entity, ...@@ -195,7 +195,8 @@ static void rpf_configure(struct vsp1_entity *entity,
(left << VI6_RPF_LOC_HCOORD_SHIFT) | (left << VI6_RPF_LOC_HCOORD_SHIFT) |
(top << VI6_RPF_LOC_VCOORD_SHIFT)); (top << VI6_RPF_LOC_VCOORD_SHIFT));
/* On Gen2 use the alpha channel (extended to 8 bits) when available or /*
* On Gen2 use the alpha channel (extended to 8 bits) when available or
* a fixed alpha value set through the V4L2_CID_ALPHA_COMPONENT control * a fixed alpha value set through the V4L2_CID_ALPHA_COMPONENT control
* otherwise. * otherwise.
* *
...@@ -225,7 +226,8 @@ static void rpf_configure(struct vsp1_entity *entity, ...@@ -225,7 +226,8 @@ static void rpf_configure(struct vsp1_entity *entity,
u32 mult; u32 mult;
if (fmtinfo->alpha) { if (fmtinfo->alpha) {
/* When the input contains an alpha channel enable the /*
* When the input contains an alpha channel enable the
* alpha multiplier. If the input is premultiplied we * alpha multiplier. If the input is premultiplied we
* need to multiply both the alpha channel and the pixel * need to multiply both the alpha channel and the pixel
* components by the global alpha value to keep them * components by the global alpha value to keep them
...@@ -240,7 +242,8 @@ static void rpf_configure(struct vsp1_entity *entity, ...@@ -240,7 +242,8 @@ static void rpf_configure(struct vsp1_entity *entity,
VI6_RPF_MULT_ALPHA_P_MMD_RATIO : VI6_RPF_MULT_ALPHA_P_MMD_RATIO :
VI6_RPF_MULT_ALPHA_P_MMD_NONE); VI6_RPF_MULT_ALPHA_P_MMD_NONE);
} else { } else {
/* When the input doesn't contain an alpha channel the /*
* When the input doesn't contain an alpha channel the
* global alpha value is applied in the unpacking unit, * global alpha value is applied in the unpacking unit,
* the alpha multiplier isn't needed and must be * the alpha multiplier isn't needed and must be
* disabled. * disabled.
......
...@@ -86,7 +86,8 @@ static int vsp1_rwpf_set_format(struct v4l2_subdev *subdev, ...@@ -86,7 +86,8 @@ static int vsp1_rwpf_set_format(struct v4l2_subdev *subdev,
format = vsp1_entity_get_pad_format(&rwpf->entity, config, fmt->pad); format = vsp1_entity_get_pad_format(&rwpf->entity, config, fmt->pad);
if (fmt->pad == RWPF_PAD_SOURCE) { if (fmt->pad == RWPF_PAD_SOURCE) {
/* The RWPF performs format conversion but can't scale, only the /*
* The RWPF performs format conversion but can't scale, only the
* format code can be changed on the source pad. * format code can be changed on the source pad.
*/ */
format->code = fmt->format.code; format->code = fmt->format.code;
...@@ -205,7 +206,8 @@ static int vsp1_rwpf_set_selection(struct v4l2_subdev *subdev, ...@@ -205,7 +206,8 @@ static int vsp1_rwpf_set_selection(struct v4l2_subdev *subdev,
format = vsp1_entity_get_pad_format(&rwpf->entity, config, format = vsp1_entity_get_pad_format(&rwpf->entity, config,
RWPF_PAD_SINK); RWPF_PAD_SINK);
/* Restrict the crop rectangle coordinates to multiples of 2 to avoid /*
* Restrict the crop rectangle coordinates to multiples of 2 to avoid
* shifting the color plane. * shifting the color plane.
*/ */
if (format->code == MEDIA_BUS_FMT_AYUV8_1X32) { if (format->code == MEDIA_BUS_FMT_AYUV8_1X32) {
......
...@@ -191,7 +191,8 @@ static void sru_try_format(struct vsp1_sru *sru, ...@@ -191,7 +191,8 @@ static void sru_try_format(struct vsp1_sru *sru,
SRU_PAD_SINK); SRU_PAD_SINK);
fmt->code = format->code; fmt->code = format->code;
/* We can upscale by 2 in both direction, but not independently. /*
* We can upscale by 2 in both direction, but not independently.
* Compare the input and output rectangles areas (avoiding * Compare the input and output rectangles areas (avoiding
* integer overflows on the output): if the requested output * integer overflows on the output): if the requested output
* area is larger than 1.5^2 the input area upscale by two, * area is larger than 1.5^2 the input area upscale by two,
......
...@@ -293,7 +293,8 @@ static void uds_configure(struct vsp1_entity *entity, ...@@ -293,7 +293,8 @@ static void uds_configure(struct vsp1_entity *entity,
dev_dbg(uds->entity.vsp1->dev, "hscale %u vscale %u\n", hscale, vscale); dev_dbg(uds->entity.vsp1->dev, "hscale %u vscale %u\n", hscale, vscale);
/* Multi-tap scaling can't be enabled along with alpha scaling when /*
* Multi-tap scaling can't be enabled along with alpha scaling when
* scaling down with a factor lower than or equal to 1/2 in either * scaling down with a factor lower than or equal to 1/2 in either
* direction. * direction.
*/ */
......
...@@ -103,7 +103,8 @@ static int __vsp1_video_try_format(struct vsp1_video *video, ...@@ -103,7 +103,8 @@ static int __vsp1_video_try_format(struct vsp1_video *video,
unsigned int height = pix->height; unsigned int height = pix->height;
unsigned int i; unsigned int i;
/* Backward compatibility: replace deprecated RGB formats by their XRGB /*
* Backward compatibility: replace deprecated RGB formats by their XRGB
* equivalent. This selects the format older userspace applications want * equivalent. This selects the format older userspace applications want
* while still exposing the new format. * while still exposing the new format.
*/ */
...@@ -114,7 +115,8 @@ static int __vsp1_video_try_format(struct vsp1_video *video, ...@@ -114,7 +115,8 @@ static int __vsp1_video_try_format(struct vsp1_video *video,
} }
} }
/* Retrieve format information and select the default format if the /*
* Retrieve format information and select the default format if the
* requested format isn't supported. * requested format isn't supported.
*/ */
info = vsp1_get_format_info(video->vsp1, pix->pixelformat); info = vsp1_get_format_info(video->vsp1, pix->pixelformat);
...@@ -140,7 +142,8 @@ static int __vsp1_video_try_format(struct vsp1_video *video, ...@@ -140,7 +142,8 @@ static int __vsp1_video_try_format(struct vsp1_video *video,
pix->height = clamp(height, VSP1_VIDEO_MIN_HEIGHT, pix->height = clamp(height, VSP1_VIDEO_MIN_HEIGHT,
VSP1_VIDEO_MAX_HEIGHT); VSP1_VIDEO_MAX_HEIGHT);
/* Compute and clamp the stride and image size. While not documented in /*
* Compute and clamp the stride and image size. While not documented in
* the datasheet, strides not aligned to a multiple of 128 bytes result * the datasheet, strides not aligned to a multiple of 128 bytes result
* in image corruption. * in image corruption.
*/ */
...@@ -449,7 +452,8 @@ static void vsp1_video_pipeline_frame_end(struct vsp1_pipeline *pipe) ...@@ -449,7 +452,8 @@ static void vsp1_video_pipeline_frame_end(struct vsp1_pipeline *pipe)
state = pipe->state; state = pipe->state;
pipe->state = VSP1_PIPELINE_STOPPED; pipe->state = VSP1_PIPELINE_STOPPED;
/* If a stop has been requested, mark the pipeline as stopped and /*
* If a stop has been requested, mark the pipeline as stopped and
* return. Otherwise restart the pipeline if ready. * return. Otherwise restart the pipeline if ready.
*/ */
if (state == VSP1_PIPELINE_STOPPING) if (state == VSP1_PIPELINE_STOPPING)
...@@ -491,7 +495,8 @@ static int vsp1_video_pipeline_build_branch(struct vsp1_pipeline *pipe, ...@@ -491,7 +495,8 @@ static int vsp1_video_pipeline_build_branch(struct vsp1_pipeline *pipe,
entity = to_vsp1_entity( entity = to_vsp1_entity(
media_entity_to_v4l2_subdev(pad->entity)); media_entity_to_v4l2_subdev(pad->entity));
/* A BRU is present in the pipeline, store the BRU input pad /*
* A BRU is present in the pipeline, store the BRU input pad
* number in the input RPF for use when configuring the RPF. * number in the input RPF for use when configuring the RPF.
*/ */
if (entity->type == VSP1_ENTITY_BRU) { if (entity->type == VSP1_ENTITY_BRU) {
...@@ -526,7 +531,8 @@ static int vsp1_video_pipeline_build_branch(struct vsp1_pipeline *pipe, ...@@ -526,7 +531,8 @@ static int vsp1_video_pipeline_build_branch(struct vsp1_pipeline *pipe,
: &input->entity; : &input->entity;
} }
/* Follow the source link. The link setup operations ensure /*
* Follow the source link. The link setup operations ensure
* that the output fan-out can't be more than one, there is thus * that the output fan-out can't be more than one, there is thus
* no need to verify here that only a single source link is * no need to verify here that only a single source link is
* activated. * activated.
...@@ -596,7 +602,8 @@ static int vsp1_video_pipeline_build(struct vsp1_pipeline *pipe, ...@@ -596,7 +602,8 @@ static int vsp1_video_pipeline_build(struct vsp1_pipeline *pipe,
if (pipe->num_inputs == 0 || !pipe->output) if (pipe->num_inputs == 0 || !pipe->output)
return -EPIPE; return -EPIPE;
/* Follow links downstream for each input and make sure the graph /*
* Follow links downstream for each input and make sure the graph
* contains no loop and that all branches end at the output WPF. * contains no loop and that all branches end at the output WPF.
*/ */
for (i = 0; i < video->vsp1->info->rpf_count; ++i) { for (i = 0; i < video->vsp1->info->rpf_count; ++i) {
...@@ -627,7 +634,8 @@ static struct vsp1_pipeline *vsp1_video_pipeline_get(struct vsp1_video *video) ...@@ -627,7 +634,8 @@ static struct vsp1_pipeline *vsp1_video_pipeline_get(struct vsp1_video *video)
struct vsp1_pipeline *pipe; struct vsp1_pipeline *pipe;
int ret; int ret;
/* Get a pipeline object for the video node. If a pipeline has already /*
* Get a pipeline object for the video node. If a pipeline has already
* been allocated just increment its reference count and return it. * been allocated just increment its reference count and return it.
* Otherwise allocate a new pipeline and initialize it, it will be freed * Otherwise allocate a new pipeline and initialize it, it will be freed
* when the last reference is released. * when the last reference is released.
...@@ -767,7 +775,8 @@ static int vsp1_video_setup_pipeline(struct vsp1_pipeline *pipe) ...@@ -767,7 +775,8 @@ static int vsp1_video_setup_pipeline(struct vsp1_pipeline *pipe)
if (pipe->uds) { if (pipe->uds) {
struct vsp1_uds *uds = to_uds(&pipe->uds->subdev); struct vsp1_uds *uds = to_uds(&pipe->uds->subdev);
/* If a BRU is present in the pipeline before the UDS, the alpha /*
* If a BRU is present in the pipeline before the UDS, the alpha
* component doesn't need to be scaled as the BRU output alpha * component doesn't need to be scaled as the BRU output alpha
* value is fixed to 255. Otherwise we need to scale the alpha * value is fixed to 255. Otherwise we need to scale the alpha
* component only when available at the input RPF. * component only when available at the input RPF.
...@@ -981,7 +990,8 @@ vsp1_video_streamon(struct file *file, void *fh, enum v4l2_buf_type type) ...@@ -981,7 +990,8 @@ vsp1_video_streamon(struct file *file, void *fh, enum v4l2_buf_type type)
if (video->queue.owner && video->queue.owner != file->private_data) if (video->queue.owner && video->queue.owner != file->private_data)
return -EBUSY; return -EBUSY;
/* Get a pipeline for the video node and start streaming on it. No link /*
* Get a pipeline for the video node and start streaming on it. No link
* touching an entity in the pipeline can be activated or deactivated * touching an entity in the pipeline can be activated or deactivated
* once streaming is started. * once streaming is started.
*/ */
...@@ -1001,7 +1011,8 @@ vsp1_video_streamon(struct file *file, void *fh, enum v4l2_buf_type type) ...@@ -1001,7 +1011,8 @@ vsp1_video_streamon(struct file *file, void *fh, enum v4l2_buf_type type)
mutex_unlock(&mdev->graph_mutex); mutex_unlock(&mdev->graph_mutex);
/* Verify that the configured format matches the output of the connected /*
* Verify that the configured format matches the output of the connected
* subdev. * subdev.
*/ */
ret = vsp1_video_verify_format(video); ret = vsp1_video_verify_format(video);
......
...@@ -88,12 +88,14 @@ static int wpf_init_controls(struct vsp1_rwpf *wpf) ...@@ -88,12 +88,14 @@ static int wpf_init_controls(struct vsp1_rwpf *wpf)
/* Only WPF0 supports flipping. */ /* Only WPF0 supports flipping. */
num_flip_ctrls = 0; num_flip_ctrls = 0;
} else if (vsp1->info->features & VSP1_HAS_WPF_HFLIP) { } else if (vsp1->info->features & VSP1_HAS_WPF_HFLIP) {
/* When horizontal flip is supported the WPF implements two /*
* When horizontal flip is supported the WPF implements two
* controls (horizontal flip and vertical flip). * controls (horizontal flip and vertical flip).
*/ */
num_flip_ctrls = 2; num_flip_ctrls = 2;
} else if (vsp1->info->features & VSP1_HAS_WPF_VFLIP) { } else if (vsp1->info->features & VSP1_HAS_WPF_VFLIP) {
/* When only vertical flip is supported the WPF implements a /*
* When only vertical flip is supported the WPF implements a
* single control (vertical flip). * single control (vertical flip).
*/ */
num_flip_ctrls = 1; num_flip_ctrls = 1;
...@@ -139,7 +141,8 @@ static int wpf_s_stream(struct v4l2_subdev *subdev, int enable) ...@@ -139,7 +141,8 @@ static int wpf_s_stream(struct v4l2_subdev *subdev, int enable)
if (enable) if (enable)
return 0; return 0;
/* Write to registers directly when stopping the stream as there will be /*
* Write to registers directly when stopping the stream as there will be
* no pipeline run to apply the display list. * no pipeline run to apply the display list.
*/ */
vsp1_write(vsp1, VI6_WPF_IRQ_ENB(wpf->entity.index), 0); vsp1_write(vsp1, VI6_WPF_IRQ_ENB(wpf->entity.index), 0);
...@@ -336,7 +339,8 @@ static void wpf_configure(struct vsp1_entity *entity, ...@@ -336,7 +339,8 @@ static void wpf_configure(struct vsp1_entity *entity,
vsp1_dl_list_write(dl, VI6_WPF_WRBCK_CTRL, 0); vsp1_dl_list_write(dl, VI6_WPF_WRBCK_CTRL, 0);
/* Sources. If the pipeline has a single input and BRU is not used, /*
* Sources. If the pipeline has a single input and BRU is not used,
* configure it as the master layer. Otherwise configure all * configure it as the master layer. Otherwise configure all
* inputs as sub-layers and select the virtual RPF as the master * inputs as sub-layers and select the virtual RPF as the master
* layer. * layer.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment