From: Maxime Ripard <maxime.ripard@bootlin.com>
To: Paul Kocialkowski <paul.kocialkowski@bootlin.com>
Cc: hans.verkuil@cisco.com, acourbot@chromium.org,
sakari.ailus@linux.intel.com,
Laurent Pinchart <laurent.pinchart@ideasonboard.com>,
tfiga@chromium.org, posciak@chromium.org,
Chen-Yu Tsai <wens@csie.org>,
linux-kernel@vger.kernel.org,
linux-arm-kernel@lists.infradead.org,
linux-media@vger.kernel.org, nicolas.dufresne@collabora.com,
jenskuske@gmail.com, linux-sunxi@googlegroups.com,
Thomas Petazzoni <thomas.petazzoni@bootlin.com>
Subject: Re: [PATCH 7/9] media: cedrus: Move IRQ maintainance to cedrus_dec_ops
Date: Mon, 25 Jun 2018 18:15:22 +0200 [thread overview]
Message-ID: <20180625161522.mwl3bhiuly4bkdsh@flea> (raw)
In-Reply-To: <b222fae80b1b212fdc5171a39b9a761527931eb0.camel@bootlin.com>
[-- Attachment #1: Type: text/plain, Size: 4811 bytes --]
On Mon, Jun 25, 2018 at 04:18:51PM +0200, Paul Kocialkowski wrote:
> Hi,
>
> On Thu, 2018-06-21 at 17:35 +0200, Paul Kocialkowski wrote:
> > Hi,
> >
> > On Wed, 2018-06-13 at 16:07 +0200, Maxime Ripard wrote:
> > > The IRQ handler up until now was hardcoding the use of the MPEG engine to
> > > read the interrupt status, clear it and disable the interrupts.
> > >
> > > Obviously, that won't work really well with the introduction of new codecs
> > > that use a separate engine with a separate register set.
> > >
> > > In order to make this more future proof, introduce new decodec operations
> > > to deal with the interrupt management. The only one missing is the one to
> > > enable the interrupts in the first place, but that's taken care of by the
> > > trigger hook for now.
> >
> > Acked-by: Paul Kocialkowski <paul.kocialkowski@bootlin.com>
>
> Scratch that for now, I just thought of something here (see below).
>
> > > Signed-off-by: Maxime Ripard <maxime.ripard@bootlin.com>
> > > ---
> > > .../sunxi/cedrus/sunxi_cedrus_common.h | 9 +++++
> > > .../platform/sunxi/cedrus/sunxi_cedrus_hw.c | 21 ++++++------
> > > .../sunxi/cedrus/sunxi_cedrus_mpeg2.c | 33 +++++++++++++++++++
> > > 3 files changed, 53 insertions(+), 10 deletions(-)
> > >
> > > diff --git a/drivers/media/platform/sunxi/cedrus/sunxi_cedrus_common.h b/drivers/media/platform/sunxi/cedrus/sunxi_cedrus_common.h
> > > index c2e2c92d103b..a2a507eb9fc9 100644
> > > --- a/drivers/media/platform/sunxi/cedrus/sunxi_cedrus_common.h
> > > +++ b/drivers/media/platform/sunxi/cedrus/sunxi_cedrus_common.h
> > > @@ -108,7 +108,16 @@ struct sunxi_cedrus_buffer *vb2_to_cedrus_buffer(const struct vb2_buffer *p)
> > > return vb2_v4l2_to_cedrus_buffer(to_vb2_v4l2_buffer(p));
> > > }
> > >
> > > +enum sunxi_cedrus_irq_status {
> > > + SUNXI_CEDRUS_IRQ_NONE,
> > > + SUNXI_CEDRUS_IRQ_ERROR,
> > > + SUNXI_CEDRUS_IRQ_OK,
> > > +};
> > > +
> > > struct sunxi_cedrus_dec_ops {
> > > + void (*irq_clear)(struct sunxi_cedrus_ctx *ctx);
> > > + void (*irq_disable)(struct sunxi_cedrus_ctx *ctx);
> > > + enum sunxi_cedrus_irq_status (*irq_status)(struct sunxi_cedrus_ctx *ctx);
> > > void (*setup)(struct sunxi_cedrus_ctx *ctx,
> > > struct sunxi_cedrus_run *run);
> > > void (*trigger)(struct sunxi_cedrus_ctx *ctx);
> > > diff --git a/drivers/media/platform/sunxi/cedrus/sunxi_cedrus_hw.c b/drivers/media/platform/sunxi/cedrus/sunxi_cedrus_hw.c
> > > index bb46a01214e0..6b97cbd2834e 100644
> > > --- a/drivers/media/platform/sunxi/cedrus/sunxi_cedrus_hw.c
> > > +++ b/drivers/media/platform/sunxi/cedrus/sunxi_cedrus_hw.c
> > > @@ -77,27 +77,28 @@ static irqreturn_t sunxi_cedrus_ve_irq(int irq, void *dev_id)
> > > struct sunxi_cedrus_ctx *ctx;
> > > struct sunxi_cedrus_buffer *src_buffer, *dst_buffer;
> > > struct vb2_v4l2_buffer *src_vb, *dst_vb;
> > > + enum sunxi_cedrus_irq_status status;
> > > unsigned long flags;
> > > - unsigned int value, status;
> > >
> > > spin_lock_irqsave(&dev->irq_lock, flags);
> > >
> > > - /* Disable MPEG interrupts and stop the MPEG engine */
> > > - value = sunxi_cedrus_read(dev, VE_MPEG_CTRL);
> > > - sunxi_cedrus_write(dev, value & (~0xf), VE_MPEG_CTRL);
> > > -
> > > - status = sunxi_cedrus_read(dev, VE_MPEG_STATUS);
> > > - sunxi_cedrus_write(dev, 0x0000c00f, VE_MPEG_STATUS);
> > > - sunxi_cedrus_engine_disable(dev);
> > > -
> > > ctx = v4l2_m2m_get_curr_priv(dev->m2m_dev);
> > > if (!ctx) {
> > > pr_err("Instance released before the end of transaction\n");
> > > spin_unlock_irqrestore(&dev->irq_lock, flags);
> > >
> > > - return IRQ_HANDLED;
> > > + return IRQ_NONE;
> > > }
> > >
> > > + status = dev->dec_ops[ctx->current_codec]->irq_status(ctx);
> > > + if (status == SUNXI_CEDRUS_IRQ_NONE) {
> > > + spin_unlock_irqrestore(&dev->irq_lock, flags);
> > > + return IRQ_NONE;
> > > + }
> > > +
> > > + dev->dec_ops[ctx->current_codec]->irq_disable(ctx);
> > > + dev->dec_ops[ctx->current_codec]->irq_clear(ctx);
> > > +
> > > src_vb = v4l2_m2m_src_buf_remove(ctx->fh.m2m_ctx);
> > > dst_vb = v4l2_m2m_dst_buf_remove(ctx->fh.m2m_ctx);
>
> Later in that file, there is still some checking that the first bit of
> status is set:
>
> /* First bit of MPEG_STATUS indicates success. */
> if (ctx->job_abort || !(status & 0x01))
>
> So !(status & 0x01) must be replaced with status != CEDRUS_IRQ_OK.
>
> It seems that was working "by accident", with CEDRUS_IRQ_OK probably
> being set by the compiler to 0x03.
Yeah, I noticed this already and this was fixed for the v2 :)
Maxime
--
Maxime Ripard, Bootlin (formerly Free Electrons)
Embedded Linux and Kernel engineering
https://bootlin.com
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
next prev parent reply other threads:[~2018-06-25 16:15 UTC|newest]
Thread overview: 51+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-06-13 14:07 [PATCH 0/9] media: cedrus: Add H264 decoding support Maxime Ripard
2018-06-13 14:07 ` [PATCH 1/9] CHROMIUM: v4l: Add H264 low-level decoder API compound controls Maxime Ripard
2018-06-15 11:59 ` Hans Verkuil
2018-06-15 13:01 ` Guenter Roeck
2018-07-12 16:38 ` Maxime Ripard
2018-07-12 16:47 ` Andrew Lunn
2018-06-21 8:58 ` Paul Kocialkowski
2018-08-21 16:58 ` Ezequiel Garcia
2018-08-21 17:07 ` Nicolas Dufresne
2018-08-22 13:07 ` Paul Kocialkowski
2018-08-22 13:38 ` Tomasz Figa
2018-08-22 13:52 ` Nicolas Dufresne
2018-08-22 14:45 ` Paul Kocialkowski
2018-08-28 8:11 ` Tomasz Figa
2018-09-07 7:54 ` Tomasz Figa
2018-08-22 9:15 ` Maxime Ripard
2018-08-22 9:54 ` Tomasz Figa
2018-08-22 13:03 ` Paul Kocialkowski
2018-08-22 13:24 ` Tomasz Figa
2018-08-22 14:03 ` Nicolas Dufresne
2018-08-22 14:30 ` Paul Kocialkowski
2018-06-13 14:07 ` [PATCH 2/9] media: cedrus: Add wrappers around container_of for our buffers Maxime Ripard
2018-06-21 9:03 ` Paul Kocialkowski
2018-06-13 14:07 ` [PATCH 3/9] media: cedrus: Add a macro to check for the validity of a control Maxime Ripard
2018-06-21 9:13 ` Paul Kocialkowski
2018-06-13 14:07 ` [PATCH 4/9] media: cedrus: make engine type more generic Maxime Ripard
2018-06-21 9:33 ` Paul Kocialkowski
2018-06-13 14:07 ` [PATCH 5/9] media: cedrus: Remove MPEG1 support Maxime Ripard
2018-06-13 14:07 ` [PATCH 6/9] media: cedrus: Add ops structure Maxime Ripard
2018-06-21 9:49 ` Paul Kocialkowski
2018-06-25 13:29 ` Maxime Ripard
2018-06-25 13:48 ` Paul Kocialkowski
2018-06-13 14:07 ` [PATCH 7/9] media: cedrus: Move IRQ maintainance to cedrus_dec_ops Maxime Ripard
2018-06-21 15:35 ` Paul Kocialkowski
2018-06-25 14:18 ` Paul Kocialkowski
2018-06-25 16:15 ` Maxime Ripard [this message]
2018-06-25 15:38 ` Paul Kocialkowski
2018-06-25 15:49 ` Paul Kocialkowski
2018-06-25 19:01 ` Maxime Ripard
2018-06-27 17:58 ` Maxime Ripard
2018-06-13 14:07 ` [PATCH 8/9] media: cedrus: Add start and stop decoder operations Maxime Ripard
2018-06-21 15:38 ` Paul Kocialkowski
2018-06-25 13:32 ` Maxime Ripard
2018-06-25 13:42 ` Paul Kocialkowski
2018-06-13 14:07 ` [PATCH 9/9] media: cedrus: Add H264 decoding support Maxime Ripard
2018-07-27 13:56 ` Paul Kocialkowski
2018-07-27 14:01 ` Chen-Yu Tsai
2018-07-27 14:03 ` Paul Kocialkowski
2018-07-30 12:54 ` Paul Kocialkowski
2018-06-14 13:00 ` [PATCH 0/9] " Tomasz Figa
2018-06-14 16:37 ` Maxime Ripard
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=20180625161522.mwl3bhiuly4bkdsh@flea \
--to=maxime.ripard@bootlin.com \
--cc=acourbot@chromium.org \
--cc=hans.verkuil@cisco.com \
--cc=jenskuske@gmail.com \
--cc=laurent.pinchart@ideasonboard.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-media@vger.kernel.org \
--cc=linux-sunxi@googlegroups.com \
--cc=nicolas.dufresne@collabora.com \
--cc=paul.kocialkowski@bootlin.com \
--cc=posciak@chromium.org \
--cc=sakari.ailus@linux.intel.com \
--cc=tfiga@chromium.org \
--cc=thomas.petazzoni@bootlin.com \
--cc=wens@csie.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).