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 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 210CDC77B7D for ; Fri, 5 May 2023 19:12:59 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233311AbjEETM4 (ORCPT ); Fri, 5 May 2023 15:12:56 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44782 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233573AbjEETMm (ORCPT ); Fri, 5 May 2023 15:12:42 -0400 Received: from mail-lf1-x129.google.com (mail-lf1-x129.google.com [IPv6:2a00:1450:4864:20::129]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E2A5622F59 for ; Fri, 5 May 2023 12:12:25 -0700 (PDT) Received: by mail-lf1-x129.google.com with SMTP id 2adb3069b0e04-4ec8eca56cfso2435661e87.0 for ; Fri, 05 May 2023 12:12:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1683313944; x=1685905944; h=content-transfer-encoding:in-reply-to:subject:from:references:cc:to :content-language:user-agent:mime-version:date:message-id:from:to:cc :subject:date:message-id:reply-to; bh=xceCA2XEX2XYZr2wVtYbFEfoG8eDOlxoBa/XP0RVFQY=; b=UhPl2UMUAS7synMssm2Xa7YoI0m0FvxnYT3MEZAmEV9W/N3OoIQL2HogKqaceAiUut 46eNYLbhA44jQmzgucA6ZDSzzS3HAIiOrLwVa1loVhY+rfpHmBHSE/wecQv1zHMgL4Am gGJ5Th7rG4ymTi5aBKdZUedFq/bHcoQA4q6Al1Ez4btsoRrxopxe+pDA3IYhBqPgs98Z 1RmJM7JuMW1KyNIjVXdbI95sqNrNRdIjEffp07ZMmquvHmzVy2Pavgd61hXtSKMZjwTl vqx6ksmQ6KmNlyvR8oS7iomKC3uLdFSi1YWBCEUnzGKI2CD/YMnpGpjFZPSOBcgsisA3 mdXQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1683313944; x=1685905944; h=content-transfer-encoding:in-reply-to:subject:from:references:cc:to :content-language:user-agent:mime-version:date:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=xceCA2XEX2XYZr2wVtYbFEfoG8eDOlxoBa/XP0RVFQY=; b=k1PaNlvPa4rRpv0+q2Vbk8nfTG+cTBUJYfF/9eUtIZJboaTpSOyJC/WszLwr5bkKS6 ElqbpqX6T23+JWIBU1ISSVzUoWsQ+7Tl9V4alolnMvgSNp8V4bs+e5zoW/yIQdNSb/7+ E4IyFU1dFwWlzauFlXD/v250EqTPSf3ca7OFLK0NNc2b9q7qwtcPvpaj02PgXL31txtt o3+04e8W36q4J6YXf+T8lzhDQ11G56oorc+URlT/WOmmLQ/6WVsf9RRjNEZYMwyugNEi JXQJ+7riJr7O2WCGL2Ni07HfPjJwsyHO2EGixfxeKLwygnZgQI8rcu8dvJrls2TFBphm uN1Q== X-Gm-Message-State: AC+VfDx6XCObDXsf102DhPxTheqzV/nsq2P1HETRAu9NU8LtpANUvkHY tTAMPypKC1QRXJdkspg6AIqR0g== X-Google-Smtp-Source: ACHHUZ5mD0x/zoLuBQwU8xI4QgCZ1CDVaEBT6+NSbuoLZmgtGhPSO2BKq9FVxSxiEtX0/j9mfsJuDg== X-Received: by 2002:a19:f80c:0:b0:4d5:ae35:b221 with SMTP id a12-20020a19f80c000000b004d5ae35b221mr671427lff.34.1683313944137; Fri, 05 May 2023 12:12:24 -0700 (PDT) Received: from [192.168.1.101] (abyl248.neoplus.adsl.tpnet.pl. [83.9.31.248]) by smtp.gmail.com with ESMTPSA id 10-20020ac2568a000000b004e9b307d2c8sm385026lfr.238.2023.05.05.12.12.22 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 05 May 2023 12:12:23 -0700 (PDT) Message-ID: <2ccb46b8-db1c-5f4e-681c-7b1fe9fa8402@linaro.org> Date: Fri, 5 May 2023 21:12:22 +0200 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.10.1 Content-Language: en-US To: Vikash Garodia , Stanimir Varbanov , Andy Gross , Bjorn Andersson , Mauro Carvalho Chehab , Dikshita Agarwal , Bryan O'Donoghue , Mansur Alisha Shaik , Jonathan Marek , Hans Verkuil , Dikshita Agarwal Cc: Mauro Carvalho Chehab , Stanimir Varbanov , linux-media@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org, Marijn Suijten References: <20230228-topic-venus-v2-0-d95d14949c79@linaro.org> <20230228-topic-venus-v2-9-d95d14949c79@linaro.org> <4a95547d-916a-3875-7752-f815429182e5@quicinc.com> From: Konrad Dybcio Subject: Re: [PATCH v2 09/18] media: venus: hfi_venus: Fix version checks in venus_halt_axi() In-Reply-To: <4a95547d-916a-3875-7752-f815429182e5@quicinc.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org On 5.05.2023 15:21, Vikash Garodia wrote: > > On 5/4/2023 1:31 PM, Konrad Dybcio wrote: >> Only IRIS2(_1) should enter the until-now-IS_V6() path and the >> condition for skipping part of it should be IS_IRIS2_1 and not the >> number of VPP pipes. Fix that. > > Do not see any issue with existing code. IRIS2 with single pipe is IRIS2_1. This does not > > quality as a fix to earlier implementation. Since this series introduces VPU versions, > > IRIS2 with 1 pipe is being replaced with IRIS2_1. > > -Vikash Right, I'll drop the fixes tags. Also, your email client seems to be inserting 2 newlines instead of 1. If you're using thunderbird, you may want to edit: mail.identity.(default or your mail identity idx).default.compose_html to `false` or you can use shift+enter as a half-measure Konrad > >> >> Fixes: 4b0b6e147dc9 ("media: venus: hfi: Add 6xx AXI halt logic") >> Fixes: 78d434ba8659 ("media: venus: hfi: Skip AON register programming for V6 1pipe") >> Signed-off-by: Konrad Dybcio >> --- >>   drivers/media/platform/qcom/venus/hfi_venus.c | 4 ++-- >>   1 file changed, 2 insertions(+), 2 deletions(-) >> >> diff --git a/drivers/media/platform/qcom/venus/hfi_venus.c b/drivers/media/platform/qcom/venus/hfi_venus.c >> index 9b840440a115..ca56b1a8eb71 100644 >> --- a/drivers/media/platform/qcom/venus/hfi_venus.c >> +++ b/drivers/media/platform/qcom/venus/hfi_venus.c >> @@ -549,10 +549,10 @@ static int venus_halt_axi(struct venus_hfi_device *hdev) >>       u32 mask_val; >>       int ret; >>   -    if (IS_V6(hdev->core)) { >> +    if (IS_IRIS2(hdev->core) || IS_IRIS2_1(hdev->core)) { >>           writel(0x3, cpu_cs_base + CPU_CS_X2RPMH_V6); >>   -        if (hdev->core->res->num_vpp_pipes == 1) >> +        if (IS_IRIS2_1(hdev->core)) >>               goto skip_aon_mvp_noc; >>             writel(0x1, aon_base + AON_WRAPPER_MVP_NOC_LPI_CONTROL); >>