[v3,11/17] media: venus: hfi_venus: Sanitize venus_cpu_idle_and_pc_ready() per-VPU-version
| Message ID | 20230228-topic-venus-v3-11-6092ae43b58f@linaro.org |
|---|---|
| State | New |
| Headers |
Return-Path: <linux-kernel-owner@vger.kernel.org>
Delivered-To: ouuuleilei@gmail.com
Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp69617vqo;
Wed, 17 May 2023 14:44:37 -0700 (PDT)
X-Google-Smtp-Source:
ACHHUZ4VAedOqJqmt3AT3m0E27vSm1mg4+wH4dKnjwdli1NoT7Uk759XlF/shsSpi85tDt1ObByT
X-Received: by 2002:a05:6a21:6d9a:b0:104:4558:b412 with SMTP id
wl26-20020a056a216d9a00b001044558b412mr26650167pzb.25.1684359877310;
Wed, 17 May 2023 14:44:37 -0700 (PDT)
ARC-Seal: i=1; a=rsa-sha256; t=1684359877; cv=none;
d=google.com; s=arc-20160816;
b=J328ndoN554jhrYhAOyLeIogan06QidkF+Ngqff/uSnjYfZKskiWU0OoRNKLslq6Ma
CB5uTmUvRoZUniLGK4ukXnMEYGSBfSyi7T33/ZDlBw0Z4/HzO9n1P+cG01fiuijtDkc+
9DdTaRGIeLJ4HA4zaBzJ5znTngLS6JoPcuklzT4kHcVwW9SAqeKN17WPgiUPHLD5vruK
Y/ihuRRB9wkOGOpkQNhQ0c30WW8K/9vmI8Om6vfXXem/nl/6f02lPlz2XqKmFKVuQJ4B
9eMTdjYrdycCm7vkkELFgu64zV+ZkLUVhgYgdoL9yKJs4F1cz2aAkZRCbgzl5lo9/vqQ
MC7g==
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=CAf0/qoqHKUIRtb0ngzMvnNiZNHVa6Jfr73oUt0pxKM=;
b=GHm4J+HJY63SgPX3UnQvgtGJHnjbY3oWWeKD6fukjE/mtomB2W4oXyuFMpmHRhU01x
UIR11VJeKQNYVU+xeEEC7e1q7tk3cCR+y7kIZnOibn16MrRsrNiFjMFjQsXy2VKhFtNg
adcy8oY0MxivCs1fcTcM9Vp+T5b/qw3BcTrf8l2vwNNbe6IZMPuqehmBJyH+gKaFY8xn
ACsOPx30KPrD1mtg8ugYbPaXRwSiud4vyjLqCz2SeKlRmiVU+Mov5sAklEwxQBw8ESlQ
VU1jJI9YSD24n4WVcgllwdNsNZeq/I84e76u8YWOPhqcJNhWeKPCRDsMiUguCD0POLep
Nfjg==
ARC-Authentication-Results: i=1; mx.google.com;
dkim=pass header.i=@linaro.org header.s=google header.b=FVnA6WsF;
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
l65-20020a639144000000b005307ce6fcfdsi16888846pge.472.2023.05.17.14.44.23;
Wed, 17 May 2023 14:44:37 -0700 (PDT)
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=FVnA6WsF;
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 S230109AbjEQVPO (ORCPT <rfc822;abdi.embedded@gmail.com>
+ 99 others); Wed, 17 May 2023 17:15:14 -0400
Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52992 "EHLO
lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
with ESMTP id S229882AbjEQVOx (ORCPT
<rfc822;linux-kernel@vger.kernel.org>);
Wed, 17 May 2023 17:14:53 -0400
Received: from mail-lj1-x235.google.com (mail-lj1-x235.google.com
[IPv6:2a00:1450:4864:20::235])
by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C584D93F8
for <linux-kernel@vger.kernel.org>;
Wed, 17 May 2023 14:14:44 -0700 (PDT)
Received: by mail-lj1-x235.google.com with SMTP id
38308e7fff4ca-2ac733b813fso13463191fa.1
for <linux-kernel@vger.kernel.org>;
Wed, 17 May 2023 14:14:44 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=linaro.org; s=google; t=1684358083; x=1686950083;
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=CAf0/qoqHKUIRtb0ngzMvnNiZNHVa6Jfr73oUt0pxKM=;
b=FVnA6WsFW0zoAzCv6H+kbO9qraBaPBYxHMIKkzbr+A4UZdYwJCAxegNCMXkU3RVmfV
ZFTz+XxYV2woaFChYQS6OGVtdO3DhC74kdmYxWG9gUWpeV/OaoXQQfF98vjG1DK4atAW
3S/G9YiaiR12TsQuudU/mAa8g4PDor/ch2Ex9OE+O/UZIaTcYwXgKrMOSW0Jx/5aZLxI
c9n703kwEtkI6+x2DJ2ntcOFcWX5C3ACg0oR6V8pTHli+PCXdrxb8rnCc67AcGyZbYJP
S+6uqgYK7jqIrVWZWjM/dXJF7kgF/y0K6XSogSJXOe+oFjLg7YB4HgR8CXRXt/osgBJJ
pEhA==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20221208; t=1684358083; x=1686950083;
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=CAf0/qoqHKUIRtb0ngzMvnNiZNHVa6Jfr73oUt0pxKM=;
b=CU0V+wUDjGYYPZs4RGzJ1lN7QGB7pmc/fF43lHbB/85JtUR9Ytac6vm4LaRqtKZcta
qZuOk4gzZthY3qmfojMVEravXBxpW98mcTVNhFpUrEAtpT2Gxz6csoubF/GEvORdJLqS
2PfraVAao2WXAkg1SQmKO/Qv7VIPDsjYYHznu0VAvRcvTRlarffEMQ+eP+Wo44UWy+hM
2G1OfDTTR9rJg4jR6PZ+kxQicARQTtbMy98I4sYwDBHqGpMhPyfDqDcvRf88R58qcfVg
TrF5aJW+0iD2/4XR9wnIgnVjVNdIIF+VwhTEu5IG3LfLYkRxMfwczopYbOFN0yLfn4DO
iwCg==
X-Gm-Message-State: AC+VfDyDkPTlCCTbay0psC4sD+3qqh+TT/P3GQpEFadkdAwULVCsaNJu
dD+bGBwInZm0SftuEjVRDdjIIg==
X-Received: by 2002:a2e:b709:0:b0:2ad:f8d:dea with SMTP id
j9-20020a2eb709000000b002ad0f8d0deamr10982653ljo.11.1684358082955;
Wed, 17 May 2023 14:14:42 -0700 (PDT)
Received: from [192.168.1.101] (abxi58.neoplus.adsl.tpnet.pl. [83.9.2.58])
by smtp.gmail.com with ESMTPSA id
l5-20020a2e8345000000b002ac88e29049sm4781142ljh.43.2023.05.17.14.14.41
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
Wed, 17 May 2023 14:14:42 -0700 (PDT)
From: Konrad Dybcio <konrad.dybcio@linaro.org>
Date: Wed, 17 May 2023 23:14:24 +0200
Subject: [PATCH v3 11/17] media: venus: hfi_venus: Sanitize
venus_cpu_idle_and_pc_ready() per-VPU-version
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: 7bit
Message-Id: <20230228-topic-venus-v3-11-6092ae43b58f@linaro.org>
References: <20230228-topic-venus-v3-0-6092ae43b58f@linaro.org>
In-Reply-To: <20230228-topic-venus-v3-0-6092ae43b58f@linaro.org>
To: Stanimir Varbanov <stanimir.k.varbanov@gmail.com>,
Vikash Garodia <quic_vgarodia@quicinc.com>,
Andy Gross <agross@kernel.org>,
Bjorn Andersson <andersson@kernel.org>,
Mauro Carvalho Chehab <mchehab@kernel.org>,
Dikshita Agarwal <dikshita@qti.qualcomm.com>,
Bryan O'Donoghue <bryan.odonoghue@linaro.org>,
Mansur Alisha Shaik <mansur@codeaurora.org>,
Jonathan Marek <jonathan@marek.ca>,
Hans Verkuil <hans.verkuil@cisco.com>,
Dikshita Agarwal <quic_dikshita@quicinc.com>
Cc: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>,
Stanimir Varbanov <stanimir.varbanov@linaro.org>,
linux-media@vger.kernel.org, linux-arm-msm@vger.kernel.org,
linux-kernel@vger.kernel.org,
Marijn Suijten <marijn.suijten@somainline.org>,
Konrad Dybcio <konrad.dybcio@linaro.org>,
Vikash Garodia <quic_vgarodia@quicinc.com>
X-Mailer: b4 0.12.2
X-Developer-Signature: v=1; a=ed25519-sha256; t=1684358064; l=913;
i=konrad.dybcio@linaro.org; s=20230215; h=from:subject:message-id;
bh=i7kHJHgzddaQidXryK/eoAjtHGCE1SThJBvwoun4KlE=;
b=e+RcPjLVdkjjddFqjj7bF91NbgkvCaQSbjYiEeroR0nMP6OKy6b8cZbS93u9/4Grita12S1d7
LJqrf41c3VXDnn8T0wdfZxe+4bbXeTQQZhgCPIn9YOG+wkTcBQogMUh
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,T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED
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: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org
X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?=
X-GMAIL-THRID: =?utf-8?q?1766179342853644511?=
X-GMAIL-MSGID: =?utf-8?q?1766179342853644511?=
|
| Series |
Venus QoL / maintainability fixes
|
|
Commit Message
Konrad Dybcio
May 17, 2023, 9:14 p.m. UTC
Replace the general IS_V6 checks with more specific VPU version checks.
Signed-off-by: Konrad Dybcio <konrad.dybcio@linaro.org>
---
drivers/media/platform/qcom/venus/hfi_venus.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/media/platform/qcom/venus/hfi_venus.c b/drivers/media/platform/qcom/venus/hfi_venus.c index 2db5361cd5df..105d49fb72be 100644 --- a/drivers/media/platform/qcom/venus/hfi_venus.c +++ b/drivers/media/platform/qcom/venus/hfi_venus.c @@ -1557,7 +1557,7 @@ static bool venus_cpu_idle_and_pc_ready(struct venus_hfi_device *hdev) void __iomem *cpu_cs_base = hdev->core->cpu_cs_base; u32 ctrl_status, cpu_status; - if (IS_V6(hdev->core)) + if (IS_IRIS2(hdev->core) || IS_IRIS2_1(hdev->core)) cpu_status = readl(wrapper_tz_base + WRAPPER_TZ_CPU_STATUS_V6); else cpu_status = readl(wrapper_base + WRAPPER_CPU_STATUS);