Commit 168c05a3 authored by Kieran Bingham's avatar Kieran Bingham Committed by Mauro Carvalho Chehab

media: vsp1: Simplify DRM UIF handling

In commit 6732f313 ("media: v4l: vsp1: Fix uif null pointer access")
the handling of the UIF was over complicated, and the patch applied
before review.

Simplify it to keep the conditionals small.
Signed-off-by: default avatarKieran Bingham <kieran.bingham+renesas@ideasonboard.com>
Reviewed-by: default avatarBiju Das <biju.das.jz@bp.renesas.com>
Signed-off-by: default avatarLaurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+huawei@kernel.org>
parent e73396fe
...@@ -455,6 +455,10 @@ static int vsp1_du_pipeline_setup_inputs(struct vsp1_device *vsp1, ...@@ -455,6 +455,10 @@ static int vsp1_du_pipeline_setup_inputs(struct vsp1_device *vsp1,
dev_err(vsp1->dev, "%s: failed to setup UIF after %s\n", dev_err(vsp1->dev, "%s: failed to setup UIF after %s\n",
__func__, BRX_NAME(pipe->brx)); __func__, BRX_NAME(pipe->brx));
/* If the DRM pipe does not have a UIF there is nothing we can update. */
if (!drm_pipe->uif)
return 0;
/* /*
* If the UIF is not in use schedule it for removal by setting its pipe * If the UIF is not in use schedule it for removal by setting its pipe
* pointer to NULL, vsp1_du_pipeline_configure() will remove it from the * pointer to NULL, vsp1_du_pipeline_configure() will remove it from the
...@@ -462,9 +466,9 @@ static int vsp1_du_pipeline_setup_inputs(struct vsp1_device *vsp1, ...@@ -462,9 +466,9 @@ static int vsp1_du_pipeline_setup_inputs(struct vsp1_device *vsp1,
* make sure it is present in the pipeline's list of entities if it * make sure it is present in the pipeline's list of entities if it
* wasn't already. * wasn't already.
*/ */
if (drm_pipe->uif && !use_uif) { if (!use_uif) {
drm_pipe->uif->pipe = NULL; drm_pipe->uif->pipe = NULL;
} else if (drm_pipe->uif && !drm_pipe->uif->pipe) { } else if (!drm_pipe->uif->pipe) {
drm_pipe->uif->pipe = pipe; drm_pipe->uif->pipe = pipe;
list_add_tail(&drm_pipe->uif->list_pipe, &pipe->entities); list_add_tail(&drm_pipe->uif->list_pipe, &pipe->entities);
} }
......
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