From: Stanimir Varbanov <stanimir.varbanov@linaro.org>
To: Dikshita Agarwal <dikshita@codeaurora.org>, linux-media@vger.kernel.org
Cc: linux-kernel@vger.kernel.org, vgarodia@codeaurora.org
Subject: Re: [PATCH 6/7] media: venus: helpers: update NUM_MBS macro calculation
Date: Mon, 31 May 2021 14:21:44 +0300 [thread overview]
Message-ID: <c285b442-f031-3d0e-08b2-281a53df1121@linaro.org> (raw)
In-Reply-To: <1621417008-6117-7-git-send-email-dikshita@codeaurora.org>
On 5/19/21 12:36 PM, Dikshita Agarwal wrote:
> Consider alignment while calculating NUM_MBS.
>
> Co-developed-by: Mansur Alisha Shaik <mansur@codeaurora.org>
> Signed-off-by: Dikshita Agarwal <dikshita@codeaurora.org>
> ---
> drivers/media/platform/qcom/venus/helpers.c | 28 +++++++++++++++-------------
> 1 file changed, 15 insertions(+), 13 deletions(-)
>
> diff --git a/drivers/media/platform/qcom/venus/helpers.c b/drivers/media/platform/qcom/venus/helpers.c
> index 2223f55..cbe653f 100644
> --- a/drivers/media/platform/qcom/venus/helpers.c
> +++ b/drivers/media/platform/qcom/venus/helpers.c
> @@ -18,8 +18,8 @@
> #include "hfi_platform.h"
> #include "hfi_parser.h"
>
> -#define NUM_MBS_720P (((1280 + 15) >> 4) * ((720 + 15) >> 4))
> -#define NUM_MBS_4K (((4096 + 15) >> 4) * ((2304 + 15) >> 4))
> +#define NUM_MBS_720P (((ALIGN(1280, 16)) >> 4) * ((ALIGN(736, 16)) >> 4))
> +#define NUM_MBS_4K (((ALIGN(4096, 16)) >> 4) * ((ALIGN(2304, 16)) >> 4))
>
> struct intbuf {
> struct list_head list;
> @@ -1099,17 +1099,19 @@ static u32 venus_helper_get_work_mode(struct venus_inst *inst)
> u32 num_mbs;
>
> mode = VIDC_WORK_MODE_2;
> - if (inst->session_type == VIDC_SESSION_TYPE_DEC) {
> - num_mbs = (ALIGN(inst->height, 16) * ALIGN(inst->width, 16)) / 256;
> - if (inst->hfi_codec == HFI_VIDEO_CODEC_MPEG2 ||
> - inst->pic_struct != HFI_INTERLACE_FRAME_PROGRESSIVE ||
> - num_mbs <= NUM_MBS_720P)
> - mode = VIDC_WORK_MODE_1;
> - } else {
> - num_mbs = (ALIGN(inst->out_height, 16) * ALIGN(inst->out_width, 16)) / 256;
> - if (inst->hfi_codec == HFI_VIDEO_CODEC_VP8 &&
> - num_mbs <= NUM_MBS_4K)
> - mode = VIDC_WORK_MODE_1;
> + if (IS_V6(inst->core)) {
IS_V6() is not needed - we already have this check in
venus_helper_set_work_mode()
> + if (inst->session_type == VIDC_SESSION_TYPE_DEC) {
> + num_mbs = ((ALIGN(inst->height, 16))/16 * (ALIGN(inst->width, 16)))/16;
> + if (inst->hfi_codec == HFI_VIDEO_CODEC_MPEG2 ||
> + inst->pic_struct != HFI_INTERLACE_FRAME_PROGRESSIVE ||
> + num_mbs <= NUM_MBS_720P)
> + mode = VIDC_WORK_MODE_1;
> + } else {
> + num_mbs = (ALIGN(inst->out_height, 16) * ALIGN(inst->out_width, 16)) / 256;
> + if (inst->hfi_codec == HFI_VIDEO_CODEC_VP8 &&
> + num_mbs <= NUM_MBS_4K)
> + mode = VIDC_WORK_MODE_1;
> + }
> }
>
> return mode;
>
--
regards,
Stan
next prev parent reply other threads:[~2021-05-31 11:21 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-05-19 9:36 [PATCH 0/7] media: venus: Enable venus support on sc7280 Dikshita Agarwal
2021-05-19 9:36 ` [PATCH 1/7] venus: firmware: enable no tz fw loading for sc7280 Dikshita Agarwal
2021-05-31 9:01 ` Stanimir Varbanov
2021-05-19 9:36 ` [PATCH 2/7] media: venus: core: Add sc7280 DT compatible and resource data Dikshita Agarwal
2021-05-31 11:18 ` Stanimir Varbanov
2021-05-19 9:36 ` [PATCH 3/7] media: venus: Add num_vpp_pipes to resource structure Dikshita Agarwal
2021-05-31 11:19 ` Stanimir Varbanov
2021-05-19 9:36 ` [PATCH 4/7] media: venus: hfi: Skip AON register programming for V6 1pipe Dikshita Agarwal
2021-05-31 11:19 ` Stanimir Varbanov
2021-05-19 9:36 ` [PATCH 5/7] venus: vdec: set work route to fw Dikshita Agarwal
2021-05-31 10:32 ` Stanimir Varbanov
2021-05-19 9:36 ` [PATCH 6/7] media: venus: helpers: update NUM_MBS macro calculation Dikshita Agarwal
2021-05-31 11:21 ` Stanimir Varbanov [this message]
2021-05-19 9:36 ` [PATCH 7/7] media: venus: Set buffer to FW based on FW min count requirement Dikshita Agarwal
2021-05-31 11:28 ` Stanimir Varbanov
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=c285b442-f031-3d0e-08b2-281a53df1121@linaro.org \
--to=stanimir.varbanov@linaro.org \
--cc=dikshita@codeaurora.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-media@vger.kernel.org \
--cc=vgarodia@codeaurora.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).