From patchwork Tue Mar 13 22:34:05 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Seiderer X-Patchwork-Id: 47908 Received: from vger.kernel.org ([209.132.180.67]) by www.linuxtv.org with esmtp (Exim 4.84_2) (envelope-from ) id 1evsV5-0004RR-T4; Tue, 13 Mar 2018 22:34:32 +0000 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753150AbeCMWea (ORCPT + 1 other); Tue, 13 Mar 2018 18:34:30 -0400 Received: from mout.gmx.net ([212.227.17.22]:55061 "EHLO mout.gmx.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753136AbeCMWe3 (ORCPT ); Tue, 13 Mar 2018 18:34:29 -0400 Received: from localhost.localdomain ([188.99.117.73]) by mail.gmx.com (mrgmx102 [212.227.17.168]) with ESMTPSA (Nemesis) id 0LfHs4-1eGF9C4BZo-00omdi; Tue, 13 Mar 2018 23:34:23 +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 v2] media: staging/imx: fill vb2_v4l2_buffer sequence entry Date: Tue, 13 Mar 2018 23:34:05 +0100 Message-Id: <20180313223405.16627-1-ps.report@gmx.net> X-Mailer: git-send-email 2.16.2 X-Provags-ID: V03:K0:/JBUzStknPThZ3i9e8HLJPKSrU61ZPvIUqj/BjhrTg6amAsB8nx hb1Vi730ER/XGhqJ+PLtkIlMVMaP6BmGdYJzQmM4dMzo+K6VTqOUsDFL0r0GORqx7oR//g3 MC3Oig01+yo+SSYduEOaDz06lBHNpAknylfML8XMn3yptdNqqXgObK4C7TdQ2mgdNT/TKqO TfIims2GuXfjkgrLJ6KEA== X-UI-Out-Filterresults: notjunk:1; V01:K0:KvUP3pBeDmw=:N+6Ljr/tcx60azg4m9PCtd pH4d10ttO9NoujIMWqI3L0yvXxivWkD/DyTEG6Z+gtNpxoxVFwvaYtDsl2X4wbY0QVIXEknkU zXpgeu+1LTrjeMz4AcCqfQuVWyjv5kDFq/5oUeAHz1X4xipOMDE7UFHfNseYakobpz3g7RZfT 9FKpF+dlf1MuxZUNdmXL6tf1CSQVqqIAKv3VznTdO790aCo9OemQaTSHRSkhC4dBSwZkD1LeB dxSEY5Xom+i6NNC+wqZcQgEawmctMMcDf2J0mGFSq0g56woWbfxZkmAyDlDXKubwZoe4iVa+5 qBrMJmIHBCaZ1pHCj2SM4l87B+bhFMLnbJfr7b2nNgMxieGRC42H/zZnVoI8XZJn5Aj4Cy10L gm/nvma2sFOFbmEBjdB5boTE1IctR3tkKH12UmuKTdNq/3r0ROQJF2QkMJti465aLHpYNoZYD ybvalYywvQ8xJOnProSB05heySnZLjEp+5QxmWKwRtmGpvfb7wBOxUXjD7ozbgNCC7rxHiclf iaQHx/Z3bluhuQlQHQ+I/mOONzENJNcJdlVfAxva5w43SMG6lvYuAAHCDGKv0QoBBlV+BMmeN 7/gtRLdnVM4ZppuaqqMxP3jzU/nsgL7f7qMIQBj/5ptfeSzQobQwSuH6w2BV6c+p9BmsfRTs4 hBc0jsnRod1rVjhdxcPtQPozVaBHHwSPEzgfmx2j/hMOdVUgqrcvqOeqRlAd4aowWMyFIIJ8g 7A6mSzycGQs4XoroXvquAssn9u6gu9Lx+TNLmxdRemlGkR0altjJJOVhEC/fd5AdaThNs0yqU 4LAmZJFpE+EbtVEelzjF456kKIflg== Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org Signed-off-by: Peter Seiderer --- drivers/staging/media/imx/imx-ic-prpencvf.c | 5 +++++ drivers/staging/media/imx/imx-media-csi.c | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/drivers/staging/media/imx/imx-ic-prpencvf.c b/drivers/staging/media/imx/imx-ic-prpencvf.c index ae453fd422f0..eaca74b72114 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; @@ -208,8 +209,11 @@ static void prp_vb2_buf_done(struct prp_priv *priv, struct ipuv3_channel *ch) struct vb2_buffer *vb; dma_addr_t phys; + priv->frame_sequence++; + done = priv->active_vb2_buf[priv->ipu_buf_num]; if (done) { + done->vbuf.sequence = priv->frame_sequence; vb = &done->vbuf.vb2_buf; vb->timestamp = ktime_get_ns(); vb2_buffer_done(vb, priv->nfb4eof ? @@ -637,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 5a195f80a24d..3a6a645b9dce 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; @@ -234,8 +235,11 @@ static void csi_vb2_buf_done(struct csi_priv *priv) struct vb2_buffer *vb; dma_addr_t phys; + priv->frame_sequence++; + done = priv->active_vb2_buf[priv->ipu_buf_num]; if (done) { + done->vbuf.sequence = priv->frame_sequence; vb = &done->vbuf.vb2_buf; vb->timestamp = ktime_get_ns(); vb2_buffer_done(vb, priv->nfb4eof ? @@ -543,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;