On Wed Dec 3 00:34:42 2025 +0200, Sakari Ailus wrote:
> Move watermark calculation to ipu6-isys-csi2.c and do the whole thing
> as streaming is about to start. There's no need to store all the
> information so that it is bound to video nodes.
>
> Signed-off-by: Sakari Ailus <[email protected]>
> Reviewed-by: Antti Laakso <[email protected]>
Patch committed.
Thanks,
Sakari Ailus
drivers/media/pci/intel/ipu6/ipu6-isys-csi2.c | 84 ++++++++++++++++++++++-
drivers/media/pci/intel/ipu6/ipu6-isys-csi2.h | 4 ++
drivers/media/pci/intel/ipu6/ipu6-isys-queue.c | 5 --
drivers/media/pci/intel/ipu6/ipu6-isys-video.c | 94 --------------------------
drivers/media/pci/intel/ipu6/ipu6-isys-video.h | 15 ----
drivers/media/pci/intel/ipu6/ipu6-isys.c | 42 +++++-------
drivers/media/pci/intel/ipu6/ipu6-isys.h | 2 +-
7 files changed, 103 insertions(+), 143 deletions(-)
---
diff --git a/drivers/media/pci/intel/ipu6/ipu6-isys-csi2.c
b/drivers/media/pci/intel/ipu6/ipu6-isys-csi2.c
index eb762dd402c4..1940bc89627b 100644
--- a/drivers/media/pci/intel/ipu6/ipu6-isys-csi2.c
+++ b/drivers/media/pci/intel/ipu6/ipu6-isys-csi2.c
@@ -231,6 +231,79 @@ void ipu6_isys_csi2_error(struct ipu6_isys_csi2 *csi2)
}
}
+static void ipu6_isys_csi2_setup_watermark(struct ipu6_isys_csi2 *csi2,
+ struct v4l2_subdev_state *csi2_state,
+ struct v4l2_subdev *remote_sd)
+{
+ struct device *dev = &csi2->isys->adev->auxdev.dev;
+ struct v4l2_control hb = { .id = V4L2_CID_HBLANK, .value = 0 };
+ struct v4l2_subdev_route *route;
+ u32 max_stream_data_rate = 0, hblank = 0;
+ s64 link_freq;
+ int ret;
+
+ if (IS_IPU7(csi2->asd.isys->adev->isp))
+ return;
+
+ ret = v4l2_g_ctrl(remote_sd->ctrl_handler, &hb);
+ if (!ret)
+ hblank = max(0, hb.value);
+
+ link_freq = ipu6_isys_csi2_get_link_freq(csi2);
+ if (link_freq <= 0) {
+ csi2->watermark.force_iwake_disable = true;
+ dev_warn(dev, "unexpected link_freq %lld (source %s)\n",
+ link_freq, remote_sd->entity.name);
+ ipu6_isys_update_watermark_setting(csi2->isys);
+ return;
+ }
+
+ for_each_active_route(&csi2_state->routing, route) {
+ struct v4l2_mbus_framefmt *fmt;
+
+ fmt = v4l2_subdev_state_get_format(csi2_state, CSI2_PAD_SINK,
+ route->sink_stream);
+ if (WARN_ON(!fmt))
+ continue;
+
+ u32 bpp = ipu6_isys_mbus_code_to_bpp(fmt->code);
+ u64 pixel_rate = mul_u64_u32_div(link_freq, csi2->nlanes * 2,
+ bpp);
+ u32 pixels_per_line = fmt->width + hblank;
+ u64 line_time_ns = div_u64(pixels_per_line * NSEC_PER_SEC,
+ pixel_rate);
+ u32 bytes_per_line = fmt->width * bpp / 8;
+ u32 pages_per_line =
+ DIV_ROUND_UP(bytes_per_line,
+ csi2->isys->pdata->ipdata->sram_gran_size);
+ u32 pb_bytes_per_line =
+ pages_per_line <<
csi2->isys->pdata->ipdata->sram_gran_shift;
+ u64 stream_data_rate =
+ div64_u64(pb_bytes_per_line * 1000, line_time_ns);
+
+ dev_dbg(dev, "stream %u:%u -> %u:%u data rate %lld\n",
+ route->sink_pad, route->sink_stream, route->source_pad,
+ route->source_stream, stream_data_rate);
+
+ max_stream_data_rate = max(max_stream_data_rate,
+ stream_data_rate);
+ }
+
+ csi2->watermark.stream_data_rate = max_stream_data_rate;
+
+ ipu6_isys_update_watermark_setting(csi2->isys);
+}
+
+static void ipu6_isys_csi2_clear_watermark(struct ipu6_isys_csi2 *csi2)
+{
+ if (IS_IPU7(csi2->asd.isys->adev->isp))
+ return;
+
+ csi2->watermark.force_iwake_disable = false;
+ csi2->watermark.stream_data_rate = 0;
+ ipu6_isys_update_watermark_setting(csi2->isys);
+}
+
static void ipu6_isys_csi2_stream_disable(struct ipu6_isys_csi2 *csi2)
{
struct ipu6_isys *isys = csi2->isys;
@@ -561,6 +634,11 @@ static int ipu6_isys_csi2_enable_streams(struct
v4l2_subdev *sd,
if (ret <= 0)
return ret;
+ remote_pad =
media_pad_remote_pad_first(&sd->entity.pads[CSI2_PAD_SINK]);
+ remote_sd = media_entity_to_v4l2_subdev(remote_pad->entity);
+
+ ipu6_isys_csi2_setup_watermark(csi2, state, remote_sd);
+
ret = ipu6_isys_start_stream_firmware(av, &bl);
if (ret) {
dev_err(sd->dev, "start stream of firmware failed\n");
@@ -574,9 +652,6 @@ static int ipu6_isys_csi2_enable_streams(struct v4l2_subdev
*sd,
goto err_stop_stream_firmware;
}
- remote_pad =
media_pad_remote_pad_first(&sd->entity.pads[CSI2_PAD_SINK]);
- remote_sd = media_entity_to_v4l2_subdev(remote_pad->entity);
-
ret = v4l2_subdev_enable_streams(remote_sd, remote_pad->index,
csi2->stream_ids);
if (ret)
@@ -597,6 +672,7 @@ err_stop_stream_firmware:
ipu6_isys_close_streaming_firmware(av);
err_return_buffers:
+ ipu6_isys_csi2_clear_watermark(csi2);
csi2->stream_ids &= ~sink_streams;
list_del(&av->csi2_entry);
ipu6_isys_buffer_list_queue(&bl, IPU6_ISYS_BUFFER_LIST_FL_INCOMING, 0);
@@ -647,6 +723,8 @@ static int ipu6_isys_csi2_disable_streams(struct
v4l2_subdev *sd,
ipu6_isys_close_streaming_firmware(av);
+ ipu6_isys_csi2_clear_watermark(csi2);
+
out_del_csi2_entry:
list_del(&av->csi2_entry);
diff --git a/drivers/media/pci/intel/ipu6/ipu6-isys-csi2.h
b/drivers/media/pci/intel/ipu6/ipu6-isys-csi2.h
index 4d84899fde4c..49d01e938dc8 100644
--- a/drivers/media/pci/intel/ipu6/ipu6-isys-csi2.h
+++ b/drivers/media/pci/intel/ipu6/ipu6-isys-csi2.h
@@ -49,6 +49,10 @@ struct ipu6_isys_csi2 {
unsigned int port;
u32 legacy_irq_mask;
unsigned int phy_mode;
+ struct {
+ u32 stream_data_rate;
+ bool force_iwake_disable;
+ } watermark;
u32 streaming_vc;
u64 stream_ids;
};
diff --git a/drivers/media/pci/intel/ipu6/ipu6-isys-queue.c
b/drivers/media/pci/intel/ipu6/ipu6-isys-queue.c
index b4c3de959f81..3c0977151b40 100644
--- a/drivers/media/pci/intel/ipu6/ipu6-isys-queue.c
+++ b/drivers/media/pci/intel/ipu6/ipu6-isys-queue.c
@@ -532,8 +532,6 @@ static int start_streaming(struct vb2_queue *q, unsigned
int count)
}
list_add(&aq->node, &stream->queues);
- ipu6_isys_configure_stream_watermark(av, source_pad->entity);
- ipu6_isys_update_stream_watermark(av, true);
ret = ipu6_isys_stream_start(av);
if (ret)
@@ -544,7 +542,6 @@ static int start_streaming(struct vb2_queue *q, unsigned
int count)
return 0;
out_stream_start:
- ipu6_isys_update_stream_watermark(av, false);
list_del(&aq->node);
out_fw_close:
@@ -568,8 +565,6 @@ static void stop_streaming(struct vb2_queue *q)
mutex_lock(&stream->mutex);
- ipu6_isys_update_stream_watermark(av, false);
-
mutex_lock(&av->isys->stream_mutex);
ipu6_isys_video_set_streaming(av, 0);
list_del(&aq->node);
diff --git a/drivers/media/pci/intel/ipu6/ipu6-isys-video.c
b/drivers/media/pci/intel/ipu6/ipu6-isys-video.c
index 66f1a28a444e..4037a3c80dc6 100644
--- a/drivers/media/pci/intel/ipu6/ipu6-isys-video.c
+++ b/drivers/media/pci/intel/ipu6/ipu6-isys-video.c
@@ -636,100 +636,6 @@ int ipu6_isys_video_prepare_stream(struct ipu6_isys_video
*av,
return 0;
}
-void ipu6_isys_configure_stream_watermark(struct ipu6_isys_video *av,
- struct media_entity *source)
-{
- struct ipu6_isys *isys = av->isys;
- struct ipu6_isys_csi2 *csi2 = NULL;
- struct isys_iwake_watermark *iwake_watermark = &isys->iwake_watermark;
- struct device *dev = &isys->adev->auxdev.dev;
- struct v4l2_subdev *esd;
- struct v4l2_control hb = { .id = V4L2_CID_HBLANK, .value = 0 };
- s64 link_freq;
- int ret;
-
- esd = media_entity_to_v4l2_subdev(source);
-
- av->watermark.width = ipu6_isys_get_frame_width(av);
- av->watermark.height = ipu6_isys_get_frame_height(av);
-
- ret = v4l2_g_ctrl(esd->ctrl_handler, &hb);
- if (!ret && hb.value >= 0)
- av->watermark.hblank = hb.value;
- else
- av->watermark.hblank = 0;
-
- csi2 = ipu6_isys_subdev_to_csi2(av->stream->asd);
- link_freq = ipu6_isys_csi2_get_link_freq(csi2);
- if (link_freq <= 0) {
- mutex_lock(&iwake_watermark->mutex);
- iwake_watermark->force_iwake_disable = true;
- mutex_unlock(&iwake_watermark->mutex);
- dev_warn(dev, "unexpected link_freq from %s, disable iwake\n",
- source->name);
- return;
- }
-
- struct v4l2_subdev_state *state;
- struct v4l2_mbus_framefmt *format;
- unsigned int bpp;
-
- state = v4l2_subdev_lock_and_get_active_state(&csi2->asd.sd);
- format = v4l2_subdev_state_get_format(state, 0, av->source_stream);
- bpp = ipu6_isys_mbus_code_to_bpp(format->code);
- v4l2_subdev_unlock_state(state);
-
- av->watermark.pixel_rate = mul_u64_u32_div(link_freq, csi2->nlanes * 2,
- bpp);
-}
-
-static void calculate_stream_datarate(struct ipu6_isys_video *av)
-{
- struct video_stream_watermark *watermark = &av->watermark;
- const struct ipu6_isys_pixelformat *pfmt =
- ipu6_isys_get_isys_format(ipu6_isys_get_format(av), 0);
- u32 pages_per_line, pb_bytes_per_line, pixels_per_line, bytes_per_line;
- u64 line_time_ns, stream_data_rate;
-
- pixels_per_line = watermark->width + watermark->hblank;
- line_time_ns = div_u64(pixels_per_line * NSEC_PER_SEC,
- watermark->pixel_rate);
- bytes_per_line = watermark->width * pfmt->bpp / 8;
- pages_per_line = DIV_ROUND_UP(bytes_per_line,
- av->isys->pdata->ipdata->sram_gran_size);
- pb_bytes_per_line =
- pages_per_line << av->isys->pdata->ipdata->sram_gran_shift;
- stream_data_rate = div64_u64(pb_bytes_per_line * 1000, line_time_ns);
-
- watermark->stream_data_rate = stream_data_rate;
-}
-
-void ipu6_isys_update_stream_watermark(struct ipu6_isys_video *av, bool state)
-{
- struct isys_iwake_watermark *iwake_watermark =
- &av->isys->iwake_watermark;
- struct ipu6_device *isp = av->isys->adev->isp;
-
- if (IS_IPU7(isp) ||
- !av->watermark.pixel_rate)
- return;
-
- if (state) {
- calculate_stream_datarate(av);
- mutex_lock(&iwake_watermark->mutex);
- list_add(&av->watermark.stream_node,
- &iwake_watermark->video_list);
- mutex_unlock(&iwake_watermark->mutex);
- } else {
- av->watermark.stream_data_rate = 0;
- mutex_lock(&iwake_watermark->mutex);
- list_del(&av->watermark.stream_node);
- mutex_unlock(&iwake_watermark->mutex);
- }
-
- update_watermark_setting(av->isys);
-}
-
void ipu6_isys_put_stream(struct ipu6_isys_stream *stream)
{
struct device *dev;
diff --git a/drivers/media/pci/intel/ipu6/ipu6-isys-video.h
b/drivers/media/pci/intel/ipu6/ipu6-isys-video.h
index a78aaad63303..f5b773e16d62 100644
--- a/drivers/media/pci/intel/ipu6/ipu6-isys-video.h
+++ b/drivers/media/pci/intel/ipu6/ipu6-isys-video.h
@@ -64,16 +64,6 @@ struct ipu6_isys_stream {
u8 vc;
};
-struct video_stream_watermark {
- u32 width;
- u32 height;
- u32 hblank;
- u32 frame_rate;
- u64 pixel_rate;
- u64 stream_data_rate;
- struct list_head stream_node;
-};
-
struct ipu6_isys_video {
struct ipu6_isys_queue aq;
struct list_head csi2_entry;
@@ -87,7 +77,6 @@ struct ipu6_isys_video {
struct ipu6_isys_csi2 *csi2;
struct ipu6_isys_stream *stream;
unsigned int streaming;
- struct video_stream_watermark watermark;
u32 source_stream;
u8 vc;
u8 dt;
@@ -121,10 +110,6 @@ ipu6_isys_query_stream_by_handle(struct ipu6_isys *isys,
u8 stream_handle);
struct ipu6_isys_stream *
ipu6_isys_query_stream_by_source(struct ipu6_isys *isys, int source, u8 vc);
-void ipu6_isys_configure_stream_watermark(struct ipu6_isys_video *av,
- struct media_entity *source);
-void ipu6_isys_update_stream_watermark(struct ipu6_isys_video *av, bool state);
-
u32 ipu6_isys_get_format(struct ipu6_isys_video *av);
u32 ipu6_isys_get_data_size(struct ipu6_isys_video *av);
u32 ipu6_isys_get_bytes_per_line(struct ipu6_isys_video *av);
diff --git a/drivers/media/pci/intel/ipu6/ipu6-isys.c
b/drivers/media/pci/intel/ipu6/ipu6-isys.c
index 08f29b678d1b..8e5f6bbf6265 100644
--- a/drivers/media/pci/intel/ipu6/ipu6-isys.c
+++ b/drivers/media/pci/intel/ipu6/ipu6-isys.c
@@ -473,52 +473,47 @@ static void enable_iwake(struct ipu6_isys *isys, bool
enable)
mutex_unlock(&iwake_watermark->mutex);
}
-void update_watermark_setting(struct ipu6_isys *isys)
+void ipu6_isys_update_watermark_setting(struct ipu6_isys *isys)
{
- struct isys_iwake_watermark *iwake_watermark = &isys->iwake_watermark;
u32 iwake_threshold, iwake_critical_threshold, page_num;
struct device *dev = &isys->adev->auxdev.dev;
u32 calc_fill_time_us = 0, ltr = 0, did = 0;
- struct video_stream_watermark *p_watermark;
enum ltr_did_type ltr_did_type;
- struct list_head *stream_node;
u64 isys_pb_datarate_mbs = 0;
u32 mem_open_threshold = 0;
struct ltr_did ltrdid;
u64 threshold_bytes;
u32 max_sram_size;
u32 shift;
+ bool force_iwake_disable = false;
+
+ lockdep_assert_held(&isys->stream_mutex);
shift = isys->pdata->ipdata->sram_gran_shift;
max_sram_size = isys->pdata->ipdata->max_sram_size;
- mutex_lock(&iwake_watermark->mutex);
- if (iwake_watermark->force_iwake_disable) {
+ for (unsigned int i = 0; i < isys->pdata->ipdata->csi2.nports; i++) {
+ isys_pb_datarate_mbs +=
+ isys->csi2[i].watermark.stream_data_rate;
+ force_iwake_disable |=
+ isys->csi2[i].watermark.force_iwake_disable;
+ }
+
+ if (force_iwake_disable) {
+ dev_dbg(dev, "watermark: forcing iwake disabled\n");
set_iwake_ltrdid(isys, 0, 0, LTR_IWAKE_OFF);
set_iwake_register(isys, GDA_IRQ_CRITICAL_THRESHOLD_INDEX,
CRITICAL_THRESHOLD_IWAKE_DISABLE);
- goto unlock_exit;
- }
-
- if (list_empty(&iwake_watermark->video_list)) {
- isys_pb_datarate_mbs = 0;
- } else {
- list_for_each(stream_node, &iwake_watermark->video_list) {
- p_watermark = list_entry(stream_node,
- struct video_stream_watermark,
- stream_node);
- isys_pb_datarate_mbs += p_watermark->stream_data_rate;
- }
+ return;
}
- mutex_unlock(&iwake_watermark->mutex);
if (!isys_pb_datarate_mbs) {
+ dev_dbg(dev, "watermark: disabled iwake\n");
enable_iwake(isys, false);
set_iwake_ltrdid(isys, 0, 0, LTR_IWAKE_OFF);
- mutex_lock(&iwake_watermark->mutex);
set_iwake_register(isys, GDA_IRQ_CRITICAL_THRESHOLD_INDEX,
CRITICAL_THRESHOLD_IWAKE_DISABLE);
- goto unlock_exit;
+ return;
}
enable_iwake(isys, true);
@@ -553,7 +548,6 @@ void update_watermark_setting(struct ipu6_isys *isys)
iwake_threshold = max_t(u32, 1, threshold_bytes >> shift);
iwake_threshold = min_t(u32, iwake_threshold, max_sram_size);
- mutex_lock(&iwake_watermark->mutex);
if (isys->pdata->ipdata->enhanced_iwake) {
set_iwake_register(isys, GDA_IWAKE_THRESHOLD_INDEX,
DEFAULT_IWAKE_THRESHOLD);
@@ -575,7 +569,7 @@ void update_watermark_setting(struct ipu6_isys *isys)
iwake_critical_threshold = iwake_threshold +
(IS_PIXEL_BUFFER_PAGES - iwake_threshold) / 2;
- dev_dbg(dev, "threshold: %u critical: %u\n", iwake_threshold,
+ dev_dbg(dev, "watermark: threshold: %u critical: %u\n", iwake_threshold,
iwake_critical_threshold);
set_iwake_register(isys, GDA_IRQ_CRITICAL_THRESHOLD_INDEX,
@@ -585,8 +579,6 @@ void update_watermark_setting(struct ipu6_isys *isys)
isys->adev->isp->base + REG_PKGC_PMON_CFG);
writel(VAL_PKGC_PMON_CFG_START,
isys->adev->isp->base + REG_PKGC_PMON_CFG);
-unlock_exit:
- mutex_unlock(&iwake_watermark->mutex);
}
static void isys_iwake_watermark_init(struct ipu6_isys *isys)
diff --git a/drivers/media/pci/intel/ipu6/ipu6-isys.h
b/drivers/media/pci/intel/ipu6/ipu6-isys.h
index 8674c041b994..b85c216b3a46 100644
--- a/drivers/media/pci/intel/ipu6/ipu6-isys.h
+++ b/drivers/media/pci/intel/ipu6/ipu6-isys.h
@@ -222,7 +222,7 @@ void ipu6_cleanup_fw_msg_bufs(struct ipu6_isys *isys);
extern const struct v4l2_ioctl_ops ipu6_isys_ioctl_ops;
-void update_watermark_setting(struct ipu6_isys *isys);
+void ipu6_isys_update_watermark_setting(struct ipu6_isys *isys);
int ipu6_isys_mcd_phy_set_power(struct ipu6_isys *isys,
struct ipu6_isys_csi2_config *cfg,
_______________________________________________
linuxtv-commits mailing list -- [email protected]
To unsubscribe send an email to [email protected]
