From patchwork Thu Mar 15 19:13:23 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Seiderer X-Patchwork-Id: 47947 X-Patchwork-Delegate: hverkuil@xs4all.nl Received: from vger.kernel.org ([209.132.180.67]) by www.linuxtv.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ewYKX-0005kA-LK; Thu, 15 Mar 2018 19:14:26 +0000 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752938AbeCOTNl (ORCPT + 1 other); Thu, 15 Mar 2018 15:13:41 -0400 Received: from mout.gmx.net ([212.227.15.18]:39301 "EHLO mout.gmx.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752918AbeCOTNi (ORCPT ); Thu, 15 Mar 2018 15:13:38 -0400 Received: from localhost.localdomain ([88.66.251.181]) by mail.gmx.com (mrgmx002 [212.227.17.190]) with ESMTPSA (Nemesis) id 0MEnX8-1epSuP3iuI-00G4rq; Thu, 15 Mar 2018 20:13:32 +0100 From: Peter Seiderer To: linux-media@vger.kernel.org Cc: Steve Longerbeam , Philipp Zabel , Mauro Carvalho Chehab , Greg Kroah-Hartman , devel@driverdev.osuosl.org, linux-kernel@vger.kernel.org, Peter Seiderer Subject: [PATCH v4 2/2] media: staging/imx: fill vb2_v4l2_buffer sequence entry Date: Thu, 15 Mar 2018 20:13:23 +0100 Message-Id: <20180315191323.6028-2-ps.report@gmx.net> X-Mailer: git-send-email 2.16.2 In-Reply-To: <20180315191323.6028-1-ps.report@gmx.net> References: <20180315191323.6028-1-ps.report@gmx.net> X-Provags-ID: V03:K0:XGCi/6HZZ9n5xUkmaRXUq0Bctcea/xGfHRAWeyy8COzTQf6Yc/H HwOcNvnbflUjaL2lZbP+/Tpt7oUUjAa9tfVxlXAAGzIXwToiUOT2Vum9McKAYUnecVJn9YN NasQWtfCU08jNkTbCaBx4E03dIeZB5ZHLOrL5fFr/GU41cmwFxKMVLD/6Kim9nSEtf4SeVx WrB/gHNboSEvK9Nm569lA== X-UI-Out-Filterresults: notjunk:1; V01:K0:CSsI+BVLhPE=:sNeqcodGA3s6iZDPYMOj2V 9ZTZbUUJ9Fj813arN1x7LDZB9VwrSRFX6g6I7watmtwO9rFAuvJbMSl6lEG0KZOttRPzDWvha NWDaCZoRt/kuEcE34mYy2+Dg5FN7AuVKFVvWcBxSRS4mGi0R3VioWrngfxXw1ITI8N8Jjlyny t8atl3IJRmV3y8RwgAFBsW3xjKm7mGVPt5dS8Zz6WGxqz+4R4jWuVN/uH5l3NiswcKPc/+9pM 3Tcgv3/pj34JOopu9+yJjrSY1bixGtfKJnscu0BHCOjKTK1MP9KyA6UPNSVKEvbEH6YKh2zMM gEFrvJZiB+FgRsr1ClxfP/pglWzwUmt38e/ClnpNlKlwRywFp/E+Wj3aUgOdnl1usJUvOK1H2 5bSE6jPp8dxBRPBbs+DauEKF62dnnjNbfVfCdLrEyptodt72IK/RWcSdkckvNry2whWsVp7XG PBVqxjbYEZVcJKHHHZXxGE2GKf2Oc10in+ZDpmm1GPcCOrjo/bj4T95MRbVQuxkWOEJckexgY IYg1xK/lSikNZi5IBhP2QtX0wiBd6KawZauuS327syZiPbxCQ0Bp3Kt/NHwUnYbusTDEOHahw jTJHm7Kwja17QuwERasb+mkXT5txvZq0ehtUq9n+iUKoIPxhfBfBer69DaA2LcDO5XkbI66Xu lODpT3Mcklp36ZgWSAtHEVMLQCyE1hlkNxR9YkKrfKycnYu26Ey8wx19o7uNT9vOkjBIEpNwD GcYPlkoKqoOrcZT9CA7GnhFtK/b+jNd7UXWGPjEN/giA2fn2VouOm8j5JTG7sABUeaUFz0Qyk VbUc0SO5MJcsR14ohUqtv63AzSFnw== Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org - enables gstreamer v4l2src lost frame detection, e.g: 0:00:08.685185668 348 0x54f520 WARN v4l2src gstv4l2src.c:970:gst_v4l2src_create: lost frames detected: count = 141 - ts: 0:00:08.330177332 - fixes v4l2-compliance test failure: Streaming ioctls: test read/write: OK (Not Supported) Video Capture: Buffer: 0 Sequence: 0 Field: None Timestamp: 92.991450s Buffer: 1 Sequence: 0 Field: None Timestamp: 93.008135s fail: v4l2-test-buffers.cpp(294): (int)g_sequence() < seq.last_seq + 1 fail: v4l2-test-buffers.cpp(707): buf.check(q, last_seq) Signed-off-by: Peter Seiderer Reviewed-by: Steve Longerbeam --- Changes in v2: - fill vb2_v4l2_buffer sequence entry in imx-ic-prpencvf too (suggested by Steve Longerbeam) Changes in v3: - add changelog (suggested by Greg Kroah-Hartman, Fabio Estevam and Dan Carpenter) and patch history - use u32 (instead of __u32) (suggested by Dan Carpenter) - let sequence counter start with zero, keeping v4l2-compliance testing happy (needs additional setting of field to a valid value, patch will follow soon) Changes in v4: - add v4l2-compliance test failure to changelog - reorder frame_sequence increment and assignement to avoid -1 as start value (suggeted by Steve Longerbeam) --- drivers/staging/media/imx/imx-ic-prpencvf.c | 4 ++++ drivers/staging/media/imx/imx-media-csi.c | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/drivers/staging/media/imx/imx-ic-prpencvf.c b/drivers/staging/media/imx/imx-ic-prpencvf.c index ffeb017c73b2..28f41caba05d 100644 --- a/drivers/staging/media/imx/imx-ic-prpencvf.c +++ b/drivers/staging/media/imx/imx-ic-prpencvf.c @@ -103,6 +103,7 @@ struct prp_priv { int nfb4eof_irq; int stream_count; + u32 frame_sequence; /* frame sequence counter */ bool last_eof; /* waiting for last EOF at stream off */ bool nfb4eof; /* NFB4EOF encountered during streaming */ struct completion last_eof_comp; @@ -211,12 +212,14 @@ static void prp_vb2_buf_done(struct prp_priv *priv, struct ipuv3_channel *ch) done = priv->active_vb2_buf[priv->ipu_buf_num]; if (done) { done->vbuf.field = vdev->fmt.fmt.pix.field; + done->vbuf.sequence = priv->frame_sequence; vb = &done->vbuf.vb2_buf; vb->timestamp = ktime_get_ns(); vb2_buffer_done(vb, priv->nfb4eof ? VB2_BUF_STATE_ERROR : VB2_BUF_STATE_DONE); } + priv->frame_sequence++; priv->nfb4eof = false; /* get next queued buffer */ @@ -638,6 +641,7 @@ static int prp_start(struct prp_priv *priv) /* init EOF completion waitq */ init_completion(&priv->last_eof_comp); + priv->frame_sequence = 0; priv->last_eof = false; priv->nfb4eof = false; diff --git a/drivers/staging/media/imx/imx-media-csi.c b/drivers/staging/media/imx/imx-media-csi.c index 5f69117b5811..3f2ce05848f3 100644 --- a/drivers/staging/media/imx/imx-media-csi.c +++ b/drivers/staging/media/imx/imx-media-csi.c @@ -111,6 +111,7 @@ struct csi_priv { struct v4l2_ctrl_handler ctrl_hdlr; int stream_count; /* streaming counter */ + u32 frame_sequence; /* frame sequence counter */ bool last_eof; /* waiting for last EOF at stream off */ bool nfb4eof; /* NFB4EOF encountered during streaming */ struct completion last_eof_comp; @@ -237,12 +238,14 @@ static void csi_vb2_buf_done(struct csi_priv *priv) done = priv->active_vb2_buf[priv->ipu_buf_num]; if (done) { done->vbuf.field = vdev->fmt.fmt.pix.field; + done->vbuf.sequence = priv->frame_sequence; vb = &done->vbuf.vb2_buf; vb->timestamp = ktime_get_ns(); vb2_buffer_done(vb, priv->nfb4eof ? VB2_BUF_STATE_ERROR : VB2_BUF_STATE_DONE); } + priv->frame_sequence++; priv->nfb4eof = false; /* get next queued buffer */ @@ -544,6 +547,7 @@ static int csi_idmac_start(struct csi_priv *priv) /* init EOF completion waitq */ init_completion(&priv->last_eof_comp); + priv->frame_sequence = 0; priv->last_eof = false; priv->nfb4eof = false;