From: Boris Brezillon <boris.brezillon@collabora.com> To: Jernej Skrabec <jernej.skrabec@siol.net> Cc: mchehab@kernel.org, hverkuil-cisco@xs4all.nl, paul.kocialkowski@bootlin.com, mripard@kernel.org, pawel@osciak.com, m.szyprowski@samsung.com, kyungmin.park@samsung.com, tfiga@chromium.org, wens@csie.org, acourbot@chromium.org, gregkh@linuxfoundation.org, linux-media@vger.kernel.org, linux-kernel@vger.kernel.org, devel@driverdev.osuosl.org, linux-arm-kernel@lists.infradead.org, ezequiel@collabora.com, jonas@kwiboo.se Subject: Re: [PATCH 7/8] media: cedrus: Add support for holding capture buffer Date: Mon, 26 Aug 2019 20:38:29 +0200 [thread overview] Message-ID: <20190826203829.23b7d24b@collabora.com> (raw) In-Reply-To: <20190822194500.2071-8-jernej.skrabec@siol.net> On Thu, 22 Aug 2019 21:44:59 +0200 Jernej Skrabec <jernej.skrabec@siol.net> wrote: > When frame contains multiple slices and driver works in slice mode, it's > more efficient to hold capture buffer in queue until all slices of a > same frame are decoded. > > Add support for that to Cedrus driver by exposing and implementing > V4L2_BUF_CAP_SUPPORTS_M2M_HOLD_CAPTURE_BUF capability. > > Signed-off-by: Jernej Skrabec <jernej.skrabec@siol.net> Reviewed-by: Boris Brezillon <boris.brezillon@collabora.com> > --- > drivers/staging/media/sunxi/cedrus/cedrus_dec.c | 9 +++++++++ > drivers/staging/media/sunxi/cedrus/cedrus_hw.c | 8 +++++--- > drivers/staging/media/sunxi/cedrus/cedrus_video.c | 1 + > 3 files changed, 15 insertions(+), 3 deletions(-) > > diff --git a/drivers/staging/media/sunxi/cedrus/cedrus_dec.c b/drivers/staging/media/sunxi/cedrus/cedrus_dec.c > index d7b54accfe83..68462b99750e 100644 > --- a/drivers/staging/media/sunxi/cedrus/cedrus_dec.c > +++ b/drivers/staging/media/sunxi/cedrus/cedrus_dec.c > @@ -31,6 +31,14 @@ void cedrus_device_run(void *priv) > > run.src = v4l2_m2m_next_src_buf(ctx->fh.m2m_ctx); > run.dst = v4l2_m2m_next_dst_buf(ctx->fh.m2m_ctx); > + > + if (v4l2_m2m_release_capture_buf(run.src, run.dst)) { > + v4l2_m2m_dst_buf_remove(ctx->fh.m2m_ctx); > + v4l2_m2m_buf_done(run.dst, VB2_BUF_STATE_DONE); > + run.dst = v4l2_m2m_next_dst_buf(ctx->fh.m2m_ctx); > + } > + run.dst->is_held = run.src->flags & V4L2_BUF_FLAG_M2M_HOLD_CAPTURE_BUF; > + > run.first_slice = > run.src->vb2_buf.timestamp != run.dst->vb2_buf.timestamp; > > @@ -46,6 +54,7 @@ void cedrus_device_run(void *priv) > V4L2_CID_MPEG_VIDEO_MPEG2_SLICE_PARAMS); > run.mpeg2.quantization = cedrus_find_control_data(ctx, > V4L2_CID_MPEG_VIDEO_MPEG2_QUANTIZATION); > + run.dst->is_held = false; > break; > > case V4L2_PIX_FMT_H264_SLICE: > diff --git a/drivers/staging/media/sunxi/cedrus/cedrus_hw.c b/drivers/staging/media/sunxi/cedrus/cedrus_hw.c > index a942cd9bed57..99fedec80224 100644 > --- a/drivers/staging/media/sunxi/cedrus/cedrus_hw.c > +++ b/drivers/staging/media/sunxi/cedrus/cedrus_hw.c > @@ -122,7 +122,7 @@ static irqreturn_t cedrus_irq(int irq, void *data) > dev->dec_ops[ctx->current_codec]->irq_clear(ctx); > > src_buf = v4l2_m2m_src_buf_remove(ctx->fh.m2m_ctx); > - dst_buf = v4l2_m2m_dst_buf_remove(ctx->fh.m2m_ctx); > + dst_buf = v4l2_m2m_next_dst_buf(ctx->fh.m2m_ctx); > > if (!src_buf || !dst_buf) { > v4l2_err(&dev->v4l2_dev, > @@ -136,8 +136,10 @@ static irqreturn_t cedrus_irq(int irq, void *data) > state = VB2_BUF_STATE_DONE; > > v4l2_m2m_buf_done(src_buf, state); > - v4l2_m2m_buf_done(dst_buf, state); > - > + if (!dst_buf->is_held) { > + v4l2_m2m_dst_buf_remove(ctx->fh.m2m_ctx); > + v4l2_m2m_buf_done(dst_buf, state); > + } > v4l2_m2m_job_finish(ctx->dev->m2m_dev, ctx->fh.m2m_ctx); > > return IRQ_HANDLED; > diff --git a/drivers/staging/media/sunxi/cedrus/cedrus_video.c b/drivers/staging/media/sunxi/cedrus/cedrus_video.c > index eeee3efd247b..5153b2bba21e 100644 > --- a/drivers/staging/media/sunxi/cedrus/cedrus_video.c > +++ b/drivers/staging/media/sunxi/cedrus/cedrus_video.c > @@ -515,6 +515,7 @@ int cedrus_queue_init(void *priv, struct vb2_queue *src_vq, > src_vq->type = V4L2_BUF_TYPE_VIDEO_OUTPUT; > src_vq->io_modes = VB2_MMAP | VB2_DMABUF; > src_vq->drv_priv = ctx; > + src_vq->subsystem_flags = VB2_V4L2_FL_SUPPORTS_M2M_HOLD_CAPTURE_BUF; > src_vq->buf_struct_size = sizeof(struct cedrus_buffer); > src_vq->min_buffers_needed = 1; > src_vq->ops = &cedrus_qops;
WARNING: multiple messages have this Message-ID (diff)
From: Boris Brezillon <boris.brezillon@collabora.com> To: Jernej Skrabec <jernej.skrabec@siol.net> Cc: devel@driverdev.osuosl.org, acourbot@chromium.org, pawel@osciak.com, jonas@kwiboo.se, gregkh@linuxfoundation.org, wens@csie.org, mripard@kernel.org, tfiga@chromium.org, paul.kocialkowski@bootlin.com, kyungmin.park@samsung.com, linux-media@vger.kernel.org, linux-arm-kernel@lists.infradead.org, hverkuil-cisco@xs4all.nl, mchehab@kernel.org, ezequiel@collabora.com, linux-kernel@vger.kernel.org, m.szyprowski@samsung.com Subject: Re: [PATCH 7/8] media: cedrus: Add support for holding capture buffer Date: Mon, 26 Aug 2019 20:38:29 +0200 [thread overview] Message-ID: <20190826203829.23b7d24b@collabora.com> (raw) In-Reply-To: <20190822194500.2071-8-jernej.skrabec@siol.net> On Thu, 22 Aug 2019 21:44:59 +0200 Jernej Skrabec <jernej.skrabec@siol.net> wrote: > When frame contains multiple slices and driver works in slice mode, it's > more efficient to hold capture buffer in queue until all slices of a > same frame are decoded. > > Add support for that to Cedrus driver by exposing and implementing > V4L2_BUF_CAP_SUPPORTS_M2M_HOLD_CAPTURE_BUF capability. > > Signed-off-by: Jernej Skrabec <jernej.skrabec@siol.net> Reviewed-by: Boris Brezillon <boris.brezillon@collabora.com> > --- > drivers/staging/media/sunxi/cedrus/cedrus_dec.c | 9 +++++++++ > drivers/staging/media/sunxi/cedrus/cedrus_hw.c | 8 +++++--- > drivers/staging/media/sunxi/cedrus/cedrus_video.c | 1 + > 3 files changed, 15 insertions(+), 3 deletions(-) > > diff --git a/drivers/staging/media/sunxi/cedrus/cedrus_dec.c b/drivers/staging/media/sunxi/cedrus/cedrus_dec.c > index d7b54accfe83..68462b99750e 100644 > --- a/drivers/staging/media/sunxi/cedrus/cedrus_dec.c > +++ b/drivers/staging/media/sunxi/cedrus/cedrus_dec.c > @@ -31,6 +31,14 @@ void cedrus_device_run(void *priv) > > run.src = v4l2_m2m_next_src_buf(ctx->fh.m2m_ctx); > run.dst = v4l2_m2m_next_dst_buf(ctx->fh.m2m_ctx); > + > + if (v4l2_m2m_release_capture_buf(run.src, run.dst)) { > + v4l2_m2m_dst_buf_remove(ctx->fh.m2m_ctx); > + v4l2_m2m_buf_done(run.dst, VB2_BUF_STATE_DONE); > + run.dst = v4l2_m2m_next_dst_buf(ctx->fh.m2m_ctx); > + } > + run.dst->is_held = run.src->flags & V4L2_BUF_FLAG_M2M_HOLD_CAPTURE_BUF; > + > run.first_slice = > run.src->vb2_buf.timestamp != run.dst->vb2_buf.timestamp; > > @@ -46,6 +54,7 @@ void cedrus_device_run(void *priv) > V4L2_CID_MPEG_VIDEO_MPEG2_SLICE_PARAMS); > run.mpeg2.quantization = cedrus_find_control_data(ctx, > V4L2_CID_MPEG_VIDEO_MPEG2_QUANTIZATION); > + run.dst->is_held = false; > break; > > case V4L2_PIX_FMT_H264_SLICE: > diff --git a/drivers/staging/media/sunxi/cedrus/cedrus_hw.c b/drivers/staging/media/sunxi/cedrus/cedrus_hw.c > index a942cd9bed57..99fedec80224 100644 > --- a/drivers/staging/media/sunxi/cedrus/cedrus_hw.c > +++ b/drivers/staging/media/sunxi/cedrus/cedrus_hw.c > @@ -122,7 +122,7 @@ static irqreturn_t cedrus_irq(int irq, void *data) > dev->dec_ops[ctx->current_codec]->irq_clear(ctx); > > src_buf = v4l2_m2m_src_buf_remove(ctx->fh.m2m_ctx); > - dst_buf = v4l2_m2m_dst_buf_remove(ctx->fh.m2m_ctx); > + dst_buf = v4l2_m2m_next_dst_buf(ctx->fh.m2m_ctx); > > if (!src_buf || !dst_buf) { > v4l2_err(&dev->v4l2_dev, > @@ -136,8 +136,10 @@ static irqreturn_t cedrus_irq(int irq, void *data) > state = VB2_BUF_STATE_DONE; > > v4l2_m2m_buf_done(src_buf, state); > - v4l2_m2m_buf_done(dst_buf, state); > - > + if (!dst_buf->is_held) { > + v4l2_m2m_dst_buf_remove(ctx->fh.m2m_ctx); > + v4l2_m2m_buf_done(dst_buf, state); > + } > v4l2_m2m_job_finish(ctx->dev->m2m_dev, ctx->fh.m2m_ctx); > > return IRQ_HANDLED; > diff --git a/drivers/staging/media/sunxi/cedrus/cedrus_video.c b/drivers/staging/media/sunxi/cedrus/cedrus_video.c > index eeee3efd247b..5153b2bba21e 100644 > --- a/drivers/staging/media/sunxi/cedrus/cedrus_video.c > +++ b/drivers/staging/media/sunxi/cedrus/cedrus_video.c > @@ -515,6 +515,7 @@ int cedrus_queue_init(void *priv, struct vb2_queue *src_vq, > src_vq->type = V4L2_BUF_TYPE_VIDEO_OUTPUT; > src_vq->io_modes = VB2_MMAP | VB2_DMABUF; > src_vq->drv_priv = ctx; > + src_vq->subsystem_flags = VB2_V4L2_FL_SUPPORTS_M2M_HOLD_CAPTURE_BUF; > src_vq->buf_struct_size = sizeof(struct cedrus_buffer); > src_vq->min_buffers_needed = 1; > src_vq->ops = &cedrus_qops; _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2019-08-26 18:38 UTC|newest] Thread overview: 50+ messages / expand[flat|nested] mbox.gz Atom feed top 2019-08-22 19:44 [PATCH 0/8] media: cedrus: h264: Support multi-slice frames Jernej Skrabec 2019-08-22 19:44 ` Jernej Skrabec 2019-08-22 19:44 ` [PATCH 1/8] vb2: add V4L2_BUF_FLAG_M2M_HOLD_CAPTURE_BUF Jernej Skrabec 2019-08-22 19:44 ` Jernej Skrabec 2019-08-22 19:44 ` [PATCH 2/8] videodev2.h: add V4L2_DEC_CMD_FLUSH Jernej Skrabec 2019-08-22 19:44 ` Jernej Skrabec 2019-08-26 18:30 ` Boris Brezillon 2019-08-26 18:30 ` Boris Brezillon 2019-08-30 9:38 ` Alexandre Courbot 2019-08-30 9:38 ` Alexandre Courbot 2019-08-30 9:44 ` Hans Verkuil 2019-08-30 9:44 ` Hans Verkuil 2019-08-30 9:48 ` Alexandre Courbot 2019-08-30 9:48 ` Alexandre Courbot 2019-08-22 19:44 ` [PATCH 3/8] media: docs-rst: Document m2m stateless video decoder interface Jernej Skrabec 2019-08-22 19:44 ` Jernej Skrabec 2019-08-22 19:44 ` [PATCH 4/8] media: docs-rst: Document memory-to-memory video encoder interface Jernej Skrabec 2019-08-22 19:44 ` Jernej Skrabec 2019-08-22 19:44 ` [PATCH 5/8] media: cedrus: Detect first slice of a frame Jernej Skrabec 2019-08-22 19:44 ` Jernej Skrabec 2019-08-26 18:28 ` Boris Brezillon 2019-08-26 18:28 ` Boris Brezillon 2019-08-26 18:47 ` Jernej Škrabec 2019-08-26 18:47 ` Jernej Škrabec 2019-08-29 19:04 ` Jernej Škrabec 2019-08-29 19:04 ` Jernej Škrabec 2019-08-30 5:48 ` Boris Brezillon 2019-08-30 5:48 ` Boris Brezillon 2019-08-30 17:19 ` Nicolas Dufresne 2019-08-30 17:19 ` Nicolas Dufresne 2019-08-30 17:19 ` Nicolas Dufresne 2019-08-30 7:28 ` Hans Verkuil 2019-08-30 7:28 ` Hans Verkuil 2019-08-22 19:44 ` [PATCH 6/8] media: cedrus: h264: Support multiple slices per frame Jernej Skrabec 2019-08-22 19:44 ` Jernej Skrabec 2019-08-22 19:44 ` [PATCH 7/8] media: cedrus: Add support for holding capture buffer Jernej Skrabec 2019-08-22 19:44 ` Jernej Skrabec 2019-08-26 18:38 ` Boris Brezillon [this message] 2019-08-26 18:38 ` Boris Brezillon 2019-08-29 11:23 ` Hans Verkuil 2019-08-29 11:23 ` Hans Verkuil 2019-09-04 23:14 ` Jernej Škrabec 2019-09-04 23:14 ` Jernej Škrabec 2019-09-04 23:14 ` Jernej Škrabec 2019-08-22 19:45 ` [PATCH 8/8] media: cedrus: Add support for V4L2_DEC_CMD_FLUSH Jernej Skrabec 2019-08-22 19:45 ` Jernej Skrabec 2019-08-26 18:55 ` Boris Brezillon 2019-08-26 18:55 ` Boris Brezillon 2019-08-29 11:11 ` Hans Verkuil 2019-08-29 11:11 ` Hans Verkuil
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=20190826203829.23b7d24b@collabora.com \ --to=boris.brezillon@collabora.com \ --cc=acourbot@chromium.org \ --cc=devel@driverdev.osuosl.org \ --cc=ezequiel@collabora.com \ --cc=gregkh@linuxfoundation.org \ --cc=hverkuil-cisco@xs4all.nl \ --cc=jernej.skrabec@siol.net \ --cc=jonas@kwiboo.se \ --cc=kyungmin.park@samsung.com \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-media@vger.kernel.org \ --cc=m.szyprowski@samsung.com \ --cc=mchehab@kernel.org \ --cc=mripard@kernel.org \ --cc=paul.kocialkowski@bootlin.com \ --cc=pawel@osciak.com \ --cc=tfiga@chromium.org \ --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: linkBe 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.