All of lore.kernel.org
 help / color / mirror / Atom feed
From: Biju Das <biju.das.jz@bp.renesas.com>
To: cip-dev@lists.cip-project.org,
	Nobuhiro Iwamatsu <nobuhiro1.iwamatsu@toshiba.co.jp>,
	Pavel Machek <pavel@denx.de>
Cc: Biju Das <biju.das.jz@bp.renesas.com>,
	Lad Prabhakar <prabhakar.mahadev-lad.rj@bp.renesas.com>
Subject: [PATCH 5.10.y-cip 05/18] media: vsp1: Simplify DRM UIF handling
Date: Thu,  7 Dec 2023 13:46:44 +0000	[thread overview]
Message-ID: <20231207134657.371420-6-biju.das.jz@bp.renesas.com> (raw)
In-Reply-To: <20231207134657.371420-1-biju.das.jz@bp.renesas.com>

From: Kieran Bingham <kieran.bingham+renesas@ideasonboard.com>

commit 168c05a3e6ac4f575298abbf9a6eef7c1b024f70 upstream.

In commit 6732f3139380 ("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: Kieran Bingham <kieran.bingham+renesas@ideasonboard.com>
Reviewed-by: Biju Das <biju.das.jz@bp.renesas.com>
Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
Signed-off-by: Biju Das <biju.das.jz@bp.renesas.com>
---
 drivers/media/platform/vsp1/vsp1_drm.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/drivers/media/platform/vsp1/vsp1_drm.c b/drivers/media/platform/vsp1/vsp1_drm.c
index 06f74d410973..0c2507dc03d6 100644
--- a/drivers/media/platform/vsp1/vsp1_drm.c
+++ b/drivers/media/platform/vsp1/vsp1_drm.c
@@ -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",
 			__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
 	 * 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,
 	 * make sure it is present in the pipeline's list of entities if it
 	 * wasn't already.
 	 */
-	if (drm_pipe->uif && !use_uif) {
+	if (!use_uif) {
 		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;
 		list_add_tail(&drm_pipe->uif->list_pipe, &pipe->entities);
 	}
-- 
2.25.1



  parent reply	other threads:[~2023-12-07 13:47 UTC|newest]

Thread overview: 22+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-12-07 13:46 [PATCH 5.10.y-cip 00/18] Add VSPD/FCPVD support Biju Das
2023-12-07 13:46 ` [PATCH 5.10.y-cip 01/18] device property: Add const qualifier to device_get_match_data() parameter Biju Das
2023-12-07 13:46 ` [PATCH 5.10.y-cip 02/18] media: vsp1: use pm_runtime_resume_and_get() Biju Das
2023-12-07 13:46 ` [PATCH 5.10.y-cip 03/18] media: vsp1: Make use of the helper function devm_platform_ioremap_resource() Biju Das
2023-12-07 13:46 ` [PATCH 5.10.y-cip 04/18] media: vsp1: Fix WPF macro names Biju Das
2023-12-07 13:46 ` Biju Das [this message]
2023-12-07 13:46 ` [PATCH 5.10.y-cip 06/18] media: vsp1: Use platform_get_irq() to get the interrupt Biju Das
2023-12-07 13:46 ` [PATCH 5.10.y-cip 07/18] media: vsp1: mask interrupts before enabling Biju Das
2023-12-07 13:46 ` [PATCH 5.10.y-cip 08/18] media: renesas: vsp1: Add support to deassert/assert reset line Biju Das
2023-12-07 13:46 ` [PATCH 5.10.y-cip 09/18] media: renesas: vsp1: Add support for VSP software version Biju Das
2023-12-07 13:46 ` [PATCH 5.10.y-cip 10/18] media: vsp1: Use BIT macro for feature identification Biju Das
2023-12-07 13:46 ` [PATCH 5.10.y-cip 11/18] media: renesas: vsp1: Add VSP1_HAS_NON_ZERO_LBA feature bit Biju Das
2023-12-07 13:46 ` [PATCH 5.10.y-cip 12/18] media: dt-bindings: media: renesas,vsp1: Document RZ/G2L VSPD bindings Biju Das
2023-12-07 13:46 ` [PATCH 5.10.y-cip 13/18] media: dt-bindings: media: renesas,vsp1: Document RZ/V2L " Biju Das
2023-12-07 13:46 ` [PATCH 5.10.y-cip 14/18] media: renesas: vsp1: Add support for RZ/G2L VSPD Biju Das
2023-12-07 13:46 ` [PATCH 5.10.y-cip 15/18] arm64: dts: renesas: r9a07g044: Add fcpvd node Biju Das
2023-12-07 13:46 ` [PATCH 5.10.y-cip 16/18] arm64: dts: renesas: r9a07g044: Add vspd node Biju Das
2023-12-07 13:46 ` [PATCH 5.10.y-cip 17/18] arm64: dts: renesas: r9a07g054: Add fcpvd node Biju Das
2023-12-07 13:46 ` [PATCH 5.10.y-cip 18/18] arm64: dts: renesas: r9a07g054: Add vspd node Biju Das
2023-12-07 19:10 ` [PATCH 5.10.y-cip 00/18] Add VSPD/FCPVD support Pavel Machek
2023-12-07 19:18   ` Biju Das
2023-12-08 13:14 ` Pavel Machek

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20231207134657.371420-6-biju.das.jz@bp.renesas.com \
    --to=biju.das.jz@bp.renesas.com \
    --cc=cip-dev@lists.cip-project.org \
    --cc=nobuhiro1.iwamatsu@toshiba.co.jp \
    --cc=pavel@denx.de \
    --cc=prabhakar.mahadev-lad.rj@bp.renesas.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.