* [PATCH v2 0/2] media: staging: rkisp1: allow simultaneous streaming from multiple capture devices
@ 2020-03-16 21:00 Helen Koike
2020-03-16 21:00 ` [PATCH v2 1/2] media: staging: rkisp1: cap: fix return values from pm functions Helen Koike
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Helen Koike @ 2020-03-16 21:00 UTC (permalink / raw)
To: linux-media
Cc: mchehab, linux-kernel, tfiga, linux-rockchip, hans.verkuil,
kernel, Helen Koike
Hi,
This series adds support for simultaneous streaming from both capture
devices (rkisp1_selfpath and rkisp1_mainpath).
It depends on the following series for multistream to work properly, but
it doesn't mean it can't be merged before:
"media: add v4l2_pipeline_stream_{enable,disable} helpers"
https://patchwork.linuxtv.org/cover/62233/
And it is also available at:
https://gitlab.collabora.com/koike/linux/tree/rockchip/isp/multistream
Patch 1/2 fixes return error handling from pm functions, which was
preventing the second stream to start.
Patch 2/2 serializes start/stop streaming calls, since they both
and modify shared variables.
Changes in v2:
- Rebased on media/master
- Removed the following patch from the series:
"media: staging: rkisp1: do not call s_stream if the entity is still in use"
It was replaced by "media: add v4l2_pipeline_stream_{enable,disable} helpers"
https://patchwork.linuxtv.org/cover/62233/
This series was tested with:
============================
SEN_DEV=/dev/v4l-subdev3
ISP_DEV=/dev/v4l-subdev0
RSZ_SP_DEV=/dev/v4l-subdev2
RSZ_MP_DEV=/dev/v4l-subdev1
CAP_SP_DEV=/dev/video1
CAP_MP_DEV=/dev/video0
WIDTH=1920
HEIGHT=1080
RAW_CODE=SRGGB10_1X10
YUV_CODE=YUYV8_2X8
v4l2-ctl --set-subdev-fmt pad=0,width=$WIDTH,height=$HEIGHT,code=$RAW_CODE -d $SEN_DEV
v4l2-ctl --set-subdev-fmt pad=0,width=$WIDTH,height=$HEIGHT,code=$RAW_CODE -d $ISP_DEV
v4l2-ctl --set-subdev-selection pad=0,target=crop,top=0,left=0,width=$WIDTH,height=$HEIGHT -d $ISP_DEV
v4l2-ctl --set-subdev-selection pad=2,target=crop,top=0,left=0,width=$WIDTH,height=$HEIGHT -d $ISP_DEV
v4l2-ctl --set-subdev-fmt pad=2,width=$WIDTH,height=$HEIGHT,code=$YUV_CODE -d $ISP_DEV
v4l2-ctl --set-subdev-fmt pad=0,width=$WIDTH,height=$HEIGHT,code=$YUV_CODE -d $RSZ_SP_DEV
v4l2-ctl --set-subdev-fmt pad=1,width=$WIDTH,height=$HEIGHT,code=$YUV_CODE -d $RSZ_SP_DEV
v4l2-ctl --set-subdev-selection pad=0,target=crop,top=0,left=0,width=$WIDTH,height=$HEIGHT -d $RSZ_SP_DEV
v4l2-ctl --set-subdev-fmt pad=0,width=$WIDTH,height=$HEIGHT,code=$YUV_CODE -d $RSZ_MP_DEV
v4l2-ctl --set-subdev-fmt pad=1,width=$WIDTH,height=$HEIGHT,code=$YUV_CODE -d $RSZ_MP_DEV
v4l2-ctl --set-subdev-selection pad=0,target=crop,top=0,left=0,width=$WIDTH,height=$HEIGHT -d $RSZ_MP_DEV
v4l2-ctl -v width=$WIDTH,height=$HEIGHT,pixelformat=NV12 -d $CAP_SP_DEV
v4l2-ctl -v width=$WIDTH,height=$HEIGHT,pixelformat=NV12 -d $CAP_MP_DEV
sleep 1
v4l2-ctl --stream-mmap --stream-count=100 -d $CAP_SP_DEV --stream-to=/tmp/test_sp.raw &
v4l2-ctl --stream-mmap --stream-count=100 -d $CAP_MP_DEV --stream-to=/tmp/test_mp.raw &
wait
echo "Completed"
Helen Koike (2):
media: staging: rkisp1: cap: fix return values from pm functions
media: staging: rkisp1: cap: serialize start/stop stream
drivers/staging/media/rkisp1/rkisp1-capture.c | 13 +++++++++++--
drivers/staging/media/rkisp1/rkisp1-common.h | 2 ++
drivers/staging/media/rkisp1/rkisp1-dev.c | 2 ++
3 files changed, 15 insertions(+), 2 deletions(-)
--
2.25.0
^ permalink raw reply [flat|nested] 4+ messages in thread* [PATCH v2 1/2] media: staging: rkisp1: cap: fix return values from pm functions
2020-03-16 21:00 [PATCH v2 0/2] media: staging: rkisp1: allow simultaneous streaming from multiple capture devices Helen Koike
@ 2020-03-16 21:00 ` Helen Koike
2020-03-16 21:00 ` [PATCH v2 2/2] media: staging: rkisp1: cap: serialize start/stop stream Helen Koike
2020-06-10 16:37 ` [PATCH v2 0/2] media: staging: rkisp1: allow simultaneous streaming from multiple capture devices Tomasz Figa
2 siblings, 0 replies; 4+ messages in thread
From: Helen Koike @ 2020-03-16 21:00 UTC (permalink / raw)
To: linux-media
Cc: mchehab, linux-kernel, tfiga, linux-rockchip, hans.verkuil,
kernel, Helen Koike
If no errors occurs, pm functions return usage counters, so they can
return positive numbers.
This happens when streaming from multiple capture devices (mainpath and
selfpath).
Fix simultaneous streaming from mainpath and selfpath by not failing
when pm usage counters returns a positive number.
Signed-off-by: Helen Koike <helen.koike@collabora.com>
---
Changes in v2:
- Rebased on media/master
drivers/staging/media/rkisp1/rkisp1-capture.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/staging/media/rkisp1/rkisp1-capture.c b/drivers/staging/media/rkisp1/rkisp1-capture.c
index 24fe6a7888aa..967bd05b4507 100644
--- a/drivers/staging/media/rkisp1/rkisp1-capture.c
+++ b/drivers/staging/media/rkisp1/rkisp1-capture.c
@@ -939,7 +939,7 @@ static void rkisp1_vb2_stop_streaming(struct vb2_queue *queue)
v4l2_pipeline_pm_put(&node->vdev.entity);
ret = pm_runtime_put(rkisp1->dev);
- if (ret)
+ if (ret < 0)
dev_err(rkisp1->dev, "power down failed error:%d\n", ret);
rkisp1_dummy_buf_destroy(cap);
@@ -992,7 +992,7 @@ rkisp1_vb2_start_streaming(struct vb2_queue *queue, unsigned int count)
goto err_ret_buffers;
ret = pm_runtime_get_sync(cap->rkisp1->dev);
- if (ret) {
+ if (ret < 0) {
dev_err(cap->rkisp1->dev, "power up failed %d\n", ret);
goto err_destroy_dummy;
}
--
2.25.0
^ permalink raw reply related [flat|nested] 4+ messages in thread* [PATCH v2 2/2] media: staging: rkisp1: cap: serialize start/stop stream
2020-03-16 21:00 [PATCH v2 0/2] media: staging: rkisp1: allow simultaneous streaming from multiple capture devices Helen Koike
2020-03-16 21:00 ` [PATCH v2 1/2] media: staging: rkisp1: cap: fix return values from pm functions Helen Koike
@ 2020-03-16 21:00 ` Helen Koike
2020-06-10 16:37 ` [PATCH v2 0/2] media: staging: rkisp1: allow simultaneous streaming from multiple capture devices Tomasz Figa
2 siblings, 0 replies; 4+ messages in thread
From: Helen Koike @ 2020-03-16 21:00 UTC (permalink / raw)
To: linux-media
Cc: mchehab, linux-kernel, tfiga, linux-rockchip, hans.verkuil,
kernel, Helen Koike
In order to support simultaneous streaming from both capture devices,
start/stop vb2 calls need to be serialized to allow multiple concurrent
calls.
Signed-off-by: Helen Koike <helen.koike@collabora.com>
---
Changes in v2:
- Rebased with media/master
drivers/staging/media/rkisp1/rkisp1-capture.c | 9 +++++++++
drivers/staging/media/rkisp1/rkisp1-common.h | 2 ++
drivers/staging/media/rkisp1/rkisp1-dev.c | 2 ++
3 files changed, 13 insertions(+)
diff --git a/drivers/staging/media/rkisp1/rkisp1-capture.c b/drivers/staging/media/rkisp1/rkisp1-capture.c
index 967bd05b4507..f3c4f2a198ca 100644
--- a/drivers/staging/media/rkisp1/rkisp1-capture.c
+++ b/drivers/staging/media/rkisp1/rkisp1-capture.c
@@ -927,6 +927,8 @@ static void rkisp1_vb2_stop_streaming(struct vb2_queue *queue)
struct rkisp1_device *rkisp1 = cap->rkisp1;
int ret;
+ mutex_lock(&cap->rkisp1->stream_lock);
+
rkisp1_stream_stop(cap);
media_pipeline_stop(&node->vdev.entity);
ret = rkisp1_pipeline_sink_walk(&node->vdev.entity, NULL,
@@ -943,6 +945,8 @@ static void rkisp1_vb2_stop_streaming(struct vb2_queue *queue)
dev_err(rkisp1->dev, "power down failed error:%d\n", ret);
rkisp1_dummy_buf_destroy(cap);
+
+ mutex_unlock(&cap->rkisp1->stream_lock);
}
/*
@@ -987,6 +991,8 @@ rkisp1_vb2_start_streaming(struct vb2_queue *queue, unsigned int count)
struct media_entity *entity = &cap->vnode.vdev.entity;
int ret;
+ mutex_lock(&cap->rkisp1->stream_lock);
+
ret = rkisp1_dummy_buf_create(cap);
if (ret)
goto err_ret_buffers;
@@ -1016,6 +1022,8 @@ rkisp1_vb2_start_streaming(struct vb2_queue *queue, unsigned int count)
goto err_pipe_disable;
}
+ mutex_unlock(&cap->rkisp1->stream_lock);
+
return 0;
err_pipe_disable:
@@ -1029,6 +1037,7 @@ rkisp1_vb2_start_streaming(struct vb2_queue *queue, unsigned int count)
rkisp1_dummy_buf_destroy(cap);
err_ret_buffers:
rkisp1_return_all_buffers(cap, VB2_BUF_STATE_QUEUED);
+ mutex_unlock(&cap->rkisp1->stream_lock);
return ret;
}
diff --git a/drivers/staging/media/rkisp1/rkisp1-common.h b/drivers/staging/media/rkisp1/rkisp1-common.h
index b291cc60de8e..4ec5aae9694a 100644
--- a/drivers/staging/media/rkisp1/rkisp1-common.h
+++ b/drivers/staging/media/rkisp1/rkisp1-common.h
@@ -247,6 +247,7 @@ struct rkisp1_debug {
* @rkisp1_capture: capture video device
* @stats: ISP statistics output device
* @params: ISP input parameters device
+ * @stream_lock: lock to serialize start/stop streaming in capture devices.
*/
struct rkisp1_device {
void __iomem *base_addr;
@@ -266,6 +267,7 @@ struct rkisp1_device {
struct rkisp1_params params;
struct media_pipeline pipe;
struct vb2_alloc_ctx *alloc_ctx;
+ struct mutex stream_lock;
struct rkisp1_debug debug;
};
diff --git a/drivers/staging/media/rkisp1/rkisp1-dev.c b/drivers/staging/media/rkisp1/rkisp1-dev.c
index b1b3c058e957..3e3a3925b019 100644
--- a/drivers/staging/media/rkisp1/rkisp1-dev.c
+++ b/drivers/staging/media/rkisp1/rkisp1-dev.c
@@ -471,6 +471,8 @@ static int rkisp1_probe(struct platform_device *pdev)
dev_set_drvdata(dev, rkisp1);
rkisp1->dev = dev;
+ mutex_init(&rkisp1->stream_lock);
+
rkisp1->base_addr = devm_platform_ioremap_resource(pdev, 0);
if (IS_ERR(rkisp1->base_addr))
return PTR_ERR(rkisp1->base_addr);
--
2.25.0
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [PATCH v2 0/2] media: staging: rkisp1: allow simultaneous streaming from multiple capture devices
2020-03-16 21:00 [PATCH v2 0/2] media: staging: rkisp1: allow simultaneous streaming from multiple capture devices Helen Koike
2020-03-16 21:00 ` [PATCH v2 1/2] media: staging: rkisp1: cap: fix return values from pm functions Helen Koike
2020-03-16 21:00 ` [PATCH v2 2/2] media: staging: rkisp1: cap: serialize start/stop stream Helen Koike
@ 2020-06-10 16:37 ` Tomasz Figa
2 siblings, 0 replies; 4+ messages in thread
From: Tomasz Figa @ 2020-06-10 16:37 UTC (permalink / raw)
To: Helen Koike
Cc: linux-media, mchehab, linux-kernel, linux-rockchip, hans.verkuil,
kernel
On Mon, Mar 16, 2020 at 06:00:42PM -0300, Helen Koike wrote:
> Hi,
>
> This series adds support for simultaneous streaming from both capture
> devices (rkisp1_selfpath and rkisp1_mainpath).
>
> It depends on the following series for multistream to work properly, but
> it doesn't mean it can't be merged before:
>
> "media: add v4l2_pipeline_stream_{enable,disable} helpers"
> https://patchwork.linuxtv.org/cover/62233/
>
> And it is also available at:
>
> https://gitlab.collabora.com/koike/linux/tree/rockchip/isp/multistream
>
> Patch 1/2 fixes return error handling from pm functions, which was
> preventing the second stream to start.
>
> Patch 2/2 serializes start/stop streaming calls, since they both
> and modify shared variables.
>
> Changes in v2:
> - Rebased on media/master
> - Removed the following patch from the series:
> "media: staging: rkisp1: do not call s_stream if the entity is still in use"
> It was replaced by "media: add v4l2_pipeline_stream_{enable,disable} helpers"
> https://patchwork.linuxtv.org/cover/62233/
>
For the whole series:
Reviewed-by: Tomasz Figa <tfiga@chromium.org>
Best regards,
Tomasz
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2020-06-10 16:37 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-03-16 21:00 [PATCH v2 0/2] media: staging: rkisp1: allow simultaneous streaming from multiple capture devices Helen Koike
2020-03-16 21:00 ` [PATCH v2 1/2] media: staging: rkisp1: cap: fix return values from pm functions Helen Koike
2020-03-16 21:00 ` [PATCH v2 2/2] media: staging: rkisp1: cap: serialize start/stop stream Helen Koike
2020-06-10 16:37 ` [PATCH v2 0/2] media: staging: rkisp1: allow simultaneous streaming from multiple capture devices Tomasz Figa
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.