[v3,10/17] media: venus: hfi_venus: Sanitize venus_cpu_and_video_core_idle() per-VPU-version
| Message ID | 20230228-topic-venus-v3-10-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 b10csp62247vqo;
Wed, 17 May 2023 14:27:24 -0700 (PDT)
X-Google-Smtp-Source:
ACHHUZ42WeIdbcCzKDPqirQMKxGZJVFmydq+hQqZSw66yZxKM+DxvXsSouWg+L3g2C4Heq7/xVks
X-Received: by 2002:a05:6a00:1943:b0:63d:3981:313d with SMTP id
s3-20020a056a00194300b0063d3981313dmr1413834pfk.10.1684358844168;
Wed, 17 May 2023 14:27:24 -0700 (PDT)
ARC-Seal: i=1; a=rsa-sha256; t=1684358844; cv=none;
d=google.com; s=arc-20160816;
b=rxqi73xpZicKzY+zETWSUmoiimHzB7tVntWePOhs29TOrIENHH7IbTLs4FNhKwLRM2
Sjuo6c8sx2AuZNDKhhaEw8WzxHihKlCIoSVBCeaAzT+CUNB5GFwMg3cC3pFgKihb9hNb
CYW8CiPHo7ZNjnGw7NNfm9OFqj5yFyggLsNNxPTz9vJOBks36lSBaDiFDAnL6xqTCmPf
5SQXkoUavWWgX21yIjgtHUg0vpeOead2PlaA0uDF2S81hM09QMklXR/5ttOAhGTShwq6
EEZtMrffLkd5wTBXcIvZ01RbKCOmM+s5gk2t4FYo3QRq8UzjFWLnZ91eyhwAzyoImKUn
ajUw==
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=eGodNVX/frMkABBLHr47hHKAI4yOnNqADEGr8yuNWnc=;
b=pGT/VbCu5/n7t7kHRPLbKTwabRdM5XAWHw/p0UTLTTPpUxkXddOjYEhp+AJbcQnPYi
8ZHsFsCOV8ux9BC/8spmomg2uoMh8V2axsENkl4TaMMsWHAS9PJma005KWXI4excjOgB
LVW8rcjrpJuj+c1AUyvV2Kq1SOd0v7wsINlli/l0260HuQwdTQFOB/KsAm+Mj8ecGoJV
k7YdTEaehqEVOjGVkxKhZmPLQnp7bIa4ata1WJ/7QS4g8e0z6RFT2IyLqJPxC+Y1WzhT
6UwTAnKuecbnkeM2xLZ5+Y8KZp4o71KosEXTnYp+SqmIoAxJLtuvifakPVjlMTKPYnAQ
PraQ==
ARC-Authentication-Results: i=1; mx.google.com;
dkim=pass header.i=@linaro.org header.s=google header.b=HilD8Z6Y;
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
y4-20020aa79e04000000b006455d53001fsi26765pfq.40.2023.05.17.14.27.09;
Wed, 17 May 2023 14:27:24 -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=HilD8Z6Y;
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 S230056AbjEQVPG (ORCPT <rfc822;abdi.embedded@gmail.com>
+ 99 others); Wed, 17 May 2023 17:15:06 -0400
Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52944 "EHLO
lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
with ESMTP id S229962AbjEQVOw (ORCPT
<rfc822;linux-kernel@vger.kernel.org>);
Wed, 17 May 2023 17:14:52 -0400
Received: from mail-lj1-x22c.google.com (mail-lj1-x22c.google.com
[IPv6:2a00:1450:4864:20::22c])
by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 352639EFB
for <linux-kernel@vger.kernel.org>;
Wed, 17 May 2023 14:14:43 -0700 (PDT)
Received: by mail-lj1-x22c.google.com with SMTP id
38308e7fff4ca-2ac7f53ae44so13736471fa.2
for <linux-kernel@vger.kernel.org>;
Wed, 17 May 2023 14:14:43 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=linaro.org; s=google; t=1684358081; x=1686950081;
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=eGodNVX/frMkABBLHr47hHKAI4yOnNqADEGr8yuNWnc=;
b=HilD8Z6Yn8MXx1FuSrj/gfL3Z2QlQ7NM05MZGgj+CHNjuUzXCbigE/ZtaU57VO9oFi
9I0Gf5M8/8DnVfzrUf+/NUlBhTObJhIDTJqh3KFI7wF5ZgOnbw40WbLI5hXMfDc8dGUN
6F7RPF4g5YeUbFilMkniHtDCJTY4iUlaJpd+oKTULXGZpJFO2ZHwJKdf0p0Y2o9iFnud
J+srixZripfOyfj75nEbsAg/QxOyXwEZDtcDBAAY+d/Oek+ZNAeZ+awLYG4GiHbKiJJX
SwFaTsdpbLrf8ss3wFALVPIFtHd9Chp3DU188UVW0lfgpOGILagi0P9ngYHSEaQDTbOl
/Aqw==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20221208; t=1684358081; x=1686950081;
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=eGodNVX/frMkABBLHr47hHKAI4yOnNqADEGr8yuNWnc=;
b=NYYSgvXTpkL87IjSZ1Oy8VZgkjwcc5Qg2K1Im2q1MBYUH5ya7DbUEWpnD1nPT5btQa
poc7pod2sWAm2nm8DKzL2By79jk48HHr+5cSzxofuQpjhtZt3oARDf9d6NVhiQhcFnHR
cLWqrQaC2fmyTpV50K22fcOwCOR+OkBO4/dFZcSb8q5rqHdn7M74Sa+pOfftpbu6LVHU
M4r9PGQXSebwdN5BKz7UIA0UjtLu5vNtATjaw7BmTLAVYqFnGbBTrcHLGSvITTqDNd/U
U6pWh4BUgR3q0KpTj20I2twjn3bKkFs3A54LlbZ1QLEh8t3xlwNq53CLr7PenteBLqGT
FubQ==
X-Gm-Message-State: AC+VfDw4DxA2AqQrlpET8HEq1bev59BP4RlcoLgy5rh/ffssOF9StGSR
6FDpb6ZuG9P6jQBYOFHJ00oexg==
X-Received: by 2002:a2e:90ca:0:b0:2a7:f1e8:b08 with SMTP id
o10-20020a2e90ca000000b002a7f1e80b08mr9439220ljg.19.1684358081314;
Wed, 17 May 2023 14:14:41 -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.39
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
Wed, 17 May 2023 14:14:41 -0700 (PDT)
From: Konrad Dybcio <konrad.dybcio@linaro.org>
Date: Wed, 17 May 2023 23:14:23 +0200
Subject: [PATCH v3 10/17] media: venus: hfi_venus: Sanitize
venus_cpu_and_video_core_idle() per-VPU-version
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: 7bit
Message-Id: <20230228-topic-venus-v3-10-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=915;
i=konrad.dybcio@linaro.org; s=20230215; h=from:subject:message-id;
bh=7JZorB0pUApJvhWmRa0skblAX3OBAMRX8izC1hetESc=;
b=bGbLMrqhUnj1TC2JbGm2E6a72BDHCzqWi7diiqThBzkw8Y3vPQ3eeUHJxDo5bclivNhQGqp82
FowJwNNcqK5CXa97p/DP8DXQIs3IJ9ufutXfgg7d2HHhhZX2fHk2D4R
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=ham 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?1766178259118239698?=
X-GMAIL-MSGID: =?utf-8?q?1766178259118239698?=
|
| 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 9665fdcfe8b2..2db5361cd5df 100644 --- a/drivers/media/platform/qcom/venus/hfi_venus.c +++ b/drivers/media/platform/qcom/venus/hfi_venus.c @@ -1537,7 +1537,7 @@ static bool venus_cpu_and_video_core_idle(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);