mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Tomi Valkeinen <tomi.valkeinen+renesas@ideasonboard.com>
To: "Niklas Söderlund" <niklas.soderlund@ragnatech.se>,
	"Mauro Carvalho Chehab" <mchehab@kernel.org>,
	"Sakari Ailus" <sakari.ailus@linux.intel.com>
Cc: linux-media@vger.kernel.org, linux-renesas-soc@vger.kernel.org,
	linux-kernel@vger.kernel.org,
	"Niklas Söderlund" <niklas.soderlund+renesas@ragnatech.se>,
	"Mauro Carvalho Chehab" <mchehab+huawei@kernel.org>,
	"Laurent Pinchart" <laurent.pinchart@ideasonboard.com>,
	"Jacopo Mondi" <jacopo.mondi@ideasonboard.com>,
	"Tomi Valkeinen" <tomi.valkeinen+renesas@ideasonboard.com>
Subject: [PATCH v2 03/15] media: rcar-isp: Move {enable|disable}_streams() calls
Date: Wed, 26 Mar 2025 13:09:25 +0200	[thread overview]
Message-ID: <20250326-rcar-streams-v2-3-d0d7002c641f@ideasonboard.com> (raw)
In-Reply-To: <20250326-rcar-streams-v2-0-d0d7002c641f@ideasonboard.com>

With multiple streams the operation to enable the ISP hardware and to
call {enable|disable}_streams() on upstream subdev will need to be
handled separately.

Prepare for that by moving {enable|disable}_streams() calls out from
risp_start() and risp_stop().

Signed-off-by: Tomi Valkeinen <tomi.valkeinen+renesas@ideasonboard.com>
---
 drivers/media/platform/renesas/rcar-isp.c | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/drivers/media/platform/renesas/rcar-isp.c b/drivers/media/platform/renesas/rcar-isp.c
index 46534a479201..8e222c9ec604 100644
--- a/drivers/media/platform/renesas/rcar-isp.c
+++ b/drivers/media/platform/renesas/rcar-isp.c
@@ -268,18 +268,11 @@ static int risp_start(struct rcar_isp *isp, struct v4l2_subdev_state *state)
 	/* Start ISP. */
 	risp_write(isp, ISPSTART_REG, ISPSTART_START);
 
-	ret = v4l2_subdev_enable_streams(isp->remote, isp->remote_pad,
-					 BIT_ULL(0));
-	if (ret)
-		risp_power_off(isp);
-
-	return ret;
+	return 0;
 }
 
 static void risp_stop(struct rcar_isp *isp)
 {
-	v4l2_subdev_disable_streams(isp->remote, isp->remote_pad, BIT_ULL(0));
-
 	/* Stop ISP. */
 	risp_write(isp, ISPSTART_REG, ISPSTART_STOP);
 
@@ -305,6 +298,13 @@ static int risp_enable_streams(struct v4l2_subdev *sd,
 			return ret;
 	}
 
+	ret = v4l2_subdev_enable_streams(isp->remote, isp->remote_pad,
+					 BIT_ULL(0));
+	if (ret) {
+		risp_stop(isp);
+		return ret;
+	}
+
 	isp->stream_count += 1;
 
 	return ret;
@@ -322,6 +322,8 @@ static int risp_disable_streams(struct v4l2_subdev *sd,
 	if (!isp->remote)
 		return -ENODEV;
 
+	v4l2_subdev_disable_streams(isp->remote, isp->remote_pad, BIT_ULL(0));
+
 	if (isp->stream_count == 1)
 		risp_stop(isp);
 

-- 
2.43.0


  parent reply	other threads:[~2025-03-26 11:10 UTC|newest]

Thread overview: 16+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2025-03-26 11:09 [PATCH v2 00/15] media: rcar: Streams support Tomi Valkeinen
2025-03-26 11:09 ` [PATCH v2 01/15] media: rcar-csi2: Use the pad version of v4l2_get_link_freq() Tomi Valkeinen
2025-03-26 11:09 ` [PATCH v2 02/15] media: rcar-isp: Improve ISPPROCMODE_DT_PROC_MODE_VC Tomi Valkeinen
2025-03-26 11:09 ` Tomi Valkeinen [this message]
2025-03-26 11:09 ` [PATCH v2 04/15] media: rcar-csi2: Move {enable|disable}_streams() calls Tomi Valkeinen
2025-03-26 11:09 ` [PATCH v2 05/15] media: rcar-csi2: Move rcar2_calc_mbps() Tomi Valkeinen
2025-03-26 11:09 ` [PATCH v2 06/15] media: rcar-csi2: Simplify rcsi2_calc_mbps() Tomi Valkeinen
2025-03-26 11:09 ` [PATCH v2 07/15] media: rcar-csi2: Optimize rcsi2_calc_mbps() Tomi Valkeinen
2025-03-26 11:09 ` [PATCH v2 08/15] media: rcar-csi2: Switch to Streams API Tomi Valkeinen
2025-03-26 11:09 ` [PATCH v2 09/15] media: rcar-isp: " Tomi Valkeinen
2025-03-26 11:09 ` [PATCH v2 10/15] media: rcar-csi2: Add .get_frame_desc op Tomi Valkeinen
2025-03-26 11:09 ` [PATCH v2 11/15] media: rcar-isp: Call get_frame_desc to find out VC & DT Tomi Valkeinen
2025-03-26 11:09 ` [PATCH v2 12/15] media: rcar-csi2: Add more stream support to rcsi2_calc_mbps() Tomi Valkeinen
2025-03-26 11:09 ` [PATCH v2 13/15] media: rcar-csi2: Call get_frame_desc to find out VC & DT (Gen3) Tomi Valkeinen
2025-03-26 11:09 ` [PATCH v2 14/15] media: rcar-csi2: Add full streams support Tomi Valkeinen
2025-03-26 11:09 ` [PATCH v2 15/15] media: rcar-isp: " Tomi Valkeinen

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=20250326-rcar-streams-v2-3-d0d7002c641f@ideasonboard.com \
    --to=tomi.valkeinen+renesas@ideasonboard.com \
    --cc=jacopo.mondi@ideasonboard.com \
    --cc=laurent.pinchart@ideasonboard.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-media@vger.kernel.org \
    --cc=linux-renesas-soc@vger.kernel.org \
    --cc=mchehab+huawei@kernel.org \
    --cc=mchehab@kernel.org \
    --cc=niklas.soderlund+renesas@ragnatech.se \
    --cc=niklas.soderlund@ragnatech.se \
    --cc=sakari.ailus@linux.intel.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®