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=-17.2 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,NICE_REPLY_A,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,USER_AGENT_SANE_1 autolearn=unavailable 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 12260C4332F for ; Tue, 21 Sep 2021 13:48:22 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id ED8C460F6D for ; Tue, 21 Sep 2021 13:48:21 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233418AbhIUNtq (ORCPT ); Tue, 21 Sep 2021 09:49:46 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55224 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233099AbhIUNtp (ORCPT ); Tue, 21 Sep 2021 09:49:45 -0400 Received: from mail-ed1-x52e.google.com (mail-ed1-x52e.google.com [IPv6:2a00:1450:4864:20::52e]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 91F6DC061574 for ; Tue, 21 Sep 2021 06:48:16 -0700 (PDT) Received: by mail-ed1-x52e.google.com with SMTP id c21so73231993edj.0 for ; Tue, 21 Sep 2021 06:48:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:subject:to:cc:references:message-id:date:user-agent :mime-version:in-reply-to:content-language:content-transfer-encoding; bh=aNTuizOqdzDW7h7h80neHzRKPQ4VEqD5lgD02Fykhis=; b=cwAeLQHcRd3Uq6KkyWNqKcGT6AwrJ4sheK5cgo9pLjTGusgx0FGT6Vj783nqbphwof nkQgjyV4+zOvSUoMbwoEEmjD+h0iR84nLwNDHrFF9sCnV33cdycDdPxmeXBMP/HMGaO2 hJHHx9zVdMlWsyRtPnR8F2u1bFKF23Evpihm1El73VB/xjMsayPNP8gCestCG5gcGjRQ gkCptOwSyRCrt0NxZHMW+4p1k4BaWEDrSZo4iRT2F12yu2v4NNTnFsCECQl51UDsAYjo y4iJAlNfAmaCHOnTuFdtG0LOmslJDNsJyC40Tn0mj/L45OcT2v8kkVm3/jLNm8boCufG RG2g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:subject:to:cc:references:message-id:date :user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=aNTuizOqdzDW7h7h80neHzRKPQ4VEqD5lgD02Fykhis=; b=iRQ44TEC98g+DimBa19jKivE4jndVVIRMmc4hp9Dyt3+qj/C0uUX5F3dufRPQOps2z 50FUs1B/TlqpChuIFb3KEKaQFUAYPKn39rUdHDy1OV9oQz9VNNvsDT9AeDK2rNljKfUD 9nlfCUFp/Pgh9IYpBnFeWRyFJVEdzQhzsHgN6vqYXb5eE4QEoSDYUkZhzIotiEKWvdYF tSNqL/RO1XrJTU3ajUKd3BpEz+totPLOK608mOLBqb8hfNTjYFDt3s9oeBwYtYw7FVhi W2Wswkm37yVxXjbiu72xZQmxkkQJhSOXcfVC7IXqogzf05B81SfPp12AxYcb24Bsa1lE CUGw== X-Gm-Message-State: AOAM531+A6Ak7kZITE52Ar7O3ymA0sp3aWZEklVWOM5vPyg9blzXmM4F Mrw/rW5earm5NyDH7p7VudkpjA== X-Google-Smtp-Source: ABdhPJxTC4ocrnN/aqmIcIz7gSOiuc6J9ZIJPBIuge5cZv5KeVcxjyEE2ujPIUbb6GrWuK+rP9PSmw== X-Received: by 2002:a17:906:1601:: with SMTP id m1mr35348931ejd.485.1632232037519; Tue, 21 Sep 2021 06:47:17 -0700 (PDT) Received: from [192.168.1.15] (hst-221-95.medicom.bg. [84.238.221.95]) by smtp.googlemail.com with ESMTPSA id d16sm8588731edu.8.2021.09.21.06.47.16 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 21 Sep 2021 06:47:17 -0700 (PDT) From: Stanimir Varbanov Subject: Re: [V3] venus: vdec: decoded picture buffer handling during reconfig sequence To: Mansur Alisha Shaik , linux-media@vger.kernel.org, stanimir.varbanov@linaro.org Cc: linux-kernel@vger.kernel.org, linux-arm-msm@vger.kernel.org, vgarodia@codeaurora.org, dikshita@codeaurora.org References: <20210825110841.12815-1-mansur@codeaurora.org> Message-ID: <78dec463-5e75-18d7-b74e-154f00b8a7b2@linaro.org> Date: Tue, 21 Sep 2021 16:47:15 +0300 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.11.0 MIME-Version: 1.0 In-Reply-To: <20210825110841.12815-1-mansur@codeaurora.org> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi Mansur, On 8/25/21 2:08 PM, Mansur Alisha Shaik wrote: > In existing implementation, driver is freeing and un-mapping all the > decoded picture buffers(DPB) as part of dynamic resolution change(DRC) > handling. As a result, when firmware try to access the DPB buffer, from > previous sequence, SMMU context fault is seen due to the buffer being > already unmapped. > > With this change, driver defines ownership of each DPB buffer. If a buffer > is owned by firmware, driver would skip from un-mapping the same. > > Signed-off-by: Mansur Alisha Shaik > > Changes in V3: > - Migrated id allocation using kernel API ida_alloc_min() > > --- > drivers/media/platform/qcom/venus/helpers.c | 50 ++++++++++++++++++++- > drivers/media/platform/qcom/venus/helpers.h | 2 + > drivers/media/platform/qcom/venus/vdec.c | 7 ++- > 3 files changed, 57 insertions(+), 2 deletions(-) > > diff --git a/drivers/media/platform/qcom/venus/helpers.c b/drivers/media/platform/qcom/venus/helpers.c > index 8012f5c7bf34..f36361d346b2 100644 > --- a/drivers/media/platform/qcom/venus/helpers.c > +++ b/drivers/media/platform/qcom/venus/helpers.c > @@ -3,6 +3,7 @@ > * Copyright (c) 2012-2016, The Linux Foundation. All rights reserved. > * Copyright (C) 2017 Linaro Ltd. > */ > +#include > #include > #include > #include > @@ -21,6 +22,13 @@ > #define NUM_MBS_720P (((1280 + 15) >> 4) * ((720 + 15) >> 4)) > #define NUM_MBS_4K (((4096 + 15) >> 4) * ((2304 + 15) >> 4)) > > +static DEFINE_IDA(dpb_out_tag_ida); No global static variables please. Make it part of venus_inst structure. > + > +enum dpb_buf_owner { > + DRIVER, > + FIRMWARE, > +}; > + > struct intbuf { > struct list_head list; > u32 type; > @@ -28,6 +36,8 @@ struct intbuf { > void *va; > dma_addr_t da; > unsigned long attrs; > + enum dpb_buf_owner owned_by; > + u32 dpb_out_tag; > }; > > bool venus_helper_check_codec(struct venus_inst *inst, u32 v4l2_pixfmt) > @@ -95,9 +105,16 @@ int venus_helper_queue_dpb_bufs(struct venus_inst *inst) > fdata.device_addr = buf->da; > fdata.buffer_type = buf->type; > > + if (buf->owned_by == FIRMWARE) > + continue; > + > + fdata.clnt_data = buf->dpb_out_tag; > + > ret = hfi_session_process_buf(inst, &fdata); > if (ret) > goto fail; > + > + buf->owned_by = FIRMWARE; > } > > fail: > @@ -110,13 +127,19 @@ int venus_helper_free_dpb_bufs(struct venus_inst *inst) > struct intbuf *buf, *n; > > list_for_each_entry_safe(buf, n, &inst->dpbbufs, list) { > + if (buf->owned_by == FIRMWARE) > + continue; > + > + ida_free(&dpb_out_tag_ida, buf->dpb_out_tag); > + > list_del_init(&buf->list); > dma_free_attrs(inst->core->dev, buf->size, buf->va, buf->da, > buf->attrs); > kfree(buf); > } > > - INIT_LIST_HEAD(&inst->dpbbufs); > + if (list_empty(&inst->dpbbufs)) > + INIT_LIST_HEAD(&inst->dpbbufs); > > return 0; > } > @@ -134,6 +157,7 @@ int venus_helper_alloc_dpb_bufs(struct venus_inst *inst) > unsigned int i; > u32 count; > int ret; > + int id; > > /* no need to allocate dpb buffers */ > if (!inst->dpb_fmt) > @@ -171,6 +195,15 @@ int venus_helper_alloc_dpb_bufs(struct venus_inst *inst) > ret = -ENOMEM; > goto fail; > } > + buf->owned_by = DRIVER; > + > + id = ida_alloc_min(&dpb_out_tag_ida, VB2_MAX_FRAME, GFP_KERNEL); > + if (id < 0) { > + ret = id; > + goto fail; > + } > + > + buf->dpb_out_tag = id; > > list_add_tail(&buf->list, &inst->dpbbufs); > } > @@ -1365,6 +1398,21 @@ venus_helper_find_buf(struct venus_inst *inst, unsigned int type, u32 idx) > } > EXPORT_SYMBOL_GPL(venus_helper_find_buf); > > +void venus_helper_find_dpb_buf(struct venus_inst *inst, struct vb2_v4l2_buffer *vbuf, > + unsigned int type, unsigned int buf_type, u32 tag) If this helper will return void then it should be renamed to something like venus_helper_dpb_buf_change_owner(). > +{ > + struct intbuf *dpb_buf; > + > + if (type == V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE && > + buf_type == HFI_BUFFER_OUTPUT) > + list_for_each_entry(dpb_buf, &inst->dpbbufs, list) > + if (dpb_buf->dpb_out_tag == tag) { > + dpb_buf->owned_by = DRIVER; > + break; > + } > +} > +EXPORT_SYMBOL_GPL(venus_helper_find_dpb_buf); > + > int venus_helper_vb2_buf_init(struct vb2_buffer *vb) > { > struct venus_inst *inst = vb2_get_drv_priv(vb->vb2_queue); > diff --git a/drivers/media/platform/qcom/venus/helpers.h b/drivers/media/platform/qcom/venus/helpers.h > index e6269b4be3af..17c5aadaec82 100644 > --- a/drivers/media/platform/qcom/venus/helpers.h > +++ b/drivers/media/platform/qcom/venus/helpers.h > @@ -14,6 +14,8 @@ struct venus_core; > bool venus_helper_check_codec(struct venus_inst *inst, u32 v4l2_pixfmt); > struct vb2_v4l2_buffer *venus_helper_find_buf(struct venus_inst *inst, > unsigned int type, u32 idx); > +void venus_helper_find_dpb_buf(struct venus_inst *inst, struct vb2_v4l2_buffer *vbuf, > + unsigned int type, unsigned int buf_type, u32 idx); > void venus_helper_buffers_done(struct venus_inst *inst, unsigned int type, > enum vb2_buffer_state state); > int venus_helper_vb2_buf_init(struct vb2_buffer *vb); > diff --git a/drivers/media/platform/qcom/venus/vdec.c b/drivers/media/platform/qcom/venus/vdec.c > index 198e47eb63f4..cafdc3d8e473 100644 > --- a/drivers/media/platform/qcom/venus/vdec.c > +++ b/drivers/media/platform/qcom/venus/vdec.c > @@ -1297,6 +1297,7 @@ static void vdec_buf_done(struct venus_inst *inst, unsigned int buf_type, > struct vb2_v4l2_buffer *vbuf; > struct vb2_buffer *vb; > unsigned int type; > + struct intbuf *dpb_buf; > > vdec_pm_touch(inst); > > @@ -1306,8 +1307,10 @@ static void vdec_buf_done(struct venus_inst *inst, unsigned int buf_type, > type = V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE; > > vbuf = venus_helper_find_buf(inst, type, tag); > - if (!vbuf) > + if (!vbuf) { > + venus_helper_find_dpb_buf(inst, vbuf, type, buf_type, tag); > return; > + } > > vbuf->flags = flags; > vbuf->field = V4L2_FIELD_NONE; > @@ -1622,6 +1625,8 @@ static int vdec_close(struct file *file) > > vdec_pm_get(inst); > > + venus_helper_free_dpb_bufs(inst); > + INIT_LIST_HEAD(&inst->dpbbufs); This belongs to venus_helper_free_dpb_bufs not here. > v4l2_m2m_ctx_release(inst->m2m_ctx); > v4l2_m2m_release(inst->m2m_dev); > vdec_ctrl_deinit(inst); > -- regards, Stan -- regards, Stan