| Message ID | CAH-u=82892OHC6BzkB0z+Rc=ig7FiAZfOz6Y7WboNWq2+nxuZw@mail.gmail.com (mailing list archive) |
|---|---|
| State | RFC, archived |
| Headers |
Received: from mail.tu-berlin.de ([130.149.7.33]) by www.linuxtv.org with esmtp (Exim 4.72) (envelope-from <linux-media-owner@vger.kernel.org>) id 1Zi1N3-00085p-V4; Fri, 02 Oct 2015 16:31:37 +0200 X-tubIT-Incoming-IP: 209.132.180.67 Received: from vger.kernel.org ([209.132.180.67]) by mail.tu-berlin.de (exim-4.76/mailfrontend-5) with esmtp id 1Zi1N1-0008JF-8N; Fri, 02 Oct 2015 16:31:37 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752068AbbJBObd (ORCPT <rfc822;mkrufky@linuxtv.org> + 1 other); Fri, 2 Oct 2015 10:31:33 -0400 Received: from mail-oi0-f50.google.com ([209.85.218.50]:36137 "EHLO mail-oi0-f50.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751800AbbJBObc (ORCPT <rfc822; linux-media@vger.kernel.org>); Fri, 2 Oct 2015 10:31:32 -0400 Received: by oibi136 with SMTP id i136so58792436oib.3 for <linux-media@vger.kernel.org>; Fri, 02 Oct 2015 07:31:32 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:from:date:message-id:subject:to:cc :content-type; bh=XefYtCn0/SYnGJXcoZegp6zjqD5OJWwrJYHhwi2Q6Qc=; b=hv4dLL/iTqmeT190+L7iRl1sFcL+UlfDHH5CjfylD3T9gnGexZPr/B36tAE4ZAffrb 19FlmzB4NXES/Bsc5vlw/Ew6hwMRxFQuuuOMOLeZaPpCKBxYHINXcOaLeTHjpH9Ea3lT WmnDgqkoeP8tu/03sBljBD4cfLHd0DEHPOq3OgjH/LiHe0vvWkkCcpQfxbMMPSEpQBED UeFNjRMz3NFl9qIsjK7XI0i4f83oKwUZGbBkVmcPZA81+PcfPVMW7/fEIbBmxZU0HTio zbKzZuZyulWUUYw37xit1YnS5v8fHen1/6H9d198Xnolh4BOBIR6NCYv6ysoNS8lY4SZ 5SZg== X-Gm-Message-State: ALoCoQk4vwkPPqQd24whU+WOakZTjLD2RQ8CaWUd4MevMtLVbDOzfEFi8h3yzfRlkzbmN2WB9C7u X-Received: by 10.202.46.207 with SMTP id u198mr8285862oiu.66.1443796292242; Fri, 02 Oct 2015 07:31:32 -0700 (PDT) MIME-Version: 1.0 Received: by 10.202.171.10 with HTTP; Fri, 2 Oct 2015 07:31:12 -0700 (PDT) From: Jean-Michel Hautbois <jean-michel.hautbois@veo-labs.com> Date: Fri, 2 Oct 2015 16:31:12 +0200 Message-ID: <CAH-u=82892OHC6BzkB0z+Rc=ig7FiAZfOz6Y7WboNWq2+nxuZw@mail.gmail.com> Subject: Coda encoder stop To: Philipp Zabel <p.zabel@pengutronix.de> Cc: Linux Media Mailing List <linux-media@vger.kernel.org> Content-Type: text/plain; charset=UTF-8 Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: <linux-media.vger.kernel.org> X-Mailing-List: linux-media@vger.kernel.org X-PMX-Version: 6.0.0.2142326, Antispam-Engine: 2.7.2.2107409, Antispam-Data: 2015.10.2.142416 X-PMX-Spam: Gauge=IIIIIIII, Probability=8%, Report=' HTML_00_01 0.05, HTML_00_10 0.05, MSGID_ADDED_BY_MTA 0.05, BODY_SIZE_3000_3999 0, BODY_SIZE_5000_LESS 0, BODY_SIZE_7000_LESS 0, CT_TEXT_PLAIN_UTF8_CAPS 0, URI_ENDS_IN_HTML 0, WEBMAIL_SOURCE 0, __ANY_URI 0, __CP_URI_IN_BODY 0, __CT 0, __CT_TEXT_PLAIN 0, __HAS_FROM 0, __HAS_MSGID 0, __HAS_X_MAILING_LIST 0, __HTTPS_URI 0, __MIME_TEXT_ONLY 0, __MIME_VERSION 0, __MULTIPLE_URI_TEXT 0, __PHISH_SPEAR_HTTP_RECEIVED 0, __PHISH_SPEAR_STRUCTURE_1 0, __PHISH_SPEAR_STRUCTURE_2 0, __SANE_MSGID 0, __SUBJ_ALPHA_END 0, __TO_MALFORMED_2 0, __URI_IN_BODY 0, __URI_NO_WWW 0, __URI_NS , __YOUTUBE_RCVD 0' |
Commit Message
Jean-Michel Hautbois
Oct. 2, 2015, 2:31 p.m. UTC
Hi Philipp, I have tried to implement V4L2_ENC_CMD_STOP command in coda encoder but can't make it work with gstreamer (I have modified my gst element to use the correct command, based on your work on bug https://bugzilla.gnome.org/show_bug.cgi?id=733864). Here is what I have tried : From 1dd2f797b2b368d44c1a1bd992379c252e1b57e1 Mon Sep 17 00:00:00 2001 From: Jean-Michel Hautbois <jean-michel.hautbois@veo-labs.com> Date: Fri, 2 Oct 2015 11:18:27 +0200 Subject: [PATCH] coda: Add support for [try]encoder_cmd ioctl This allows userspace to ask for the encoder to stop. When last buffer is received it sends a EOS event. Signed-off-by: Jean-Michel Hautbois <jean-michel.hautbois@veo-labs.com> --- drivers/media/platform/coda/coda-common.c | 58 ++++++++++++++++++++++++++++--- 1 file changed, 53 insertions(+), 5 deletions(-) v4l2_event_queue_fh(&ctx->fh, &eos_event); @@ -791,6 +803,40 @@ static int coda_decoder_cmd(struct file *file, void *fh, return 0; } +static int coda_try_encoder_cmd(struct file *file, void *fh, + struct v4l2_encoder_cmd *ec) +{ + if (ec->cmd != V4L2_ENC_CMD_STOP) + return -EINVAL; + + if (ec->flags & V4L2_ENC_CMD_STOP_AT_GOP_END) + return -EINVAL; + + return 0; +} + +static int coda_encoder_cmd(struct file *file, void *fh, + struct v4l2_encoder_cmd *ec) +{ + struct coda_ctx *ctx = fh_to_ctx(fh); + int ret; + + ret = coda_try_encoder_cmd(file, fh, ec); + if (ret < 0) + return ret; + + /* Ignore encoder stop command silently in decoder context */ + if (ctx->inst_type != CODA_INST_ENCODER) + return 0; + + /* Set the stream-end flag on this context */ + coda_bit_stream_end_flag(ctx); + ctx->hold = false; + v4l2_m2m_try_schedule(ctx->fh.m2m_ctx); + + return 0; +} + static int coda_g_parm(struct file *file, void *fh, struct v4l2_streamparm *a) { struct coda_ctx *ctx = fh_to_ctx(fh); @@ -928,6 +974,8 @@ static const struct v4l2_ioctl_ops coda_ioctl_ops = { .vidioc_try_decoder_cmd = coda_try_decoder_cmd, .vidioc_decoder_cmd = coda_decoder_cmd, + .vidioc_try_encoder_cmd = coda_try_encoder_cmd, + .vidioc_encoder_cmd = coda_encoder_cmd, .vidioc_g_parm = coda_g_parm, .vidioc_s_parm = coda_s_parm,
Comments
2015-10-02 16:31 GMT+02:00 Jean-Michel Hautbois <jean-michel.hautbois@veo-labs.com>: > Hi Philipp, > > I have tried to implement V4L2_ENC_CMD_STOP command in coda encoder > but can't make it work with gstreamer (I have modified my gst element > to use the correct command, based on your work on bug > https://bugzilla.gnome.org/show_bug.cgi?id=733864). > > Here is what I have tried : > > From 1dd2f797b2b368d44c1a1bd992379c252e1b57e1 Mon Sep 17 00:00:00 2001 > From: Jean-Michel Hautbois <jean-michel.hautbois@veo-labs.com> > Date: Fri, 2 Oct 2015 11:18:27 +0200 > Subject: [PATCH] coda: Add support for [try]encoder_cmd ioctl > > This allows userspace to ask for the encoder to stop. > When last buffer is received it sends a EOS event. > > Signed-off-by: Jean-Michel Hautbois <jean-michel.hautbois@veo-labs.com> > --- > drivers/media/platform/coda/coda-common.c | 58 ++++++++++++++++++++++++++++--- > 1 file changed, 53 insertions(+), 5 deletions(-) > > diff --git a/drivers/media/platform/coda/coda-common.c > b/drivers/media/platform/coda/coda-common.c > index a4654e0..7dd7bd9 100644 > --- a/drivers/media/platform/coda/coda-common.c > +++ b/drivers/media/platform/coda/coda-common.c > @@ -686,12 +686,23 @@ static int coda_qbuf(struct file *file, void *priv, > static bool coda_buf_is_end_of_stream(struct coda_ctx *ctx, > struct vb2_buffer *buf) > { > - struct vb2_queue *src_vq; > - > - src_vq = v4l2_m2m_get_vq(ctx->fh.m2m_ctx, V4L2_BUF_TYPE_VIDEO_OUTPUT); > + int ret = false; > > - return ((ctx->bit_stream_param & CODA_BIT_STREAM_END_FLAG) && > - (buf->v4l2_buf.sequence == (ctx->qsequence - 1))); > + if (ctx->bit_stream_param & CODA_BIT_STREAM_END_FLAG) { > + switch (ctx->inst_type) { > + case CODA_INST_DECODER: > + if (buf->v4l2_buf.sequence == (ctx->qsequence - 1)) > + ret = true; > + break; > + case CODA_INST_ENCODER: > + if (buf->v4l2_buf.sequence == (ctx->osequence - 1)) > + ret = true; > + break; > + default: > + break; > + } > + } > + return ret; > } > > void coda_m2m_buf_done(struct coda_ctx *ctx, struct vb2_buffer *buf, > @@ -702,6 +713,7 @@ void coda_m2m_buf_done(struct coda_ctx *ctx, > struct vb2_buffer *buf, > }; > > if (coda_buf_is_end_of_stream(ctx, buf)) { > + v4l2_dbg(1, coda_debug, &ctx->dev->v4l2_dev, "send EOS"); > buf->v4l2_buf.flags |= V4L2_BUF_FLAG_LAST; > > v4l2_event_queue_fh(&ctx->fh, &eos_event); > @@ -791,6 +803,40 @@ static int coda_decoder_cmd(struct file *file, void *fh, > return 0; > } > > +static int coda_try_encoder_cmd(struct file *file, void *fh, > + struct v4l2_encoder_cmd *ec) > +{ > + if (ec->cmd != V4L2_ENC_CMD_STOP) > + return -EINVAL; > + > + if (ec->flags & V4L2_ENC_CMD_STOP_AT_GOP_END) > + return -EINVAL; > + > + return 0; > +} > + > +static int coda_encoder_cmd(struct file *file, void *fh, > + struct v4l2_encoder_cmd *ec) > +{ > + struct coda_ctx *ctx = fh_to_ctx(fh); > + int ret; > + > + ret = coda_try_encoder_cmd(file, fh, ec); > + if (ret < 0) > + return ret; > + > + /* Ignore encoder stop command silently in decoder context */ > + if (ctx->inst_type != CODA_INST_ENCODER) > + return 0; > + > + /* Set the stream-end flag on this context */ > + coda_bit_stream_end_flag(ctx); > + ctx->hold = false; > + v4l2_m2m_try_schedule(ctx->fh.m2m_ctx); > + > + return 0; > +} > + > static int coda_g_parm(struct file *file, void *fh, struct v4l2_streamparm *a) > { > struct coda_ctx *ctx = fh_to_ctx(fh); > @@ -928,6 +974,8 @@ static const struct v4l2_ioctl_ops coda_ioctl_ops = { > > .vidioc_try_decoder_cmd = coda_try_decoder_cmd, > .vidioc_decoder_cmd = coda_decoder_cmd, > + .vidioc_try_encoder_cmd = coda_try_encoder_cmd, > + .vidioc_encoder_cmd = coda_encoder_cmd, > > .vidioc_g_parm = coda_g_parm, > .vidioc_s_parm = coda_s_parm, > -- > 2.6.0 Oups, forgot to paste the kernel output : [ 324.390498] ------------[ cut here ]------------ [ 324.395163] WARNING: CPU: 1 PID: 1434 at /run/media/jm/SSD_JM/Projets/git_mirrors/linux-2.6-imx/kernel/locking/lockdep.c:3382 lock_release+0x2b0/0x6d4() [ 324.408821] DEBUG_LOCKS_WARN_ON(depth <= 0) [ 324.412840] Modules linked in: [ 324.415917] ath9k_htc ath9k_common ath9k_hw ath snd_soc_adv76xx snd_soc_vbx3_fpga vbx3_fpga_vswitch smsc95xx usbnet mx6_camera(C) imx_ipu_scaler imx_ipu vbx3_fpga adv7604 snd_soc_sgtl5000 lmh0395 snd_soc_vbx3sdi vbx3_sdi fbcon bitblit softcursor font [ 324.437279] CPU: 1 PID: 1434 Comm: video-h264:src Tainted: G C 4.2.0 #106 [ 324.445204] Hardware name: Freescale i.MX6 Quad/DualLite (Device Tree) [ 324.451741] Backtrace: [ 324.454226] [<8001524c>] (dump_backtrace) from [<80015494>] (show_stack+0x20/0x24) [ 324.461804] r6:80fb1a60 r5:00000000 r4:00000000 r3:00000000 [ 324.467562] [<80015474>] (show_stack) from [<808fdd6c>] (dump_stack+0x98/0xc8) [ 324.474803] [<808fdcd4>] (dump_stack) from [<800304f0>] (warn_slowpath_common+0x8c/0xc8) [ 324.482902] r6:8007ffbc r5:00000009 r4:a4eafab8 r3:00000001 [ 324.488652] [<80030464>] (warn_slowpath_common) from [<8003056c>] (warn_slowpath_fmt+0x40/0x48) [ 324.497359] r8:80fb1b60 r7:80904b3c r6:a636c9c0 r5:a6c9f368 r4:80c1e150 [ 324.504168] [<80030530>] (warn_slowpath_fmt) from [<8007ffbc>] (lock_release+0x2b0/0x6d4) [ 324.512353] r3:80c246fc r2:80c1e150 [ 324.515971] r4:a6c9f32c [ 324.518541] [<8007fd0c>] (lock_release) from [<80904a34>] (__mutex_unlock_slowpath+0xc4/0x1b4) [ 324.527160] r10:00000000 r9:a4531281 r8:00000000 r7:8185231c r6:80904b3c r5:600f0013 [ 324.535091] r4:a6c9f32c [ 324.537657] [<80904970>] (__mutex_unlock_slowpath) from [<80904b3c>] (mutex_unlock+0x18/0x1c) [ 324.546189] r7:00000000 r6:a4eafcd4 r5:00000041 r4:a5e1b000 [ 324.551945] [<80904b24>] (mutex_unlock) from [<80602fe8>] (v4l2_m2m_fop_poll+0x5c/0x64) [ 324.559970] [<80602f8c>] (v4l2_m2m_fop_poll) from [<805ec694>] (v4l2_poll+0x6c/0xa0) [ 324.567722] r6:a4eafbec r5:00000000 r4:a6c9e090 r3:80602f8c [ 324.573481] [<805ec628>] (v4l2_poll) from [<80174d04>] (do_sys_poll+0x230/0x4d0) [ 324.580886] r5:00000000 r4:a4eafbe4 [ 324.584515] [<80174ad4>] (do_sys_poll) from [<801752e0>] (SyS_ppoll+0x1d4/0x1fc) [ 324.591917] r10:00000000 r9:a4eae000 r8:00000000 r7:00000000 r6:74a14790 r5:00000002 [ 324.599846] r4:00000000 [ 324.602419] [<8017510c>] (SyS_ppoll) from [<80010b00>] (ret_fast_syscall+0x0/0x54) [ 324.609996] r8:80010ce4 r7:00000150 r6:74a14790 r5:00000002 r4:00000008 [ 324.616798] ---[ end trace 0012dc3dcc1c27d5 ]--- -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Am Freitag, den 02.10.2015, 16:59 +0200 schrieb Jean-Michel Hautbois: [...] > Oups, forgot to paste the kernel output : > > [ 324.390498] ------------[ cut here ]------------ > [ 324.395163] WARNING: CPU: 1 PID: 1434 at > /run/media/jm/SSD_JM/Projets/git_mirrors/linux-2.6-imx/kernel/locking/lockdep.c:3382 > lock_release+0x2b0/0x6d4() > [ 324.408821] DEBUG_LOCKS_WARN_ON(depth <= 0) > [ 324.412840] Modules linked in: > [ 324.415917] ath9k_htc ath9k_common ath9k_hw ath snd_soc_adv76xx > snd_soc_vbx3_fpga vbx3_fpga_vswitch smsc95xx usbnet mx6_camera(C) > imx_ipu_scaler imx_ipu vbx3_fpga adv7604 snd_soc_sgtl5000 lmh0395 > snd_soc_vbx3sdi vbx3_sdi fbcon bitblit softcursor font > [ 324.437279] CPU: 1 PID: 1434 Comm: video-h264:src Tainted: G > C 4.2.0 #106 > [ 324.445204] Hardware name: Freescale i.MX6 Quad/DualLite (Device Tree) > [ 324.451741] Backtrace: > [ 324.454226] [<8001524c>] (dump_backtrace) from [<80015494>] > (show_stack+0x20/0x24) > [ 324.461804] r6:80fb1a60 r5:00000000 r4:00000000 r3:00000000 > [ 324.467562] [<80015474>] (show_stack) from [<808fdd6c>] > (dump_stack+0x98/0xc8) > [ 324.474803] [<808fdcd4>] (dump_stack) from [<800304f0>] > (warn_slowpath_common+0x8c/0xc8) > [ 324.482902] r6:8007ffbc r5:00000009 r4:a4eafab8 r3:00000001 > [ 324.488652] [<80030464>] (warn_slowpath_common) from [<8003056c>] > (warn_slowpath_fmt+0x40/0x48) > [ 324.497359] r8:80fb1b60 r7:80904b3c r6:a636c9c0 r5:a6c9f368 r4:80c1e150 > [ 324.504168] [<80030530>] (warn_slowpath_fmt) from [<8007ffbc>] > (lock_release+0x2b0/0x6d4) > [ 324.512353] r3:80c246fc r2:80c1e150 > [ 324.515971] r4:a6c9f32c > [ 324.518541] [<8007fd0c>] (lock_release) from [<80904a34>] > (__mutex_unlock_slowpath+0xc4/0x1b4) > [ 324.527160] r10:00000000 r9:a4531281 r8:00000000 r7:8185231c > r6:80904b3c r5:600f0013 > [ 324.535091] r4:a6c9f32c > [ 324.537657] [<80904970>] (__mutex_unlock_slowpath) from > [<80904b3c>] (mutex_unlock+0x18/0x1c) > [ 324.546189] r7:00000000 r6:a4eafcd4 r5:00000041 r4:a5e1b000 > [ 324.551945] [<80904b24>] (mutex_unlock) from [<80602fe8>] > (v4l2_m2m_fop_poll+0x5c/0x64) > [ 324.559970] [<80602f8c>] (v4l2_m2m_fop_poll) from [<805ec694>] > (v4l2_poll+0x6c/0xa0) > [ 324.567722] r6:a4eafbec r5:00000000 r4:a6c9e090 r3:80602f8c > [ 324.573481] [<805ec628>] (v4l2_poll) from [<80174d04>] > (do_sys_poll+0x230/0x4d0) > [ 324.580886] r5:00000000 r4:a4eafbe4 > [ 324.584515] [<80174ad4>] (do_sys_poll) from [<801752e0>] > (SyS_ppoll+0x1d4/0x1fc) > [ 324.591917] r10:00000000 r9:a4eae000 r8:00000000 r7:00000000 > r6:74a14790 r5:00000002 > [ 324.599846] r4:00000000 > [ 324.602419] [<8017510c>] (SyS_ppoll) from [<80010b00>] > (ret_fast_syscall+0x0/0x54) > [ 324.609996] r8:80010ce4 r7:00000150 r6:74a14790 r5:00000002 r4:00000008 > [ 324.616798] ---[ end trace 0012dc3dcc1c27d5 ]--- Hm, that looks very similar to the issue Zahari's "[media] m2m: fix bad unlock balance" is supposed to fix: https://patchwork.linuxtv.org/patch/30906/ regards Philipp -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
2015-10-02 17:14 GMT+02:00 Philipp Zabel <p.zabel@pengutronix.de>: > Am Freitag, den 02.10.2015, 16:59 +0200 schrieb Jean-Michel Hautbois: > [...] >> Oups, forgot to paste the kernel output : >> >> [ 324.390498] ------------[ cut here ]------------ >> [ 324.395163] WARNING: CPU: 1 PID: 1434 at >> /run/media/jm/SSD_JM/Projets/git_mirrors/linux-2.6-imx/kernel/locking/lockdep.c:3382 >> lock_release+0x2b0/0x6d4() >> [ 324.408821] DEBUG_LOCKS_WARN_ON(depth <= 0) >> [ 324.412840] Modules linked in: >> [ 324.415917] ath9k_htc ath9k_common ath9k_hw ath snd_soc_adv76xx >> snd_soc_vbx3_fpga vbx3_fpga_vswitch smsc95xx usbnet mx6_camera(C) >> imx_ipu_scaler imx_ipu vbx3_fpga adv7604 snd_soc_sgtl5000 lmh0395 >> snd_soc_vbx3sdi vbx3_sdi fbcon bitblit softcursor font >> [ 324.437279] CPU: 1 PID: 1434 Comm: video-h264:src Tainted: G >> C 4.2.0 #106 >> [ 324.445204] Hardware name: Freescale i.MX6 Quad/DualLite (Device Tree) >> [ 324.451741] Backtrace: >> [ 324.454226] [<8001524c>] (dump_backtrace) from [<80015494>] >> (show_stack+0x20/0x24) >> [ 324.461804] r6:80fb1a60 r5:00000000 r4:00000000 r3:00000000 >> [ 324.467562] [<80015474>] (show_stack) from [<808fdd6c>] >> (dump_stack+0x98/0xc8) >> [ 324.474803] [<808fdcd4>] (dump_stack) from [<800304f0>] >> (warn_slowpath_common+0x8c/0xc8) >> [ 324.482902] r6:8007ffbc r5:00000009 r4:a4eafab8 r3:00000001 >> [ 324.488652] [<80030464>] (warn_slowpath_common) from [<8003056c>] >> (warn_slowpath_fmt+0x40/0x48) >> [ 324.497359] r8:80fb1b60 r7:80904b3c r6:a636c9c0 r5:a6c9f368 r4:80c1e150 >> [ 324.504168] [<80030530>] (warn_slowpath_fmt) from [<8007ffbc>] >> (lock_release+0x2b0/0x6d4) >> [ 324.512353] r3:80c246fc r2:80c1e150 >> [ 324.515971] r4:a6c9f32c >> [ 324.518541] [<8007fd0c>] (lock_release) from [<80904a34>] >> (__mutex_unlock_slowpath+0xc4/0x1b4) >> [ 324.527160] r10:00000000 r9:a4531281 r8:00000000 r7:8185231c >> r6:80904b3c r5:600f0013 >> [ 324.535091] r4:a6c9f32c >> [ 324.537657] [<80904970>] (__mutex_unlock_slowpath) from >> [<80904b3c>] (mutex_unlock+0x18/0x1c) >> [ 324.546189] r7:00000000 r6:a4eafcd4 r5:00000041 r4:a5e1b000 >> [ 324.551945] [<80904b24>] (mutex_unlock) from [<80602fe8>] >> (v4l2_m2m_fop_poll+0x5c/0x64) >> [ 324.559970] [<80602f8c>] (v4l2_m2m_fop_poll) from [<805ec694>] >> (v4l2_poll+0x6c/0xa0) >> [ 324.567722] r6:a4eafbec r5:00000000 r4:a6c9e090 r3:80602f8c >> [ 324.573481] [<805ec628>] (v4l2_poll) from [<80174d04>] >> (do_sys_poll+0x230/0x4d0) >> [ 324.580886] r5:00000000 r4:a4eafbe4 >> [ 324.584515] [<80174ad4>] (do_sys_poll) from [<801752e0>] >> (SyS_ppoll+0x1d4/0x1fc) >> [ 324.591917] r10:00000000 r9:a4eae000 r8:00000000 r7:00000000 >> r6:74a14790 r5:00000002 >> [ 324.599846] r4:00000000 >> [ 324.602419] [<8017510c>] (SyS_ppoll) from [<80010b00>] >> (ret_fast_syscall+0x0/0x54) >> [ 324.609996] r8:80010ce4 r7:00000150 r6:74a14790 r5:00000002 r4:00000008 >> [ 324.616798] ---[ end trace 0012dc3dcc1c27d5 ]--- > > Hm, that looks very similar to the issue Zahari's "[media] m2m: fix bad > unlock balance" is supposed to fix: > https://patchwork.linuxtv.org/patch/30906/ > > regards > Philipp > Thanks for that ! I am on 4.2, not media-tree, this is why I didn't have it. JM -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/media/platform/coda/coda-common.c b/drivers/media/platform/coda/coda-common.c index a4654e0..7dd7bd9 100644 --- a/drivers/media/platform/coda/coda-common.c +++ b/drivers/media/platform/coda/coda-common.c @@ -686,12 +686,23 @@ static int coda_qbuf(struct file *file, void *priv, static bool coda_buf_is_end_of_stream(struct coda_ctx *ctx, struct vb2_buffer *buf) { - struct vb2_queue *src_vq; - - src_vq = v4l2_m2m_get_vq(ctx->fh.m2m_ctx, V4L2_BUF_TYPE_VIDEO_OUTPUT); + int ret = false; - return ((ctx->bit_stream_param & CODA_BIT_STREAM_END_FLAG) && - (buf->v4l2_buf.sequence == (ctx->qsequence - 1))); + if (ctx->bit_stream_param & CODA_BIT_STREAM_END_FLAG) { + switch (ctx->inst_type) { + case CODA_INST_DECODER: + if (buf->v4l2_buf.sequence == (ctx->qsequence - 1)) + ret = true; + break; + case CODA_INST_ENCODER: + if (buf->v4l2_buf.sequence == (ctx->osequence - 1)) + ret = true; + break; + default: + break; + } + } + return ret; } void coda_m2m_buf_done(struct coda_ctx *ctx, struct vb2_buffer *buf, @@ -702,6 +713,7 @@ void coda_m2m_buf_done(struct coda_ctx *ctx, struct vb2_buffer *buf, }; if (coda_buf_is_end_of_stream(ctx, buf)) { + v4l2_dbg(1, coda_debug, &ctx->dev->v4l2_dev, "send EOS"); buf->v4l2_buf.flags |= V4L2_BUF_FLAG_LAST;