Message ID | 1538566221-21369-1-git-send-email-vgarodia@codeaurora.org (mailing list archive) |
---|---|
State | Superseded, archived |
Delegated to: | Hans Verkuil |
Headers |
Received: from vger.kernel.org ([209.132.180.67]) by www.linuxtv.org with esmtp (Exim 4.84_2) (envelope-from <linux-media-owner@vger.kernel.org>) id 1g7fMb-00023c-Aq; Wed, 03 Oct 2018 11:30:45 +0000 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726811AbeJCSSh (ORCPT <rfc822;mkrufky@linuxtv.org> + 1 other); Wed, 3 Oct 2018 14:18:37 -0400 Received: from smtp.codeaurora.org ([198.145.29.96]:53114 "EHLO smtp.codeaurora.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726547AbeJCSSh (ORCPT <rfc822; linux-media@vger.kernel.org>); Wed, 3 Oct 2018 14:18:37 -0400 Received: by smtp.codeaurora.org (Postfix, from userid 1000) id 0670F607BD; Wed, 3 Oct 2018 11:30:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1538566238; bh=kcINhkcUfuzC1LCmMOCUFvDVNU6dzcolKIXuKvfbxi8=; h=From:To:Cc:Subject:Date:From; b=o2k91CjD0ojgejpAsuacmNCmPDZV/Mp/OHzs3UeqlsX3S4Gp8yxnKcHTBL3CsXDRa kcFXcR5WXaGgqQNKlIUWK26RqH0drLpmEG6vSjstSFSN0QFGDX2Ie9fTKGq1nC/vjQ 4FlsalgRNQidtusuWX9FIshLkKgFQnknHCnQY0i8= X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on pdx-caf-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.7 required=2.0 tests=ALL_TRUSTED,BAYES_00, DKIM_INVALID, DKIM_SIGNED autolearn=no autolearn_force=no version=3.4.0 Received: from vgarodia-linux.qualcomm.com (blr-c-bdr-fw-01_globalnat_allzones-outside.qualcomm.com [103.229.19.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (No client certificate requested) (Authenticated sender: vgarodia@smtp.codeaurora.org) by smtp.codeaurora.org (Postfix) with ESMTPSA id A627460B26; Wed, 3 Oct 2018 11:30:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1538566237; bh=kcINhkcUfuzC1LCmMOCUFvDVNU6dzcolKIXuKvfbxi8=; h=From:To:Cc:Subject:Date:From; b=VuKB8p0CEu7WZjpdEYYkDV7k80Ych0pKouFycCyU3UFlaXDPcWKkhIlhzwpNdr35X +mQKTQBYPao8ZZNRZduLAY4jQACAqpjiLiU3Sq2kByHqxmd4APNHLC4jv6e/rqcKb+ HMaWMzxCtG6g5dUGUppX32CKARWgTTEiOu2vpc9A= DMARC-Filter: OpenDMARC Filter v1.3.2 smtp.codeaurora.org A627460B26 Authentication-Results: pdx-caf-mail.web.codeaurora.org; dmarc=none (p=none dis=none) header.from=codeaurora.org Authentication-Results: pdx-caf-mail.web.codeaurora.org; spf=none smtp.mailfrom=vgarodia@codeaurora.org From: Vikash Garodia <vgarodia@codeaurora.org> To: stanimir.varbanov@linaro.org, hverkuil@xs4all.nl, mchehab@kernel.org Cc: linux-media@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-msm@vger.kernel.org, acourbot@chromium.org, vgarodia@codeaurora.org Subject: [PATCH] venus: vdec: fix decoded data size Date: Wed, 3 Oct 2018 17:00:21 +0530 Message-Id: <1538566221-21369-1-git-send-email-vgarodia@codeaurora.org> X-Mailer: git-send-email 1.9.1 Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: <linux-media.vger.kernel.org> X-Mailing-List: linux-media@vger.kernel.org |
Commit Message
Vikash Garodia
Oct. 3, 2018, 11:30 a.m. UTC
Exisiting code returns the max of the decoded size and buffer size.
It turns out that buffer size is always greater due to hardware
alignment requirement. As a result, payload size given to client
is incorrect. This change ensures that the bytesused is assigned
to actual payload size, when available.
Signed-off-by: Vikash Garodia <vgarodia@codeaurora.org>
---
drivers/media/platform/qcom/venus/vdec.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
Comments
Hi Vikash, On 10/03/2018 02:30 PM, Vikash Garodia wrote: > Exisiting code returns the max of the decoded size and buffer size. > It turns out that buffer size is always greater due to hardware > alignment requirement. As a result, payload size given to client > is incorrect. This change ensures that the bytesused is assigned > to actual payload size, when available. > > Signed-off-by: Vikash Garodia <vgarodia@codeaurora.org> > --- > drivers/media/platform/qcom/venus/vdec.c | 3 +-- > 1 file changed, 1 insertion(+), 2 deletions(-) > > diff --git a/drivers/media/platform/qcom/venus/vdec.c b/drivers/media/platform/qcom/venus/vdec.c > index 991e158..189ec97 100644 > --- a/drivers/media/platform/qcom/venus/vdec.c > +++ b/drivers/media/platform/qcom/venus/vdec.c > @@ -888,8 +888,7 @@ static void vdec_buf_done(struct venus_inst *inst, unsigned int buf_type, > unsigned int opb_sz = venus_helper_get_opb_size(inst); > > vb = &vbuf->vb2_buf; > - vb->planes[0].bytesused = > - max_t(unsigned int, opb_sz, bytesused); > + vb2_set_plane_payload(vb, 0, bytesused ? : opb_sz); > vb->planes[0].data_offset = data_offset; > vb->timestamp = timestamp_us * NSEC_PER_USEC; > vbuf->sequence = inst->sequence_cap++; > Acked-by: Stanimir Varbanov <stanimir.varbanov@linaro.org>
Hi Vikash, please, increment the version of the patch next time. This one must be v2. On 10/03/2018 02:30 PM, Vikash Garodia wrote: > Exisiting code returns the max of the decoded size and buffer size. s/Exisiting/Existing > It turns out that buffer size is always greater due to hardware > alignment requirement. As a result, payload size given to client > is incorrect. This change ensures that the bytesused is assigned > to actual payload size, when available. > > Signed-off-by: Vikash Garodia <vgarodia@codeaurora.org> > --- > drivers/media/platform/qcom/venus/vdec.c | 3 +-- > 1 file changed, 1 insertion(+), 2 deletions(-) > > diff --git a/drivers/media/platform/qcom/venus/vdec.c b/drivers/media/platform/qcom/venus/vdec.c > index 991e158..189ec97 100644 > --- a/drivers/media/platform/qcom/venus/vdec.c > +++ b/drivers/media/platform/qcom/venus/vdec.c > @@ -888,8 +888,7 @@ static void vdec_buf_done(struct venus_inst *inst, unsigned int buf_type, > unsigned int opb_sz = venus_helper_get_opb_size(inst); > > vb = &vbuf->vb2_buf; > - vb->planes[0].bytesused = > - max_t(unsigned int, opb_sz, bytesused); > + vb2_set_plane_payload(vb, 0, bytesused ? : opb_sz); > vb->planes[0].data_offset = data_offset; > vb->timestamp = timestamp_us * NSEC_PER_USEC; > vbuf->sequence = inst->sequence_cap++; >
Hi Stanimir, On 2018-10-05 20:56, Stanimir Varbanov wrote: > Hi Vikash, > > please, increment the version of the patch next time. This one must be > v2. > > On 10/03/2018 02:30 PM, Vikash Garodia wrote: >> Exisiting code returns the max of the decoded size and buffer size. > > s/Exisiting/Existing > Posted v2 with above comments. Thanks, Vikash
diff --git a/drivers/media/platform/qcom/venus/vdec.c b/drivers/media/platform/qcom/venus/vdec.c index 991e158..189ec97 100644 --- a/drivers/media/platform/qcom/venus/vdec.c +++ b/drivers/media/platform/qcom/venus/vdec.c @@ -888,8 +888,7 @@ static void vdec_buf_done(struct venus_inst *inst, unsigned int buf_type, unsigned int opb_sz = venus_helper_get_opb_size(inst); vb = &vbuf->vb2_buf; - vb->planes[0].bytesused = - max_t(unsigned int, opb_sz, bytesused); + vb2_set_plane_payload(vb, 0, bytesused ? : opb_sz); vb->planes[0].data_offset = data_offset; vb->timestamp = timestamp_us * NSEC_PER_USEC; vbuf->sequence = inst->sequence_cap++;