On 5/19/21 12:36 PM, Dikshita Agarwal wrote:
> Consider alignment while calculating NUM_MBS.
>
> Co-developed-by: Mansur Alisha Shaik <mansur@xxxxxxxxxxxxxx>
> Signed-off-by: Dikshita Agarwal <dikshita@xxxxxxxxxxxxxx>
> ---
> 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
