From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id EF605C7618F for ; Mon, 15 Jul 2019 14:39:56 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id C543720868 for ; Mon, 15 Jul 2019 14:39:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1563201596; bh=5XfmVxC2Bggz6JYuquCZyMix+fDR+5L8yn27Jb1F98Q=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=aAvaV8scxdcW+nE7MWL9U1eVjbihGwx9wG6wdsKeqnMHhjXlkAOjCNV7rBWUr+sxi TgFc2PdgV70qNR5kDJ/Ye7f37V4s1oKOKNfGYjGhg5WTpjH9KvgMpEPeisLEI1YVTy cimdOkG/Ofiyi5PbMPj8Cea1QeFNUCnjM2xeeuOw= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2404386AbfGOOj4 (ORCPT ); Mon, 15 Jul 2019 10:39:56 -0400 Received: from mail.kernel.org ([198.145.29.99]:40282 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731651AbfGOOjx (ORCPT ); Mon, 15 Jul 2019 10:39:53 -0400 Received: from sasha-vm.mshome.net (unknown [73.61.17.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 8A4E220896; Mon, 15 Jul 2019 14:39:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1563201592; bh=5XfmVxC2Bggz6JYuquCZyMix+fDR+5L8yn27Jb1F98Q=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=gqXbjn6kP5LGwgVDf69XBy7bmcw2Pdc5DRY3qCyxDvLvE6mURYKepj7OLHKuMARZ8 YaJeCFGSwbCVbsJVtZ2Ix/RDHhhz2oTEG2x+w9oLiesgyPSBnsQ+KB7qMLhunonRx/ HSqF48bLeM6W3N7EsxvoUTv7mGFXW+TvjZRz9n+A= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Philipp Zabel , Hans Verkuil , Mauro Carvalho Chehab , Sasha Levin , linux-media@vger.kernel.org Subject: [PATCH AUTOSEL 4.9 50/73] media: coda: increment sequence offset for the last returned frame Date: Mon, 15 Jul 2019 10:36:06 -0400 Message-Id: <20190715143629.10893-50-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190715143629.10893-1-sashal@kernel.org> References: <20190715143629.10893-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Philipp Zabel [ Upstream commit b3b7d96817cdb8b6fc353867705275dce8f41ccc ] If no more frames are decoded in bitstream end mode, and a previously decoded frame has been returned, the firmware still increments the frame number. To avoid a sequence number mismatch after decoder restart, increment the sequence_offset correction parameter. Signed-off-by: Philipp Zabel Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Sasha Levin --- drivers/media/platform/coda/coda-bit.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/media/platform/coda/coda-bit.c b/drivers/media/platform/coda/coda-bit.c index 1b8024f86b0f..df4643956c96 100644 --- a/drivers/media/platform/coda/coda-bit.c +++ b/drivers/media/platform/coda/coda-bit.c @@ -1967,6 +1967,9 @@ static void coda_finish_decode(struct coda_ctx *ctx) else if (ctx->display_idx < 0) ctx->hold = true; } else if (decoded_idx == -2) { + if (ctx->display_idx >= 0 && + ctx->display_idx < ctx->num_internal_frames) + ctx->sequence_offset++; /* no frame was decoded, we still return remaining buffers */ } else if (decoded_idx < 0 || decoded_idx >= ctx->num_internal_frames) { v4l2_err(&dev->v4l2_dev, -- 2.20.1