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 05/15] media: rcar-csi2: Move rcar2_calc_mbps()
Date: Wed, 26 Mar 2025 13:09:27 +0200 [thread overview]
Message-ID: <20250326-rcar-streams-v2-5-d0d7002c641f@ideasonboard.com> (raw)
In-Reply-To: <20250326-rcar-streams-v2-0-d0d7002c641f@ideasonboard.com>
Move the function so that it can call rcsi2_get_active_lanes() in the
following patch.
Signed-off-by: Tomi Valkeinen <tomi.valkeinen+renesas@ideasonboard.com>
---
drivers/media/platform/renesas/rcar-csi2.c | 66 +++++++++++++++---------------
1 file changed, 33 insertions(+), 33 deletions(-)
diff --git a/drivers/media/platform/renesas/rcar-csi2.c b/drivers/media/platform/renesas/rcar-csi2.c
index 698eb0e60f32..8aca35096408 100644
--- a/drivers/media/platform/renesas/rcar-csi2.c
+++ b/drivers/media/platform/renesas/rcar-csi2.c
@@ -951,39 +951,6 @@ static int rcsi2_set_phypll(struct rcar_csi2 *priv, unsigned int mbps)
return 0;
}
-static int rcsi2_calc_mbps(struct rcar_csi2 *priv, unsigned int bpp,
- unsigned int lanes)
-{
- struct media_pad *remote_pad;
- struct v4l2_subdev *source;
- s64 freq;
- u64 mbps;
-
- if (!priv->remote)
- return -ENODEV;
-
- source = priv->remote;
- remote_pad = &source->entity.pads[priv->remote_pad];
-
- freq = v4l2_get_link_freq(remote_pad, bpp, 2 * lanes);
- if (freq < 0) {
- int ret = (int)freq;
-
- dev_err(priv->dev, "failed to get link freq for %s: %d\n",
- source->name, ret);
-
- return ret;
- }
-
- mbps = div_u64(freq * 2, MEGA);
-
- /* Adjust for C-PHY, divide by 2.8. */
- if (priv->cphy)
- mbps = div_u64(mbps * 5, 14);
-
- return mbps;
-}
-
static int rcsi2_get_active_lanes(struct rcar_csi2 *priv,
unsigned int *lanes)
{
@@ -1031,6 +998,39 @@ static int rcsi2_get_active_lanes(struct rcar_csi2 *priv,
return 0;
}
+static int rcsi2_calc_mbps(struct rcar_csi2 *priv, unsigned int bpp,
+ unsigned int lanes)
+{
+ struct media_pad *remote_pad;
+ struct v4l2_subdev *source;
+ s64 freq;
+ u64 mbps;
+
+ if (!priv->remote)
+ return -ENODEV;
+
+ source = priv->remote;
+ remote_pad = &source->entity.pads[priv->remote_pad];
+
+ freq = v4l2_get_link_freq(remote_pad, bpp, 2 * lanes);
+ if (freq < 0) {
+ int ret = (int)freq;
+
+ dev_err(priv->dev, "failed to get link freq for %s: %d\n",
+ source->name, ret);
+
+ return ret;
+ }
+
+ mbps = div_u64(freq * 2, MEGA);
+
+ /* Adjust for C-PHY, divide by 2.8. */
+ if (priv->cphy)
+ mbps = div_u64(mbps * 5, 14);
+
+ return mbps;
+}
+
static int rcsi2_start_receiver_gen3(struct rcar_csi2 *priv,
struct v4l2_subdev_state *state)
{
--
2.43.0
next prev 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 ` [PATCH v2 03/15] media: rcar-isp: Move {enable|disable}_streams() calls Tomi Valkeinen
2025-03-26 11:09 ` [PATCH v2 04/15] media: rcar-csi2: " Tomi Valkeinen
2025-03-26 11:09 ` Tomi Valkeinen [this message]
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-5-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®