Received: by 2002:a05:6a10:6744:0:0:0:0 with SMTP id w4csp3171347pxu; Sat, 10 Oct 2020 23:25:28 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyQYGY5aa/z1bs4cGFPeaJ/DlmvXOvZcSFpZ9zEC94nyagNWg2j1hZwcitS+yI05ro0qzI6 X-Received: by 2002:a50:e8cc:: with SMTP id l12mr7786895edn.29.1602397528405; Sat, 10 Oct 2020 23:25:28 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1602397528; cv=none; d=google.com; s=arc-20160816; b=sOjIovRs8/3KtOgIdFEckIkO3085JspMLcrjMqGpfPOJWHlGc2xMGb2EKMhFFEO7i5 /9Y4rp7aRwkKBjaeU3PxKuUhVa53iG+s3+iYYFctAXbHx9r2uOkOPXI7FPRfrCjLQSb7 oxWJQkxNpl6KNwMSP0Z1eBaiCRBmp30kRz/57a1lRFTRKFm2tIAb93na8pnnZ5+4U3wt EwDbb/3uMPcBGc7db97Ya1EW+YRpt6mikT/FaxW/k4qUMrVYY3OTF1xu/jELAuM54l4h VxhZ8MyJ4zi0lB8yKO6IuUmeKZSwB3M3yic3PxUK2ZMCvJrsUHwI1sgSzE4tUd+xz92b OwcQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:content-language :in-reply-to:mime-version:user-agent:date:message-id:from:references :cc:to:subject:dkim-signature; bh=GSxc1jcPdxMOM8wAWKwJKOGpmdRepetQKmt3O6AeipA=; b=xO4t7ubztD0jnFRG7SoDDXlsap8IR3/oKTorwnxOlyl4c6O+MVhc7KaaOqUrQ5W8Bo +4bwBxw3q1LDBJDXPXnQVsDGvA5CVx3t0MFs2fEHYQunB9e5BgKWtz5ICAmLJnWPCk0W rYSe99fxs1gFjbluHUx60FraOnfC1+cju5OYnfq68iVBBMR6cXqfVyUzSBnSaTavIc0t pAeJWXcFR+Jx66QjQzF/t/D5l2dhc1yYWrwcYL+dNCvD27xKhDovFc71OT7MeHHJUslx Kym3qXqpxJIM6/fDSdqYNDh7XyzJLHL84bcPbCUyi6w1bLGOZMb9rGDCGREvFY9nHGTo nj5A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=mKuDlT60; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id g12si9223915ejx.495.2020.10.10.23.25.05; Sat, 10 Oct 2020 23:25:28 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=mKuDlT60; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729937AbgJJBtR (ORCPT + 99 others); Fri, 9 Oct 2020 21:49:17 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41454 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729280AbgJJBVu (ORCPT ); Fri, 9 Oct 2020 21:21:50 -0400 Received: from mail-wr1-x444.google.com (mail-wr1-x444.google.com [IPv6:2a00:1450:4864:20::444]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 40E90C0613CF for ; Fri, 9 Oct 2020 18:21:49 -0700 (PDT) Received: by mail-wr1-x444.google.com with SMTP id g12so12030776wrp.10 for ; Fri, 09 Oct 2020 18:21:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=subject:to:cc:references:from:message-id:date:user-agent :mime-version:in-reply-to:content-language:content-transfer-encoding; bh=GSxc1jcPdxMOM8wAWKwJKOGpmdRepetQKmt3O6AeipA=; b=mKuDlT604UbMuCqS+hNfKjKSKMHuQxzY3K9qNkugnGk4ZKW2aphVyZV8uxxAfXxP3b 2kNHc1hXPDolGukJCaU4bV04+a5jPoNeeYnSZGgUNDOY6yF3nyXywOWHIuejoc82U59T D+uu1hcrdUqu7VO/WCQhSDJY/ZKZV6PWHpaGFu1h90gbXicikRQ7KiBXhVDmkfmks/9j Vfm7pVzPR/0irxHCGYVHSWxyHv+IsOoEqfZbEerbUlz68X+ec+2IgG0A+rkPY46owBor 0Ef1lAul5ZHy9+Ptpki2HJfBdrQdJ9eu1g9kwVheFjB59OqJEZcg1m2UiGRQuOm6oajP 0VkQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:to:cc:references:from:message-id:date :user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=GSxc1jcPdxMOM8wAWKwJKOGpmdRepetQKmt3O6AeipA=; b=quuiYrlvsbTrYBv0sTOP3JVIrAnok1zgDK7N/koAIIUOdnnD4nVs0zNSQd21o33+nm 6WKhytJ2cvScLRyQAzafUMeQuRcKamcqG3tSfwP4sH38ObzPT4YgswOBnK2HfXwOTgJf IEFN1ZICDWdy7friomsPdlhGUnqCN53W5d51WFqmWrMogFZViJk0Lu7XZCYA+Gl8KIWF y3vt+dF5R8PfQ0XNH46PHPMmPyv8ops5uINCGmrcUPHT6PXJZYzeA8Z+H+cGlOmb48Ms KP8oS7oIYjzWcwrZePDlKfz01Mqm3VPnHEOJAVXBGhlLJ/i5uJtBars7CSLN3DJLSynn 6ptQ== X-Gm-Message-State: AOAM530R5EnkCNcLtSz2SpDJ8VScuXcawvTcLj8zwCVy0mNQ8jnm/MH7 odPg12B/gHvOICa4Szcw5EwSaw== X-Received: by 2002:adf:f7ca:: with SMTP id a10mr17430725wrq.321.1602292907690; Fri, 09 Oct 2020 18:21:47 -0700 (PDT) Received: from [192.168.1.8] ([195.24.90.54]) by smtp.googlemail.com with ESMTPSA id d23sm13717633wmb.6.2020.10.09.18.21.46 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 09 Oct 2020 18:21:47 -0700 (PDT) Subject: Re: [PATCH 2/3] venus: vdec: Make decoder return LAST flag for sufficient event To: vgarodia@codeaurora.org, Stanimir Varbanov Cc: linux-media@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org, Alexandre Courbot , Mansur Alisha Shaik References: <20200928164431.21884-1-stanimir.varbanov@linaro.org> <20200928164431.21884-3-stanimir.varbanov@linaro.org> <5a823acc60d4c5cace1d2562adc548ff@codeaurora.org> From: Stanimir Varbanov Message-ID: <5af74a17-6a93-5ac2-533e-8fca5c8d2faf@linaro.org> Date: Sat, 10 Oct 2020 04:21:45 +0300 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.10.0 MIME-Version: 1.0 In-Reply-To: <5a823acc60d4c5cace1d2562adc548ff@codeaurora.org> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi Vikash, On 10/7/20 10:53 PM, vgarodia@codeaurora.org wrote: > Hi Stan, > > On 2020-09-28 22:14, Stanimir Varbanov wrote: >> This makes the decoder to behaives equally for sufficient and > behaves > >> insufficient events. After this change the LAST buffer flag will be set >> when the new resolution (in dynamic-resolution-change state) is smaller >> then the old bitstream resolution. >> >> Signed-off-by: Stanimir Varbanov >> --- >>  drivers/media/platform/qcom/venus/vdec.c | 41 ++++++++++++++++-------- >>  1 file changed, 27 insertions(+), 14 deletions(-) >> >> diff --git a/drivers/media/platform/qcom/venus/vdec.c >> b/drivers/media/platform/qcom/venus/vdec.c >> index c11bdf3ca21b..c006401255dc 100644 >> --- a/drivers/media/platform/qcom/venus/vdec.c >> +++ b/drivers/media/platform/qcom/venus/vdec.c >> @@ -634,6 +634,7 @@ static int vdec_output_conf(struct venus_inst *inst) >>  { >>      struct venus_core *core = inst->core; >>      struct hfi_enable en = { .enable = 1 }; >> +    struct hfi_buffer_requirements bufreq; >>      u32 width = inst->out_width; >>      u32 height = inst->out_height; >>      u32 out_fmt, out2_fmt; >> @@ -709,6 +710,22 @@ static int vdec_output_conf(struct venus_inst *inst) >>      } >> >>      if (IS_V3(core) || IS_V4(core)) { >> +        ret = venus_helper_get_bufreq(inst, HFI_BUFFER_OUTPUT, &bufreq); >> +        if (ret) >> +            return ret; >> + >> +        if (bufreq.size > inst->output_buf_size) >> +            return -EINVAL; >> + >> +        if (inst->dpb_fmt) { >> +            ret = venus_helper_get_bufreq(inst, HFI_BUFFER_OUTPUT2, >> &bufreq); >> +            if (ret) >> +                return ret; >> + >> +            if (bufreq.size > inst->output2_buf_size) >> +                return -EINVAL; >> +        } >> + >>          if (inst->output2_buf_size) { >>              ret = venus_helper_set_bufsize(inst, >>                                 inst->output2_buf_size, >> @@ -1327,19 +1344,15 @@ static void vdec_event_change(struct >> venus_inst *inst, >>      dev_dbg(dev, VDBGM "event %s sufficient resources (%ux%u)\n", >>          sufficient ? "" : "not", ev_data->width, ev_data->height); >> >> -    if (sufficient) { >> -        hfi_session_continue(inst); >> -    } else { >> -        switch (inst->codec_state) { >> -        case VENUS_DEC_STATE_INIT: >> -            inst->codec_state = VENUS_DEC_STATE_CAPTURE_SETUP; >> -            break; >> -        case VENUS_DEC_STATE_DECODING: >> -            inst->codec_state = VENUS_DEC_STATE_DRC; >> -            break; >> -        default: >> -            break; >> -        } >> +    switch (inst->codec_state) { >> +    case VENUS_DEC_STATE_INIT: >> +        inst->codec_state = VENUS_DEC_STATE_CAPTURE_SETUP; >> +        break; >> +    case VENUS_DEC_STATE_DECODING: >> +        inst->codec_state = VENUS_DEC_STATE_DRC; > > Video firmware would raise reconfig event to driver even for cases like > interlace detection, color space change in the bitstream. If not with > this patch, > we can optimize by sending reconfig event only for resolution and > bitdepth update, > in a followup patch. Good point. Sure, I can do that in this series as separate patch. > >> +        break; >> +    default: >> +        break; >>      } >> >>      /* >> @@ -1348,7 +1361,7 @@ static void vdec_event_change(struct venus_inst >> *inst, >>       * itself doesn't mark the last decoder output buffer with HFI >> EOS flag. >>       */ >> >> -    if (!sufficient && inst->codec_state == VENUS_DEC_STATE_DRC) { >> +    if (inst->codec_state == VENUS_DEC_STATE_DRC) { >>          struct vb2_v4l2_buffer *last; >>          int ret; -- regards, Stan