* [PATCH] media: nxp: imx8-isi: Drop unused argument to mxc_isi_channel_chain()
@ 2025-08-13 22:55 Laurent Pinchart
2025-08-14 18:52 ` Frank Li
0 siblings, 1 reply; 2+ messages in thread
From: Laurent Pinchart @ 2025-08-13 22:55 UTC (permalink / raw)
To: linux-media
Cc: Shawn Guo, Sascha Hauer, Pengutronix Kernel Team, Fabio Estevam,
Richard Leitner, imx
The bypass argument to the mxc_isi_channel_chain() function is unused.
Drop it.
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
---
drivers/media/platform/nxp/imx8-isi/imx8-isi-core.h | 2 +-
drivers/media/platform/nxp/imx8-isi/imx8-isi-hw.c | 2 +-
drivers/media/platform/nxp/imx8-isi/imx8-isi-m2m.c | 11 +++++------
drivers/media/platform/nxp/imx8-isi/imx8-isi-pipe.c | 2 +-
4 files changed, 8 insertions(+), 9 deletions(-)
diff --git a/drivers/media/platform/nxp/imx8-isi/imx8-isi-core.h b/drivers/media/platform/nxp/imx8-isi/imx8-isi-core.h
index d86f5ede0c0e..5789e54f9428 100644
--- a/drivers/media/platform/nxp/imx8-isi/imx8-isi-core.h
+++ b/drivers/media/platform/nxp/imx8-isi/imx8-isi-core.h
@@ -361,7 +361,7 @@ void mxc_isi_channel_get(struct mxc_isi_pipe *pipe);
void mxc_isi_channel_put(struct mxc_isi_pipe *pipe);
void mxc_isi_channel_enable(struct mxc_isi_pipe *pipe);
void mxc_isi_channel_disable(struct mxc_isi_pipe *pipe);
-int mxc_isi_channel_chain(struct mxc_isi_pipe *pipe, bool bypass);
+int mxc_isi_channel_chain(struct mxc_isi_pipe *pipe);
void mxc_isi_channel_unchain(struct mxc_isi_pipe *pipe);
void mxc_isi_channel_config(struct mxc_isi_pipe *pipe,
diff --git a/drivers/media/platform/nxp/imx8-isi/imx8-isi-hw.c b/drivers/media/platform/nxp/imx8-isi/imx8-isi-hw.c
index 5623914f95e6..9225a7ac1c3e 100644
--- a/drivers/media/platform/nxp/imx8-isi/imx8-isi-hw.c
+++ b/drivers/media/platform/nxp/imx8-isi/imx8-isi-hw.c
@@ -587,7 +587,7 @@ void mxc_isi_channel_release(struct mxc_isi_pipe *pipe)
*
* TODO: Support secondary line buffer for downscaling YUV420 images.
*/
-int mxc_isi_channel_chain(struct mxc_isi_pipe *pipe, bool bypass)
+int mxc_isi_channel_chain(struct mxc_isi_pipe *pipe)
{
/* Channel chaining requires both line and output buffer. */
const u8 resources = MXC_ISI_CHANNEL_RES_OUTPUT_BUF
diff --git a/drivers/media/platform/nxp/imx8-isi/imx8-isi-m2m.c b/drivers/media/platform/nxp/imx8-isi/imx8-isi-m2m.c
index 5501214cc6c0..e36781c5522e 100644
--- a/drivers/media/platform/nxp/imx8-isi/imx8-isi-m2m.c
+++ b/drivers/media/platform/nxp/imx8-isi/imx8-isi-m2m.c
@@ -491,7 +491,6 @@ static int mxc_isi_m2m_streamon(struct file *file, void *fh,
const struct mxc_isi_format_info *cap_info = ctx->queues.cap.info;
const struct mxc_isi_format_info *out_info = ctx->queues.out.info;
struct mxc_isi_m2m *m2m = ctx->m2m;
- bool bypass;
int ret;
if (q->streaming)
@@ -504,15 +503,15 @@ static int mxc_isi_m2m_streamon(struct file *file, void *fh,
goto unlock;
}
- bypass = cap_pix->width == out_pix->width &&
- cap_pix->height == out_pix->height &&
- cap_info->encoding == out_info->encoding;
-
/*
* Acquire the pipe and initialize the channel with the first user of
* the M2M device.
*/
if (m2m->usage_count == 0) {
+ bool bypass = cap_pix->width == out_pix->width &&
+ cap_pix->height == out_pix->height &&
+ cap_info->encoding == out_info->encoding;
+
ret = mxc_isi_channel_acquire(m2m->pipe,
&mxc_isi_m2m_frame_write_done,
bypass);
@@ -529,7 +528,7 @@ static int mxc_isi_m2m_streamon(struct file *file, void *fh,
* buffer chaining.
*/
if (!ctx->chained && out_pix->width > MXC_ISI_MAX_WIDTH_UNCHAINED) {
- ret = mxc_isi_channel_chain(m2m->pipe, bypass);
+ ret = mxc_isi_channel_chain(m2m->pipe);
if (ret)
goto deinit;
diff --git a/drivers/media/platform/nxp/imx8-isi/imx8-isi-pipe.c b/drivers/media/platform/nxp/imx8-isi/imx8-isi-pipe.c
index d76eb58deb09..a41c51dd9ce0 100644
--- a/drivers/media/platform/nxp/imx8-isi/imx8-isi-pipe.c
+++ b/drivers/media/platform/nxp/imx8-isi/imx8-isi-pipe.c
@@ -855,7 +855,7 @@ int mxc_isi_pipe_acquire(struct mxc_isi_pipe *pipe,
/* Chain the channel if needed for wide resolutions. */
if (sink_fmt->width > MXC_ISI_MAX_WIDTH_UNCHAINED) {
- ret = mxc_isi_channel_chain(pipe, bypass);
+ ret = mxc_isi_channel_chain(pipe);
if (ret)
mxc_isi_channel_release(pipe);
}
base-commit: 078f1a7eb48eef9b3cb78bcd2254356f3a332358
--
Regards,
Laurent Pinchart
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] media: nxp: imx8-isi: Drop unused argument to mxc_isi_channel_chain()
2025-08-13 22:55 [PATCH] media: nxp: imx8-isi: Drop unused argument to mxc_isi_channel_chain() Laurent Pinchart
@ 2025-08-14 18:52 ` Frank Li
0 siblings, 0 replies; 2+ messages in thread
From: Frank Li @ 2025-08-14 18:52 UTC (permalink / raw)
To: Laurent Pinchart
Cc: linux-media, Shawn Guo, Sascha Hauer, Pengutronix Kernel Team,
Fabio Estevam, Richard Leitner, imx
On Thu, Aug 14, 2025 at 01:55:01AM +0300, Laurent Pinchart wrote:
> The bypass argument to the mxc_isi_channel_chain() function is unused.
> Drop it.
>
> Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Frank Li <Frank.Li@nxp.com>
> ---
> drivers/media/platform/nxp/imx8-isi/imx8-isi-core.h | 2 +-
> drivers/media/platform/nxp/imx8-isi/imx8-isi-hw.c | 2 +-
> drivers/media/platform/nxp/imx8-isi/imx8-isi-m2m.c | 11 +++++------
> drivers/media/platform/nxp/imx8-isi/imx8-isi-pipe.c | 2 +-
> 4 files changed, 8 insertions(+), 9 deletions(-)
>
> diff --git a/drivers/media/platform/nxp/imx8-isi/imx8-isi-core.h b/drivers/media/platform/nxp/imx8-isi/imx8-isi-core.h
> index d86f5ede0c0e..5789e54f9428 100644
> --- a/drivers/media/platform/nxp/imx8-isi/imx8-isi-core.h
> +++ b/drivers/media/platform/nxp/imx8-isi/imx8-isi-core.h
> @@ -361,7 +361,7 @@ void mxc_isi_channel_get(struct mxc_isi_pipe *pipe);
> void mxc_isi_channel_put(struct mxc_isi_pipe *pipe);
> void mxc_isi_channel_enable(struct mxc_isi_pipe *pipe);
> void mxc_isi_channel_disable(struct mxc_isi_pipe *pipe);
> -int mxc_isi_channel_chain(struct mxc_isi_pipe *pipe, bool bypass);
> +int mxc_isi_channel_chain(struct mxc_isi_pipe *pipe);
> void mxc_isi_channel_unchain(struct mxc_isi_pipe *pipe);
>
> void mxc_isi_channel_config(struct mxc_isi_pipe *pipe,
> diff --git a/drivers/media/platform/nxp/imx8-isi/imx8-isi-hw.c b/drivers/media/platform/nxp/imx8-isi/imx8-isi-hw.c
> index 5623914f95e6..9225a7ac1c3e 100644
> --- a/drivers/media/platform/nxp/imx8-isi/imx8-isi-hw.c
> +++ b/drivers/media/platform/nxp/imx8-isi/imx8-isi-hw.c
> @@ -587,7 +587,7 @@ void mxc_isi_channel_release(struct mxc_isi_pipe *pipe)
> *
> * TODO: Support secondary line buffer for downscaling YUV420 images.
> */
> -int mxc_isi_channel_chain(struct mxc_isi_pipe *pipe, bool bypass)
> +int mxc_isi_channel_chain(struct mxc_isi_pipe *pipe)
> {
> /* Channel chaining requires both line and output buffer. */
> const u8 resources = MXC_ISI_CHANNEL_RES_OUTPUT_BUF
> diff --git a/drivers/media/platform/nxp/imx8-isi/imx8-isi-m2m.c b/drivers/media/platform/nxp/imx8-isi/imx8-isi-m2m.c
> index 5501214cc6c0..e36781c5522e 100644
> --- a/drivers/media/platform/nxp/imx8-isi/imx8-isi-m2m.c
> +++ b/drivers/media/platform/nxp/imx8-isi/imx8-isi-m2m.c
> @@ -491,7 +491,6 @@ static int mxc_isi_m2m_streamon(struct file *file, void *fh,
> const struct mxc_isi_format_info *cap_info = ctx->queues.cap.info;
> const struct mxc_isi_format_info *out_info = ctx->queues.out.info;
> struct mxc_isi_m2m *m2m = ctx->m2m;
> - bool bypass;
> int ret;
>
> if (q->streaming)
> @@ -504,15 +503,15 @@ static int mxc_isi_m2m_streamon(struct file *file, void *fh,
> goto unlock;
> }
>
> - bypass = cap_pix->width == out_pix->width &&
> - cap_pix->height == out_pix->height &&
> - cap_info->encoding == out_info->encoding;
> -
> /*
> * Acquire the pipe and initialize the channel with the first user of
> * the M2M device.
> */
> if (m2m->usage_count == 0) {
> + bool bypass = cap_pix->width == out_pix->width &&
> + cap_pix->height == out_pix->height &&
> + cap_info->encoding == out_info->encoding;
> +
> ret = mxc_isi_channel_acquire(m2m->pipe,
> &mxc_isi_m2m_frame_write_done,
> bypass);
> @@ -529,7 +528,7 @@ static int mxc_isi_m2m_streamon(struct file *file, void *fh,
> * buffer chaining.
> */
> if (!ctx->chained && out_pix->width > MXC_ISI_MAX_WIDTH_UNCHAINED) {
> - ret = mxc_isi_channel_chain(m2m->pipe, bypass);
> + ret = mxc_isi_channel_chain(m2m->pipe);
> if (ret)
> goto deinit;
>
> diff --git a/drivers/media/platform/nxp/imx8-isi/imx8-isi-pipe.c b/drivers/media/platform/nxp/imx8-isi/imx8-isi-pipe.c
> index d76eb58deb09..a41c51dd9ce0 100644
> --- a/drivers/media/platform/nxp/imx8-isi/imx8-isi-pipe.c
> +++ b/drivers/media/platform/nxp/imx8-isi/imx8-isi-pipe.c
> @@ -855,7 +855,7 @@ int mxc_isi_pipe_acquire(struct mxc_isi_pipe *pipe,
>
> /* Chain the channel if needed for wide resolutions. */
> if (sink_fmt->width > MXC_ISI_MAX_WIDTH_UNCHAINED) {
> - ret = mxc_isi_channel_chain(pipe, bypass);
> + ret = mxc_isi_channel_chain(pipe);
> if (ret)
> mxc_isi_channel_release(pipe);
> }
>
> base-commit: 078f1a7eb48eef9b3cb78bcd2254356f3a332358
> --
> Regards,
>
> Laurent Pinchart
>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2025-08-14 18:52 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2025-08-13 22:55 [PATCH] media: nxp: imx8-isi: Drop unused argument to mxc_isi_channel_chain() Laurent Pinchart
2025-08-14 18:52 ` Frank Li
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).