From: Tomasz Figa <tfiga@chromium.org>
To: Hans Verkuil <hverkuil@xs4all.nl>
Cc: "Jerry-ch Chen" <Jerry-Ch.chen@mediatek.com>,
"Laurent Pinchart" <laurent.pinchart+renesas@ideasonboard.com>,
"Matthias Brugger" <matthias.bgg@gmail.com>,
"Mauro Carvalho Chehab" <mchehab@kernel.org>,
"Pi-Hsun Shih" <pihsun@chromium.org>,
yuzhao@chromium.org, zwisler@chromium.org,
"moderated list:ARM/Mediatek SoC support"
<linux-mediatek@lists.infradead.org>,
"list@263.net:IOMMU DRIVERS <iommu@lists.linux-foundation.org>,
Joerg Roedel <joro@8bytes.org>,"
<linux-arm-kernel@lists.infradead.org>,
"Sean Cheng (鄭昇弘)" <Sean.Cheng@mediatek.com>,
"Sj Huang" <sj.huang@mediatek.com>,
"Christie Yu (游雅惠)" <christie.yu@mediatek.com>,
"Frederic Chen (陳俊元)" <frederic.chen@mediatek.com>,
"Jungo Lin (林明俊)" <jungo.lin@mediatek.com>,
"Rynn Wu (吳育恩)" <Rynn.Wu@mediatek.com>,
"Linux Media Mailing List" <linux-media@vger.kernel.org>,
srv_heupstream <srv_heupstream@mediatek.com>,
linux-devicetree <devicetree@vger.kernel.org>,
"Jerry-ch Chen" <jerry-ch.chen@mediatek.corp-partner.google.com>
Subject: Re: [RFC PATCH V4 1/4] media: v4l2-mem2mem: add v4l2_m2m_suspend, v4l2_m2m_resume
Date: Wed, 10 Jun 2020 12:32:56 +0200 [thread overview]
Message-ID: <CAAFQd5Ad_cnv0qztZOk9c2H0Y+XO6tRcRmS1t4dBw5qbG-d8Nw@mail.gmail.com> (raw)
In-Reply-To: <e31fe64a-c5c1-7b1e-eec1-27111fe43ac2@xs4all.nl>
On Wed, Jun 10, 2020 at 12:29 PM Hans Verkuil <hverkuil@xs4all.nl> wrote:
>
> On 21/05/2020 19:11, Tomasz Figa wrote:
> > Hi Jerry,
> >
> > On Wed, Dec 04, 2019 at 08:47:29PM +0800, Jerry-ch Chen wrote:
> >> From: Pi-Hsun Shih <pihsun@chromium.org>
> >>
> >> Add two functions that can be used to stop new jobs from being queued /
> >> continue running queued job. This can be used while a driver using m2m
> >> helper is going to suspend / wake up from resume, and can ensure that
> >> there's no job running in suspend process.
> >>
> >> BUG=b:143046833
> >> TEST=build
> >>
> >> Signed-off-by: Pi-Hsun Shih <pihsun@chromium.org>
> >> Signed-off-by: Jerry-ch Chen <jerry-ch.chen@mediatek.corp-partner.google.com>
> >> ---
> >> drivers/media/v4l2-core/v4l2-mem2mem.c | 40 ++++++++++++++++++++++++++
> >> include/media/v4l2-mem2mem.h | 22 ++++++++++++++
> >> 2 files changed, 62 insertions(+)
> >>
> >> diff --git a/drivers/media/v4l2-core/v4l2-mem2mem.c b/drivers/media/v4l2-core/v4l2-mem2mem.c
> >> index 5bbdec55b7d7..76ba203e0035 100644
> >> --- a/drivers/media/v4l2-core/v4l2-mem2mem.c
> >> +++ b/drivers/media/v4l2-core/v4l2-mem2mem.c
> >> @@ -47,6 +47,10 @@ module_param(debug, bool, 0644);
> >> #define TRANS_ABORT (1 << 2)
> >>
> >>
> >> +/* The job queue is not running new jobs */
> >> +#define QUEUE_PAUSED (1 << 0)
> >> +
> >> +
> >> /* Offset base for buffers on the destination queue - used to distinguish
> >> * between source and destination buffers when mmapping - they receive the same
> >> * offsets but for different queues */
> >> @@ -88,6 +92,7 @@ static const char * const m2m_entity_name[] = {
> >> * @job_queue: instances queued to run
> >> * @job_spinlock: protects job_queue
> >> * @job_work: worker to run queued jobs.
> >> + * @job_queue_flags: flags of the queue status, %QUEUE_PAUSED.
> >> * @m2m_ops: driver callbacks
> >> */
> >> struct v4l2_m2m_dev {
> >> @@ -105,6 +110,7 @@ struct v4l2_m2m_dev {
> >> struct list_head job_queue;
> >> spinlock_t job_spinlock;
> >> struct work_struct job_work;
> >> + unsigned long job_queue_flags;
> >>
> >> const struct v4l2_m2m_ops *m2m_ops;
> >> };
> >> @@ -267,6 +273,12 @@ static void v4l2_m2m_try_run(struct v4l2_m2m_dev *m2m_dev)
> >> return;
> >> }
> >>
> >> + if (m2m_dev->job_queue_flags & QUEUE_PAUSED) {
> >> + spin_unlock_irqrestore(&m2m_dev->job_spinlock, flags);
> >> + dprintk("Running new jobs is paused\n");
> >> + return;
> >> + }
> >> +
> >> m2m_dev->curr_ctx = list_first_entry(&m2m_dev->job_queue,
> >> struct v4l2_m2m_ctx, queue);
> >> m2m_dev->curr_ctx->job_flags |= TRANS_RUNNING;
> >> @@ -447,6 +459,34 @@ void v4l2_m2m_job_finish(struct v4l2_m2m_dev *m2m_dev,
> >> }
> >> EXPORT_SYMBOL(v4l2_m2m_job_finish);
> >>
> >> +void v4l2_m2m_suspend(struct v4l2_m2m_dev *m2m_dev)
> >> +{
> >> + unsigned long flags;
> >> + struct v4l2_m2m_ctx *curr_ctx;
> >> +
> >> + spin_lock_irqsave(&m2m_dev->job_spinlock, flags);
> >> + m2m_dev->job_queue_flags |= QUEUE_PAUSED;
> >> + curr_ctx = m2m_dev->curr_ctx;
> >> + spin_unlock_irqrestore(&m2m_dev->job_spinlock, flags);
> >> +
> >> + if (curr_ctx)
> >> + wait_event(curr_ctx->finished,
> >> + !(curr_ctx->job_flags & TRANS_RUNNING));
> >> +}
> >> +EXPORT_SYMBOL(v4l2_m2m_suspend);
> >> +
> >> +void v4l2_m2m_resume(struct v4l2_m2m_dev *m2m_dev)
> >> +{
> >> + unsigned long flags;
> >> +
> >> + spin_lock_irqsave(&m2m_dev->job_spinlock, flags);
> >> + m2m_dev->job_queue_flags &= ~QUEUE_PAUSED;
> >> + spin_unlock_irqrestore(&m2m_dev->job_spinlock, flags);
> >> +
> >> + v4l2_m2m_try_run(m2m_dev);
> >> +}
> >> +EXPORT_SYMBOL(v4l2_m2m_resume);
> >> +
> >> int v4l2_m2m_reqbufs(struct file *file, struct v4l2_m2m_ctx *m2m_ctx,
> >> struct v4l2_requestbuffers *reqbufs)
> >> {
> >> diff --git a/include/media/v4l2-mem2mem.h b/include/media/v4l2-mem2mem.h
> >> index 5467264771ec..119a195da390 100644
> >> --- a/include/media/v4l2-mem2mem.h
> >> +++ b/include/media/v4l2-mem2mem.h
> >> @@ -183,6 +183,28 @@ v4l2_m2m_buf_done(struct vb2_v4l2_buffer *buf, enum vb2_buffer_state state)
> >> vb2_buffer_done(&buf->vb2_buf, state);
> >> }
> >>
> >> +/**
> >> + * v4l2_m2m_suspend() - stop new jobs from being run and wait for current job
> >> + * to finish
> >> + *
> >> + * @m2m_dev: opaque pointer to the internal data to handle M2M context
> >> + *
> >> + * Called by a driver in the suspend hook. Stop new jobs from being run, and
> >> + * wait for current running job to finish.
> >> + */
> >> +void v4l2_m2m_suspend(struct v4l2_m2m_dev *m2m_dev);
> >> +
> >> +/**
> >> + * v4l2_m2m_resume() - resume job running and try to run a queued job
> >> + *
> >> + * @m2m_dev: opaque pointer to the internal data to handle M2M context
> >> + *
> >> + * Called by a driver in the resume hook. This reverts the operation of
> >> + * v4l2_m2m_suspend() and allows job to be run. Also try to run a queued job if
> >> + * there is any.
> >> + */
> >> +void v4l2_m2m_resume(struct v4l2_m2m_dev *m2m_dev);
> >> +
> >> /**
> >> * v4l2_m2m_reqbufs() - multi-queue-aware REQBUFS multiplexer
> >> *
> >> --
> >> 2.18.0
> >
> > Reviewed-by: Tomasz Figa <tfiga@chromium.org>
> >
> > [Corrected Hans's email address.]
> > Hans, does this look good to you?
>
> Yes, this looks good.
>
> Sorry for the late reply.
No worries! Thanks a lot.
>
> I assume this will be part of a future patch series that calls these new functions?
The mtk-jpeg encoder series depends on this patch as well, so I guess
it would go together with whichever is ready first.
I would also envision someone changing the other existing drivers to
use the helpers, as I'm pretty much sure some of them don't handle
suspend/resume correctly.
Best regards,
Tomasz
next prev parent reply other threads:[~2020-06-10 10:33 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-12-04 12:47 [RFC PATCH V4 0/4] media: platform: Add support for Face Detection (FD) on mt8183 SoC Jerry-ch Chen
2019-12-04 12:47 ` [RFC PATCH V4 1/4] media: v4l2-mem2mem: add v4l2_m2m_suspend, v4l2_m2m_resume Jerry-ch Chen
2020-05-21 17:11 ` Tomasz Figa
2020-05-22 6:01 ` Jerry-ch Chen
2020-06-10 10:28 ` Hans Verkuil
2020-06-10 10:32 ` Tomasz Figa [this message]
2020-06-10 18:52 ` Ezequiel Garcia
2020-06-10 19:03 ` Tomasz Figa
2020-06-10 19:14 ` Ezequiel Garcia
2020-06-10 19:26 ` Tomasz Figa
2020-06-14 22:43 ` Ezequiel Garcia
2019-12-04 12:47 ` [RFC PATCH V4 2/4] dt-bindings: mt8183: Added FD dt-bindings Jerry-ch Chen
2019-12-04 18:58 ` Rob Herring
2020-05-06 8:41 ` Jerry-ch Chen
2019-12-04 12:47 ` [RFC PATCH V4 3/4] dts: arm64: mt8183: Add FD nodes Jerry-ch Chen
2019-12-04 12:47 ` [RFC PATCH V4 4/4] platform: mtk-isp: Add Mediatek FD driver Jerry-ch Chen
2020-05-21 18:28 ` Tomasz Figa
2020-05-22 14:10 ` Jerry-ch Chen
2020-05-25 12:24 ` Tomasz Figa
2020-05-29 12:26 ` Jerry-ch Chen
2020-05-29 12:59 ` Tomasz Figa
2020-06-01 10:37 ` Jerry-ch Chen
2020-05-08 2:02 ` [RFC PATCH V4 0/4] media: platform: Add support for Face Detection (FD) on mt8183 SoC Jerry-ch Chen
2020-05-13 21:45 ` Tomasz Figa
2020-05-21 18:38 ` Tomasz Figa
2020-06-30 14:10 ` Jerry-ch Chen
2020-06-30 17:19 ` Tomasz Figa
2020-11-11 11:51 ` Jerry-ch Chen
2020-11-12 4:26 ` Tomasz Figa
2020-11-12 12:05 ` Jerry-ch Chen
2020-12-28 17:02 ` Jerry-ch Chen
2021-01-06 6:30 ` Tomasz Figa
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=CAAFQd5Ad_cnv0qztZOk9c2H0Y+XO6tRcRmS1t4dBw5qbG-d8Nw@mail.gmail.com \
--to=tfiga@chromium.org \
--cc=Jerry-Ch.chen@mediatek.com \
--cc=Rynn.Wu@mediatek.com \
--cc=Sean.Cheng@mediatek.com \
--cc=christie.yu@mediatek.com \
--cc=devicetree@vger.kernel.org \
--cc=frederic.chen@mediatek.com \
--cc=hverkuil@xs4all.nl \
--cc=jerry-ch.chen@mediatek.corp-partner.google.com \
--cc=jungo.lin@mediatek.com \
--cc=laurent.pinchart+renesas@ideasonboard.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-media@vger.kernel.org \
--cc=linux-mediatek@lists.infradead.org \
--cc=matthias.bgg@gmail.com \
--cc=mchehab@kernel.org \
--cc=pihsun@chromium.org \
--cc=sj.huang@mediatek.com \
--cc=srv_heupstream@mediatek.com \
--cc=yuzhao@chromium.org \
--cc=zwisler@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 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).