From: Tomasz Figa <tfiga@chromium.org>
To: Helen Koike <helen.koike@collabora.com>
Cc: Mauro Carvalho Chehab <mchehab@kernel.org>,
Dafna Hirschfeld <dafna.hirschfeld@collabora.com>,
Dafna Hirschfeld <dafna3@gmail.com>,
Hans Verkuil <hverkuil@xs4all.nl>,
"open list:ARM/Rockchip SoC..."
<linux-rockchip@lists.infradead.org>,
Laurent Pinchart <laurent.pinchart@ideasonboard.com>,
Sakari Ailus <sakari.ailus@linux.intel.com>,
kernel@collabora.com, Ezequiel Garcia <ezequiel@collabora.com>,
Linux Media Mailing List <linux-media@vger.kernel.org>
Subject: Re: [PATCH v3 06/12] media: staging: rkisp1: remove atomic operations for frame sequence
Date: Tue, 10 Nov 2020 19:40:06 +0900 [thread overview]
Message-ID: <CAAFQd5BWAuzRMCDhYGAtBW-J61k81a-J-MXWgC7fD7kEne4sTg@mail.gmail.com> (raw)
In-Reply-To: <d6b893e1-1177-ba6d-0499-a3e45f79503b@collabora.com>
Hi Helen,
On Fri, Nov 6, 2020 at 11:43 PM Helen Koike <helen.koike@collabora.com> wrote:
>
> Hi Tomasz,
>
> (sorry for not had replied this earlier)
>
> On 10/2/20 12:30 PM, Tomasz Figa wrote:
> > On Fri, Oct 2, 2020 at 11:16 AM Dafna Hirschfeld
> > <dafna.hirschfeld@collabora.com> wrote:
> >>
> >> Hi,
> >>
> >> Am 25.09.20 um 22:42 schrieb Tomasz Figa:
> >>> Hi Dafna,
> >>>
> >>> On Tue, Sep 22, 2020 at 01:33:56PM +0200, Dafna Hirschfeld wrote:
> >>>> The isp.frame_sequence is now read only from the irq handlers
> >>>> that are all fired from the same interrupt, so there is not need
> >>>> for atomic operation.
> >>>> In addition, the frame seq incrementation is moved from
> >>>> rkisp1_isp_queue_event_sof to rkisp1_isp_isr to make the code
> >>>> clearer and the incorrect inline comment is removed.
> >>>>
> >>>> Signed-off-by: Dafna Hirschfeld <dafna.hirschfeld@collabora.com>
> >>>> Acked-by: Helen Koike <helen.koike@collabora.com>
> >>>>
> >>>> ---
> >>>> changes since v2:
> >>>> add a closing "}" to if condition
> >>>> remove usless inline comment
> >>>> ---
> >>>> drivers/staging/media/rkisp1/rkisp1-capture.c | 2 +-
> >>>> drivers/staging/media/rkisp1/rkisp1-common.h | 2 +-
> >>>> drivers/staging/media/rkisp1/rkisp1-isp.c | 16 +++++-----------
> >>>> drivers/staging/media/rkisp1/rkisp1-params.c | 2 +-
> >>>> drivers/staging/media/rkisp1/rkisp1-stats.c | 3 +--
> >>>> 5 files changed, 9 insertions(+), 16 deletions(-)
> >>>>
> >>>
> >>> Thank you for the patch. Please see my comments inline.
> >>>
> >>>> diff --git a/drivers/staging/media/rkisp1/rkisp1-capture.c b/drivers/staging/media/rkisp1/rkisp1-capture.c
> >>>> index 0632582a95b4..1c762a369b63 100644
> >>>> --- a/drivers/staging/media/rkisp1/rkisp1-capture.c
> >>>> +++ b/drivers/staging/media/rkisp1/rkisp1-capture.c
> >>>> @@ -632,7 +632,7 @@ static void rkisp1_handle_buffer(struct rkisp1_capture *cap)
> >>>> curr_buf = cap->buf.curr;
> >>>>
> >>>> if (curr_buf) {
> >>>> - curr_buf->vb.sequence = atomic_read(&isp->frame_sequence);
> >>>> + curr_buf->vb.sequence = isp->frame_sequence;
> >>>
> >>> I wonder if with higher resolutions, let's say full 5 Mpix, and/or some
> >>> memory-intensive system load, like video encoding and graphics rendering,
> >>> the DMA wouldn't take enough time to have the MI_FRAME interrupt fire after
> >>> the V_START for the next frame.
> >>>
> >>> I recall you did some testing back in time [1], showing that the two are
> >>> interleaved. Do you remember what CAPTURE resolution was it?
> >>
> >> I ran the testing again, I added a patch to allow streaming simultanously from
> >> both pathes: https://gitlab.collabora.com/dafna/linux/-/commit/8df0d15567b27cb88674fbbe33d1906c3c5a91da
> >> Then I ran two tests:
> >> stream simultaneously with 3280x2464 frames from the camera, and then downscaling them to 1920x1080 on selfpath, this is http://ix.io/2zoP
> >> stream simultaneously with 640x480 frames from the camera, and upscaling them to 1920x1080 on the selfpath. this is http://ix.io/2zoR
> >>
> >> the pixelformat for both is 422P.
> >> I don't know how meaningful and useful is to test it on the rockchip-pi4 board, I only use it with a serial console.
> >> The functionality can probably only be tested on the scarlet.
> >
> > Okay, thanks. It looks like there is always plenty of time margin on
> > the hardware side and if the interrupt handling is delayed for a short
> > time and both are handled by the same handler call, it's also going to
> > be handled fine because of rkisp1_capture_isr() being called before
> > rkisp1_isp_isr().
> >
> > By the way, do we need the MIPI interrupts every frame? Perhaps we
> > could enable the RKISP1_CIF_MIPI_ERR_CTRL* interrupts only and then,
> > when we get an error, we disable it and enable
> > RKISP1_CIF_MIPI_FRAME_END, which would then re-enable
> > RKISP1_CIF_MIPI_ERR_CTRL* and disable itself? WDYT?
>
> The driver already do this in a sense, it disables these interrupts on
> the first MIPI error and re-enable them on RKISP1_CIF_MIPI_FRAME_END.
Yes, it disables the ERR interrupts, but doesn't it keep the FRAME_END
interrupt enabled all the time? (At least that seems to be the case in
your traces.) Is it necessary?
Best regards,
Tomasz
>
> Please check:
>
> https://git.linuxtv.org/media_tree.git/tree/drivers/staging/media/rkisp1/rkisp1-isp.c#n1069
>
> For convenience:
>
> void rkisp1_mipi_isr(struct rkisp1_device *rkisp1)
> {
> u32 val, status;
>
> status = rkisp1_read(rkisp1, RKISP1_CIF_MIPI_MIS);
> if (!status)
> return;
>
> rkisp1_write(rkisp1, status, RKISP1_CIF_MIPI_ICR);
>
> /*
> * Disable DPHY errctrl interrupt, because this dphy
> * erctrl signal is asserted until the next changes
> * of line state. This time is may be too long and cpu
> * is hold in this interrupt.
> */
> if (status & RKISP1_CIF_MIPI_ERR_CTRL(0x0f)) {
> val = rkisp1_read(rkisp1, RKISP1_CIF_MIPI_IMSC);
> rkisp1_write(rkisp1, val & ~RKISP1_CIF_MIPI_ERR_CTRL(0x0f),
> RKISP1_CIF_MIPI_IMSC);
> rkisp1->isp.is_dphy_errctrl_disabled = true;
> }
>
> /*
> * Enable DPHY errctrl interrupt again, if mipi have receive
> * the whole frame without any error.
> */
> if (status == RKISP1_CIF_MIPI_FRAME_END) {
> /*
> * Enable DPHY errctrl interrupt again, if mipi have receive
> * the whole frame without any error.
> */
> if (rkisp1->isp.is_dphy_errctrl_disabled) {
> val = rkisp1_read(rkisp1, RKISP1_CIF_MIPI_IMSC);
> val |= RKISP1_CIF_MIPI_ERR_CTRL(0x0f);
> rkisp1_write(rkisp1, val, RKISP1_CIF_MIPI_IMSC);
> rkisp1->isp.is_dphy_errctrl_disabled = false;
> }
> } else {
> rkisp1->debug.mipi_error++;
> }
> }
>
> Regards,
> Helen
>
> >
> > Best regards,
> > Tomasz
> >
> >>
> >> Thanks,
> >> Dafna
> >>
> >>
> >>
> >>>
> >>>> curr_buf->vb.vb2_buf.timestamp = ktime_get_boottime_ns();
> >>>> curr_buf->vb.field = V4L2_FIELD_NONE;
> >>>> vb2_buffer_done(&curr_buf->vb.vb2_buf, VB2_BUF_STATE_DONE);
> >>>> diff --git a/drivers/staging/media/rkisp1/rkisp1-common.h b/drivers/staging/media/rkisp1/rkisp1-common.h
> >>>> index 232bee92d0eb..51c92a251ea5 100644
> >>>> --- a/drivers/staging/media/rkisp1/rkisp1-common.h
> >>>> +++ b/drivers/staging/media/rkisp1/rkisp1-common.h
> >>>> @@ -131,7 +131,7 @@ struct rkisp1_isp {
> >>>> const struct rkisp1_isp_mbus_info *src_fmt;
> >>>> struct mutex ops_lock; /* serialize the subdevice ops */
> >>>> bool is_dphy_errctrl_disabled;
> >>>> - atomic_t frame_sequence;
> >>>> + __u32 frame_sequence;
> >>>
> >>> nit: The __ prefixed types are defined for the UAPI to avoid covering userspace
> >>> types. For kernel types please just use the plain u32.
> >>>
> >>> Best regards,
> >>> Tomasz
> >>>
> >
_______________________________________________
Linux-rockchip mailing list
Linux-rockchip@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-rockchip
next prev parent reply other threads:[~2020-11-10 10:40 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-09-22 11:33 [PATCH v3 00/12] media: staging: rkisp1: various bug fixes Dafna Hirschfeld
2020-09-22 11:33 ` [PATCH v3 01/12] media: staging: rkisp1: params: upon stream stop, iterate a local list to return the buffers Dafna Hirschfeld
2020-09-25 19:08 ` Tomasz Figa
2020-09-22 11:33 ` [PATCH v3 02/12] media: staging: rkisp1: params: in the isr, return if buffer list is empty Dafna Hirschfeld
2020-09-22 11:33 ` [PATCH v3 03/12] media: staging: rkisp1: params: use the new effect value in cproc config Dafna Hirschfeld
2020-09-22 11:33 ` [PATCH v3 04/12] media: staging: rkisp1: params: avoid using buffer if params is not streaming Dafna Hirschfeld
2020-09-25 20:16 ` Tomasz Figa
2020-09-22 11:33 ` [PATCH v3 05/12] media: staging: rkisp1: params: set vb.sequence to be the isp's frame_sequence + 1 Dafna Hirschfeld
2020-09-22 11:33 ` [PATCH v3 06/12] media: staging: rkisp1: remove atomic operations for frame sequence Dafna Hirschfeld
2020-09-25 20:42 ` Tomasz Figa
2020-10-02 9:16 ` Dafna Hirschfeld
2020-10-02 15:30 ` Tomasz Figa
2020-11-06 14:43 ` Helen Koike
2020-11-10 10:40 ` Tomasz Figa [this message]
2020-09-22 11:33 ` [PATCH v3 07/12] media: staging: rkisp1: isp: add a warning and debugfs var for irq delay Dafna Hirschfeld
2020-09-22 11:33 ` [PATCH v3 08/12] media: staging: rkisp1: isp: don't enable signal RKISP1_CIF_ISP_FRAME_IN Dafna Hirschfeld
2020-09-22 11:33 ` [PATCH v3 09/12] media: staging: rkisp1: stats: protect write to 'is_streaming' in start_streaming cb Dafna Hirschfeld
2020-09-25 20:47 ` Tomasz Figa
2020-09-22 11:34 ` [PATCH v3 10/12] media: staging: rkisp1: params: no need to lock default config Dafna Hirschfeld
2020-09-22 11:34 ` [PATCH v3 11/12] media: staging: rkisp1: use the right variants of spin_lock Dafna Hirschfeld
2020-09-25 20:51 ` Tomasz Figa
2020-09-22 11:34 ` [PATCH v3 12/12] media: staging: rkisp1: cap: protect access to buf with the spin lock Dafna Hirschfeld
2020-09-25 20:53 ` Tomasz Figa
2020-09-27 9:43 ` Mauro Carvalho Chehab
2020-09-27 9:54 ` Dafna Hirschfeld
2020-09-27 11:05 ` Mauro Carvalho Chehab
2020-09-28 15:29 ` Dafna Hirschfeld
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=CAAFQd5BWAuzRMCDhYGAtBW-J61k81a-J-MXWgC7fD7kEne4sTg@mail.gmail.com \
--to=tfiga@chromium.org \
--cc=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 \
/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;
as well as URLs for NNTP newsgroup(s).