From patchwork Tue Feb 28 15:24:32 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Konrad Dybcio X-Patchwork-Id: 62522 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp3079790wrd; Tue, 28 Feb 2023 07:27:09 -0800 (PST) X-Google-Smtp-Source: AK7set8PZqVfVcErWrd7nsvrFu8VRWZ1B8em8Tr7o4LlImjxH2zgpZ5hXL+VjMdf/AOQqtaJFP/V X-Received: by 2002:a62:64d5:0:b0:5a9:c2b0:428f with SMTP id y204-20020a6264d5000000b005a9c2b0428fmr2460060pfb.31.1677598029648; Tue, 28 Feb 2023 07:27:09 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1677598029; cv=none; d=google.com; s=arc-20160816; b=tiI23Fsb/q7ri//F2gqp9gNN6YOVUlLNZOrNVZfoVpU+FOskzAsoBAxJRc2kEf58ef KD83pLwgLjYwDaasMCzG7nBk7U0FARvKC8DMyZn962jD2fKAQSH2DwSDpgmKQ1vdVAzv LFfbMbfpb92D3WLUK+JS/bsjAZfP1OrZEWDWrCPnC1MeTrhNb9XeTdwFGcJugJknSiUS xVYpCkJIvxKyuhlDz23GfLIGjR6/EavgdEXWt3zRk8bztjES1YIbGf8BVaG1e1GSZraP z0Wdl81/tgyeBfr1Sj8tAMvmUc1tqgtt5ERl2mM3HL1q1rKE4E1XIpakc6YvvDxpETgI PHIQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:in-reply-to:references:message-id :content-transfer-encoding:mime-version:subject:date:from :dkim-signature; bh=pfXCDnSGYPCMSV9KjGFpz0bE/u8I9Ovc8VZm+qsFkfI=; b=x+6am0VlUiVBrXI7tBiDVEo+vR2fcEifZViuZd6cQtHmr5UKU4EUjUE2iWeuIWGLn7 bkeAFV/5Phi7IbJPB3sjEIYHRudzzYpD67e2DLdIhPzw5YqBz/qaJVgGJlCUFOELsCmv XIho2G7VV3uX4lGfU4/gSZaLr56VczQ3u8SMX/hLyQ17wkdzQWLPFqHfwJmWmYgyFDVz Gvjq55PKmn5JL4Q7W7A51+K86QWU0Ct27QR7z10gpS9rw5rwzajj5s1VOP2mIV6F1Hci oyt4C9xY6Ydr07gCMc/d6JXq9tmoQ6MCK+sqclZPaY/Xr1LsB1NoVnDHeHIDm2DQf1rA ePAQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Q6oE6tw9; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id 196-20020a6218cd000000b005a867303079si9583641pfy.164.2023.02.28.07.26.56; Tue, 28 Feb 2023 07:27:09 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Q6oE6tw9; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 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 S229963AbjB1PZQ (ORCPT + 99 others); Tue, 28 Feb 2023 10:25:16 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40602 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229976AbjB1PYx (ORCPT ); Tue, 28 Feb 2023 10:24:53 -0500 Received: from mail-lf1-x134.google.com (mail-lf1-x134.google.com [IPv6:2a00:1450:4864:20::134]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 949FF30E8C for ; Tue, 28 Feb 2023 07:24:47 -0800 (PST) Received: by mail-lf1-x134.google.com with SMTP id k14so13675216lfj.7 for ; Tue, 28 Feb 2023 07:24:47 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1677597887; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=pfXCDnSGYPCMSV9KjGFpz0bE/u8I9Ovc8VZm+qsFkfI=; b=Q6oE6tw9A5p6GgBxquD0kIGwuwm6O4I/lh0LBv3v+d24PbHvCqA1EpI4+VmTDZyh/w WySG95QOp5/siDHdL+d0YJGVBDR++d52SmB+gITzSpvCyPyZdEopn1Ku8h35PsUd9OFW RxlLUJsw+WoLePiODBj+L5NXJ/KoJcgbNpFqtXyfve+NhTj/3JChLMKF76dXCkp+9+0c srl1OyYSjsXAZ+9Q5bCGujYKhdZbFGEWa/k8EC+vT5po6urdYMualTO21dnjExEzLK1e NVMaKm55nqziA+Gs0Bur4EfcBnjODJ/Ezzd6gOPLmKyrPdq9k80iVyVdIvrw98VzrmB+ U8+w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1677597887; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=pfXCDnSGYPCMSV9KjGFpz0bE/u8I9Ovc8VZm+qsFkfI=; b=Zf6Iy9f8qD6tlvjHq8cag8DmFnsTFLWiyfX3Z9zwvIbbCyRYBmzZ6t3Qdx72Ip8eys jeLh7KIBwg8hX8EwwV6O4L985BikstqpuBjpJFPHFM9qfsOMiGmyQYWuZ0Xbi7jUM1+t CAq4xWeKP/nuU9jtoJ5Mt++uZelf7TzBjlKN5Ldufc+L9RnaXJ0GUh1hqXlddAwWprFg ysK5f0cl7fa15pAOfcZdEeIlZxacf2rMRm/yvcPWB7ATFj0mt/LouXpK1IjfwDS35P2f J7aZN75q3v+MJk4WTCCIxeKpGWgJxArpMTDpnRjP7oJ48p8MYXuXFLrPU8i4j7tB3Iex if5Q== X-Gm-Message-State: AO0yUKVBkIkEt4q+HGAJyCEGjmrfxRrhspUu+dudCU8uMYCQPS4UK9Xe tKivFIhLnHV3sNXWLbNnxPfUKQ== X-Received: by 2002:ac2:52af:0:b0:4da:f436:d423 with SMTP id r15-20020ac252af000000b004daf436d423mr752939lfm.21.1677597887017; Tue, 28 Feb 2023 07:24:47 -0800 (PST) Received: from [192.168.1.101] (abym99.neoplus.adsl.tpnet.pl. [83.9.32.99]) by smtp.gmail.com with ESMTPSA id h17-20020ac250d1000000b004db3aa3c542sm1363688lfm.47.2023.02.28.07.24.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 28 Feb 2023 07:24:46 -0800 (PST) From: Konrad Dybcio Date: Tue, 28 Feb 2023 16:24:32 +0100 Subject: [PATCH 08/18] media: venus: hfi_venus: Fix version checks in venus_halt_axi() MIME-Version: 1.0 Message-Id: <20230228-topic-venus-v1-8-58c2c88384e9@linaro.org> References: <20230228-topic-venus-v1-0-58c2c88384e9@linaro.org> In-Reply-To: <20230228-topic-venus-v1-0-58c2c88384e9@linaro.org> To: Stanimir Varbanov , Vikash Garodia , Andy Gross , Bjorn Andersson , Mauro Carvalho Chehab , Dikshita Agarwal , Bryan O'Donoghue , Dikshita Agarwal , Mansur Alisha Shaik , Jonathan Marek Cc: Mauro Carvalho Chehab , Stanimir Varbanov , linux-media@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org, Vikash Garodia , Konrad Dybcio X-Mailer: b4 0.12.1 X-Developer-Signature: v=1; a=ed25519-sha256; t=1677597872; l=1179; i=konrad.dybcio@linaro.org; s=20230215; h=from:subject:message-id; bh=vcJCyKKGC7W2leXuwnA0vfyXrDyJXcgxDMnLgbkLNUQ=; b=s9z0ihnhSdd53PCcE7vAgn1D8+UghQlKIAvON5ygD8Wwgjm4G2pXiVypjRpWXierXW9LevxoYJJi XBCfNQAxCUGjXBX/3Agz/jqF8gVvKtcrGF+/CoWqjcK2UE+cIKBr X-Developer-Key: i=konrad.dybcio@linaro.org; a=ed25519; pk=iclgkYvtl2w05SSXO5EjjSYlhFKsJ+5OSZBjOkQuEms= X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1759089031338123472?= X-GMAIL-MSGID: =?utf-8?q?1759089031338123472?= 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. 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 4d785e53aa0b..0d137e070407 100644 --- a/drivers/media/platform/qcom/venus/hfi_venus.c +++ b/drivers/media/platform/qcom/venus/hfi_venus.c @@ -550,10 +550,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);