From: Dafna Hirschfeld <dafna.hirschfeld@collabora.com>
To: Helen Koike <helen.koike@collabora.com>, linux-media@vger.kernel.org
Cc: laurent.pinchart@ideasonboard.com, ezequiel@collabora.com,
hverkuil@xs4all.nl, kernel@collabora.com, dafna3@gmail.com,
sakari.ailus@linux.intel.com, linux-rockchip@lists.infradead.org,
mchehab@kernel.org, tfiga@chromium.org
Subject: Re: [PATCH v2 10/14] media: staging: rkisp1: isp: add a warning and debugfs var for irq delay
Date: Tue, 18 Aug 2020 08:46:49 +0200 [thread overview]
Message-ID: <04b3fab5-5501-058c-9145-ebbbe851eb94@collabora.com> (raw)
In-Reply-To: <9a062761-84e0-d4e8-a909-53898562649a@collabora.com>
Am 17.08.20 um 23:48 schrieb Helen Koike:
> Hi Dafna,
>
> On 8/15/20 7:37 AM, Dafna Hirschfeld wrote:
>> The signal RKISP1_CIF_ISP_FRAME is set when the ISP completes
>> outputting the frame to the next block in the pipeline.
>> In order to keep buffer synchronization we assume that the
>> RKISP1_CIF_ISP_V_START signal never arrives together with the
>> RKISP1_CIF_ISP_FRAME signal.
>> In case those signals arrive together then the code is not able to
>> tell if the RKISP1_CIF_ISP_FRAME signal relates to the frame of
>> the current v-start or the previous. This patch adds a WARN_ONCE
>> and a debugfs var to catch it.
>>
>> Signed-off-by: Dafna Hirschfeld <dafna.hirschfeld@collabora.com>
>> ---
>> drivers/staging/media/rkisp1/rkisp1-common.h | 1 +
>> drivers/staging/media/rkisp1/rkisp1-dev.c | 2 ++
>> drivers/staging/media/rkisp1/rkisp1-isp.c | 5 +++++
>> 3 files changed, 8 insertions(+)
>>
>> diff --git a/drivers/staging/media/rkisp1/rkisp1-common.h b/drivers/staging/media/rkisp1/rkisp1-common.h
>> index 79edece6ee77..5aed0e37850a 100644
>> --- a/drivers/staging/media/rkisp1/rkisp1-common.h
>> +++ b/drivers/staging/media/rkisp1/rkisp1-common.h
>> @@ -228,6 +228,7 @@ struct rkisp1_debug {
>> unsigned long outform_size_error;
>> unsigned long img_stabilization_size_error;
>> unsigned long inform_size_error;
>> + unsigned long irq_delay;
>> unsigned long mipi_error;
>> unsigned long stats_error;
>> unsigned long stop_timeout[2];
>> diff --git a/drivers/staging/media/rkisp1/rkisp1-dev.c b/drivers/staging/media/rkisp1/rkisp1-dev.c
>> index a0eb8f08708b..557de940286b 100644
>> --- a/drivers/staging/media/rkisp1/rkisp1-dev.c
>> +++ b/drivers/staging/media/rkisp1/rkisp1-dev.c
>> @@ -445,6 +445,8 @@ static void rkisp1_debug_init(struct rkisp1_device *rkisp1)
>> &debug->img_stabilization_size_error);
>> debugfs_create_ulong("inform_size_error", 0444, debug->debugfs_dir,
>> &debug->inform_size_error);
>> + debugfs_create_ulong("irq_delay", 0444, debug->debugfs_dir,
>> + &debug->irq_delay);
>> debugfs_create_ulong("mipi_error", 0444, debug->debugfs_dir,
>> &debug->mipi_error);
>> debugfs_create_ulong("stats_error", 0444, debug->debugfs_dir,
>> diff --git a/drivers/staging/media/rkisp1/rkisp1-isp.c b/drivers/staging/media/rkisp1/rkisp1-isp.c
>> index 1ffe7cc7bb12..33cfad19dde2 100644
>> --- a/drivers/staging/media/rkisp1/rkisp1-isp.c
>> +++ b/drivers/staging/media/rkisp1/rkisp1-isp.c
>> @@ -1118,6 +1118,11 @@ void rkisp1_isp_isr(struct rkisp1_device *rkisp1)
>> */
>> rkisp1->isp.frame_sequence++;
>> rkisp1_isp_queue_event_sof(&rkisp1->isp);
>> + if (status & RKISP1_CIF_ISP_FRAME) {
>> + WARN_ONCE(1, "irq delay is too long, buffers might not be in sync\n");
>> + rkisp1->debug.irq_delay++;
>> + }
>> + }
>
> I was wondering, if both interrupts arrive at the same time, shouldn't we handle the
> frame before incrementing the frame_sequence?
>
> I mean, move the code block
>
> if (status & RKISP1_CIF_ISP_V_START) {...}
>
> after this other code block
>
> if (status & RKISP1_CIF_ISP_FRAME) {...}
When the two interrupts arrive together it is not clear if the frame interrupt belongs
to the current v-start or the previous one, this is why I added this debugfs var.
So it is a bit of guessing what should be done first. Maybe changing the order is generally
more correct. I discussed that with Tomasz https://patchwork.kernel.org/patch/11066513/#23544763
Thanks,
Dafna
>
>
> Thanks,
> Helen
>
>>
>> if (status & RKISP1_CIF_ISP_PIC_SIZE_ERROR) {
>> /* Clear pic_size_error */
>>
WARNING: multiple messages have this Message-ID (diff)
From: Dafna Hirschfeld <dafna.hirschfeld@collabora.com>
To: Helen Koike <helen.koike@collabora.com>, linux-media@vger.kernel.org
Cc: mchehab@kernel.org, dafna3@gmail.com, tfiga@chromium.org,
hverkuil@xs4all.nl, linux-rockchip@lists.infradead.org,
laurent.pinchart@ideasonboard.com, sakari.ailus@linux.intel.com,
kernel@collabora.com, ezequiel@collabora.com
Subject: Re: [PATCH v2 10/14] media: staging: rkisp1: isp: add a warning and debugfs var for irq delay
Date: Tue, 18 Aug 2020 08:46:49 +0200 [thread overview]
Message-ID: <04b3fab5-5501-058c-9145-ebbbe851eb94@collabora.com> (raw)
In-Reply-To: <9a062761-84e0-d4e8-a909-53898562649a@collabora.com>
Am 17.08.20 um 23:48 schrieb Helen Koike:
> Hi Dafna,
>
> On 8/15/20 7:37 AM, Dafna Hirschfeld wrote:
>> The signal RKISP1_CIF_ISP_FRAME is set when the ISP completes
>> outputting the frame to the next block in the pipeline.
>> In order to keep buffer synchronization we assume that the
>> RKISP1_CIF_ISP_V_START signal never arrives together with the
>> RKISP1_CIF_ISP_FRAME signal.
>> In case those signals arrive together then the code is not able to
>> tell if the RKISP1_CIF_ISP_FRAME signal relates to the frame of
>> the current v-start or the previous. This patch adds a WARN_ONCE
>> and a debugfs var to catch it.
>>
>> Signed-off-by: Dafna Hirschfeld <dafna.hirschfeld@collabora.com>
>> ---
>> drivers/staging/media/rkisp1/rkisp1-common.h | 1 +
>> drivers/staging/media/rkisp1/rkisp1-dev.c | 2 ++
>> drivers/staging/media/rkisp1/rkisp1-isp.c | 5 +++++
>> 3 files changed, 8 insertions(+)
>>
>> diff --git a/drivers/staging/media/rkisp1/rkisp1-common.h b/drivers/staging/media/rkisp1/rkisp1-common.h
>> index 79edece6ee77..5aed0e37850a 100644
>> --- a/drivers/staging/media/rkisp1/rkisp1-common.h
>> +++ b/drivers/staging/media/rkisp1/rkisp1-common.h
>> @@ -228,6 +228,7 @@ struct rkisp1_debug {
>> unsigned long outform_size_error;
>> unsigned long img_stabilization_size_error;
>> unsigned long inform_size_error;
>> + unsigned long irq_delay;
>> unsigned long mipi_error;
>> unsigned long stats_error;
>> unsigned long stop_timeout[2];
>> diff --git a/drivers/staging/media/rkisp1/rkisp1-dev.c b/drivers/staging/media/rkisp1/rkisp1-dev.c
>> index a0eb8f08708b..557de940286b 100644
>> --- a/drivers/staging/media/rkisp1/rkisp1-dev.c
>> +++ b/drivers/staging/media/rkisp1/rkisp1-dev.c
>> @@ -445,6 +445,8 @@ static void rkisp1_debug_init(struct rkisp1_device *rkisp1)
>> &debug->img_stabilization_size_error);
>> debugfs_create_ulong("inform_size_error", 0444, debug->debugfs_dir,
>> &debug->inform_size_error);
>> + debugfs_create_ulong("irq_delay", 0444, debug->debugfs_dir,
>> + &debug->irq_delay);
>> debugfs_create_ulong("mipi_error", 0444, debug->debugfs_dir,
>> &debug->mipi_error);
>> debugfs_create_ulong("stats_error", 0444, debug->debugfs_dir,
>> diff --git a/drivers/staging/media/rkisp1/rkisp1-isp.c b/drivers/staging/media/rkisp1/rkisp1-isp.c
>> index 1ffe7cc7bb12..33cfad19dde2 100644
>> --- a/drivers/staging/media/rkisp1/rkisp1-isp.c
>> +++ b/drivers/staging/media/rkisp1/rkisp1-isp.c
>> @@ -1118,6 +1118,11 @@ void rkisp1_isp_isr(struct rkisp1_device *rkisp1)
>> */
>> rkisp1->isp.frame_sequence++;
>> rkisp1_isp_queue_event_sof(&rkisp1->isp);
>> + if (status & RKISP1_CIF_ISP_FRAME) {
>> + WARN_ONCE(1, "irq delay is too long, buffers might not be in sync\n");
>> + rkisp1->debug.irq_delay++;
>> + }
>> + }
>
> I was wondering, if both interrupts arrive at the same time, shouldn't we handle the
> frame before incrementing the frame_sequence?
>
> I mean, move the code block
>
> if (status & RKISP1_CIF_ISP_V_START) {...}
>
> after this other code block
>
> if (status & RKISP1_CIF_ISP_FRAME) {...}
When the two interrupts arrive together it is not clear if the frame interrupt belongs
to the current v-start or the previous one, this is why I added this debugfs var.
So it is a bit of guessing what should be done first. Maybe changing the order is generally
more correct. I discussed that with Tomasz https://patchwork.kernel.org/patch/11066513/#23544763
Thanks,
Dafna
>
>
> Thanks,
> Helen
>
>>
>> if (status & RKISP1_CIF_ISP_PIC_SIZE_ERROR) {
>> /* Clear pic_size_error */
>>
_______________________________________________
Linux-rockchip mailing list
Linux-rockchip@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-rockchip
next prev parent reply other threads:[~2020-08-18 6:46 UTC|newest]
Thread overview: 71+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-08-15 10:37 [PATCH v2 00/14] media: staging: rkisp1: various bug fixes Dafna Hirschfeld
2020-08-15 10:37 ` Dafna Hirschfeld
2020-08-15 10:37 ` [PATCH v2 01/14] media: staging: rkisp1: call params isr only upon frame out Dafna Hirschfeld
2020-08-15 10:37 ` Dafna Hirschfeld
2020-08-17 21:46 ` Helen Koike
2020-08-17 21:46 ` Helen Koike
2020-08-15 10:37 ` [PATCH v2 02/14] media: staging: rkisp1: params: use rkisp1_param_set_bits to set reg in isr Dafna Hirschfeld
2020-08-15 10:37 ` Dafna Hirschfeld
2020-08-17 21:46 ` Helen Koike
2020-08-17 21:46 ` Helen Koike
2020-08-15 10:37 ` [PATCH v2 03/14] media: staging: rkisp1: params: use the new effect value in cproc config Dafna Hirschfeld
2020-08-15 10:37 ` Dafna Hirschfeld
2020-08-17 21:46 ` Helen Koike
2020-08-17 21:46 ` Helen Koike
2020-08-15 10:37 ` [PATCH v2 04/14] media: staging: rkisp1: params: don't release lock in isr before buffer is done Dafna Hirschfeld
2020-08-15 10:37 ` Dafna Hirschfeld
2020-08-17 21:47 ` Helen Koike
2020-08-17 21:47 ` Helen Koike
2020-08-15 10:37 ` [PATCH v2 05/14] media: staging: rkisp1: params: upon stream stop, iterate a local list to return the buffers Dafna Hirschfeld
2020-08-15 10:37 ` Dafna Hirschfeld
2020-08-17 21:47 ` Helen Koike
2020-08-17 21:47 ` Helen Koike
2020-08-20 9:27 ` Hans Verkuil
2020-08-20 9:27 ` Hans Verkuil
2020-08-20 12:16 ` Helen Koike
2020-08-20 12:16 ` Helen Koike
2020-08-15 10:37 ` [PATCH v2 06/14] media: staging: rkisp1: params: in the isr, return if buffer list is empty Dafna Hirschfeld
2020-08-15 10:37 ` Dafna Hirschfeld
2020-08-17 21:47 ` Helen Koike
2020-08-17 21:47 ` Helen Koike
2020-08-15 10:37 ` [PATCH v2 07/14] media: staging: rkisp1: params: avoid using buffer if params is not streaming Dafna Hirschfeld
2020-08-15 10:37 ` Dafna Hirschfeld
2020-08-16 4:28 ` kernel test robot
2020-08-16 4:28 ` kernel test robot
2020-08-16 4:28 ` kernel test robot
2020-08-17 21:47 ` Helen Koike
2020-08-17 21:47 ` Helen Koike
2020-08-15 10:37 ` [PATCH v2 08/14] media: staging: rkisp1: params: set vb.sequence to be the isp's frame_sequence + 1 Dafna Hirschfeld
2020-08-15 10:37 ` Dafna Hirschfeld
2020-08-17 21:47 ` Helen Koike
2020-08-17 21:47 ` Helen Koike
2020-08-15 10:37 ` [PATCH v2 09/14] media: staging: rkisp1: remove atomic operations for frame sequence Dafna Hirschfeld
2020-08-15 10:37 ` Dafna Hirschfeld
2020-08-17 21:48 ` Helen Koike
2020-08-17 21:48 ` Helen Koike
2020-09-17 16:41 ` Dafna Hirschfeld
2020-09-17 16:41 ` Dafna Hirschfeld
2020-08-15 10:37 ` [PATCH v2 10/14] media: staging: rkisp1: isp: add a warning and debugfs var for irq delay Dafna Hirschfeld
2020-08-15 10:37 ` Dafna Hirschfeld
2020-08-17 21:48 ` Helen Koike
2020-08-17 21:48 ` Helen Koike
2020-08-18 6:46 ` Dafna Hirschfeld [this message]
2020-08-18 6:46 ` Dafna Hirschfeld
2020-08-15 10:37 ` [PATCH v2 11/14] media: staging: rkisp1: isp: don't enable signal RKISP1_CIF_ISP_FRAME_IN Dafna Hirschfeld
2020-08-15 10:37 ` Dafna Hirschfeld
2020-08-17 21:48 ` Helen Koike
2020-08-17 21:48 ` Helen Koike
2020-08-18 6:37 ` Dafna Hirschfeld
2020-08-18 6:37 ` Dafna Hirschfeld
2020-08-15 10:37 ` [PATCH v2 12/14] media: staging: rkisp1: stats: protect write to 'is_streaming' in start_streaming cb Dafna Hirschfeld
2020-08-15 10:37 ` Dafna Hirschfeld
2020-08-17 21:48 ` Helen Koike
2020-08-17 21:48 ` Helen Koike
2020-08-15 10:37 ` [PATCH v2 13/14] media: staging: rkisp1: call media_pipeline_start/stop from stats and params Dafna Hirschfeld
2020-08-15 10:37 ` Dafna Hirschfeld
2020-08-17 21:48 ` Helen Koike
2020-08-17 21:48 ` Helen Koike
2020-08-15 10:37 ` [PATCH v2 14/14] media: staging: rkisp1: params: no need to lock default config Dafna Hirschfeld
2020-08-15 10:37 ` Dafna Hirschfeld
2020-08-17 21:48 ` Helen Koike
2020-08-17 21:48 ` Helen Koike
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=04b3fab5-5501-058c-9145-ebbbe851eb94@collabora.com \
--to=dafna.hirschfeld@collabora.com \
--cc=dafna3@gmail.com \
--cc=ezequiel@collabora.com \
--cc=helen.koike@collabora.com \
--cc=hverkuil@xs4all.nl \
--cc=kernel@collabora.com \
--cc=laurent.pinchart@ideasonboard.com \
--cc=linux-media@vger.kernel.org \
--cc=linux-rockchip@lists.infradead.org \
--cc=mchehab@kernel.org \
--cc=sakari.ailus@linux.intel.com \
--cc=tfiga@chromium.org \
/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 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.