| Message ID | 20230228-topic-venus-v2-15-d95d14949c79@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 b10csp133573vqo;
Thu, 4 May 2023 01:04:26 -0700 (PDT)
X-Google-Smtp-Source:
ACHHUZ40/T53CQA9RWTh/FCH84aLlkmjqCWPQJT/0MYU3cPHAFHKi/IGUuziMmKUvJa/JIfNpFdw
X-Received: by 2002:a05:6a20:d2c4:b0:f2:bb3f:3b3e with SMTP id
ir4-20020a056a20d2c400b000f2bb3f3b3emr1537196pzb.38.1683187465908;
Thu, 04 May 2023 01:04:25 -0700 (PDT)
ARC-Seal: i=1; a=rsa-sha256; t=1683187465; cv=none;
d=google.com; s=arc-20160816;
b=a9BSgI7IYUnCqCf4lyqdMqHQcUO+/hyrqWK2IBMkSrlOvds9NeqF2kYEEDW2H3bjEt
DRwCi9tNIqXxhcuwl2tmmnHYw+rfZXIi19fvS8Fmrd18V9D/LlD61WSh5vixNWgFwys0
jVFGBeaDnAlm29KQrMmNb9tyVfgY8SzRSu2y4O3/9HvCqOaqj12oWOISp1jZ3EYn/pv9
QD37QT/RAqKaWhRkbZ/R+y6paPxa5MkrCcJhmgApUjGqOtAoehfbf8DjbK/J97WYEmkE
n4hfkwGGH+laFI1E6DJExxy4gyhhrSttVb9ksueh/y2+ASD36lVIEixeI+yqfbjHZMG1
zw/Q==
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=Gmh3QMl0vM3P+SsAKhPqtUWQqJrL9cfiujmVg23UbYw=;
b=v97K7snp/xk0Kwu7csqBRoX3nAGP6y1MTI2PGULFXydlv2EKy4/iy2LNYyVMEONufU
20AknC8e8oW+L0SZfl38TaOS3pTXHx3ijitFV89Y2DfjZi/ZTnpdxHQNilivW1fK9pLN
Qmi4p2T7zsqZd39D2L6Nyj54i0m2jLmMxqBAusA3ax4OHeyZC9kDWTKgrQLexw2lm+GB
oaUg7SFANicROvXeGXfTzW2Zyu7t1ZU6gToZ8GWzFtXwYxE/GwEQWu62mlRcMDFK3nwW
LWAE4FKw+SrcJ2xc4NTDWSteeeJQb0njWNpqRRjOgyJeXrFI5Drc/Yry2WGC0gf3SgaX
BVoA==
ARC-Authentication-Results: i=1; mx.google.com;
dkim=pass header.i=@linaro.org header.s=google header.b=tXlmsu80;
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
c2-20020a63ea02000000b0052c65049113si2958389pgi.322.2023.05.04.01.04.10;
Thu, 04 May 2023 01:04:25 -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=tXlmsu80;
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 S230266AbjEDIC6 (ORCPT <rfc822;lhua1029@gmail.com> + 99 others);
Thu, 4 May 2023 04:02:58 -0400
Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44816 "EHLO
lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
with ESMTP id S230179AbjEDICF (ORCPT
<rfc822;linux-kernel@vger.kernel.org>);
Thu, 4 May 2023 04:02:05 -0400
Received: from mail-lf1-x12d.google.com (mail-lf1-x12d.google.com
[IPv6:2a00:1450:4864:20::12d])
by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0091540C9
for <linux-kernel@vger.kernel.org>;
Thu, 4 May 2023 01:01:51 -0700 (PDT)
Received: by mail-lf1-x12d.google.com with SMTP id
2adb3069b0e04-4f13a72ff53so185555e87.0
for <linux-kernel@vger.kernel.org>;
Thu, 04 May 2023 01:01:51 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=linaro.org; s=google; t=1683187309; x=1685779309;
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=Gmh3QMl0vM3P+SsAKhPqtUWQqJrL9cfiujmVg23UbYw=;
b=tXlmsu808ieo/MGeji0bU10a8QIdPqAsymprNBulh1El7cx84cOhNh+M/wUBcO8KnT
tgJi8KDmLNuq5m49YoWoaW7TzrFb1XrmdLXYkIys4YBQWz45rI1KpdTambR8kZpjcWeh
f0LuZ3ieNhWDp9tBPMBHHNFoqwg6nSKbAqEFa9dp2Z4cfKUwCxGYfwn33hkPrWEzBub8
TrkuzuBBsPS/+jm66s0VRJwa0G9zcZbhuzCbMzOgD+OcQviMFUOZdASoofLt4wrs9lty
6zRMU6frGxt7cx/a4d6ISe/FZJDy4dhDE30a95yX35gM3wwN9lsRP54Y1Ry2rkTnrVnK
/v3A==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20221208; t=1683187309; x=1685779309;
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=Gmh3QMl0vM3P+SsAKhPqtUWQqJrL9cfiujmVg23UbYw=;
b=Gg5yKI0gOdYPNQ4C3yaWTIpnOJ64DFxTE1+G9ho2DHNJsoWcLf/7cCAH1qY1lkqFpT
/m4w/WNAkU7Kz+mR6a0UG5NCD7MUtny5WyJsW031BrcF70tbtDD5v7AW/sU95+xkaFod
V54EznHeRGhoj9xGA3WMJg+WI0v8P3Paja77WCIOcU8F1yjrrEkiOzpYQB7FyYpQnNz8
4KiOp+fEO9K9blTpIaT+lXavuElI3jxM7H7c+pgaA94wFm/C8ZwZs5lpPK7p0PAjOz+l
6r14s2QljpoVr0ND3ZWOQChhdMH7VtZi/QFPd9zj4nfOSKGNKGb7qLODpRZB6QDZ+s4q
QQFw==
X-Gm-Message-State: AC+VfDycbuTYzgP8w1ckZ2N8y8HuhyPIgYxyDMA38U7aBxZctVoT0Gvh
esM2f4guayYFmGjIL/7wRwplsA==
X-Received: by 2002:ac2:599c:0:b0:4ef:f630:5c1e with SMTP id
w28-20020ac2599c000000b004eff6305c1emr1417050lfn.51.1683187309645;
Thu, 04 May 2023 01:01:49 -0700 (PDT)
Received: from [192.168.1.101] (abyl248.neoplus.adsl.tpnet.pl. [83.9.31.248])
by smtp.gmail.com with ESMTPSA id
n26-20020ac2491a000000b004edc512515fsm917165lfi.47.2023.05.04.01.01.48
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
Thu, 04 May 2023 01:01:49 -0700 (PDT)
From: Konrad Dybcio <konrad.dybcio@linaro.org>
Date: Thu, 04 May 2023 10:01:11 +0200
Subject: [PATCH v2 15/18] media: venus: vdec: Fix version check in
vdec_set_work_route()
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: 7bit
Message-Id: <20230228-topic-venus-v2-15-d95d14949c79@linaro.org>
References: <20230228-topic-venus-v2-0-d95d14949c79@linaro.org>
In-Reply-To: <20230228-topic-venus-v2-0-d95d14949c79@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=1683187284; l=949;
i=konrad.dybcio@linaro.org; s=20230215; h=from:subject:message-id;
bh=V/UGltlLWzlzUZNyrcqVl2X6sG5k2nSoHaxfv6KAids=;
b=WtOwVMLsPygfuOE/M19QhQt6sE2ZYkfB4FjsG/HcddOYKMC+fTHbC05xXxHT4EpQlkl7qsff0
mjhayIDddOHAfsOiuUNXMgf4oIyAFjkAM36KmNnSsRI+iWP23l3jHIc
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?1764949980149999817?=
X-GMAIL-MSGID: =?utf-8?q?1764949980149999817?=
|
| Series |
Venus QoL / maintainability fixes
|
|
Commit Message
Konrad Dybcio
May 4, 2023, 8:01 a.m. UTC
This is not so much V6-dependent as it's IRIS(1|2|2_1). Fix it.
Fixes: 6483a8cbea54 ("media: venus: vdec: set work route to fw")
Reviewed-by: Bryan O'Donoghue <bryan.odonoghue@linaro.org>
Signed-off-by: Konrad Dybcio <konrad.dybcio@linaro.org>
---
drivers/media/platform/qcom/venus/vdec.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Comments
On 5/4/2023 1:31 PM, Konrad Dybcio wrote: > This is not so much V6-dependent as it's IRIS(1|2|2_1). Fix it. Again, why is it marked as fix ? > > Fixes: 6483a8cbea54 ("media: venus: vdec: set work route to fw") > Reviewed-by: Bryan O'Donoghue <bryan.odonoghue@linaro.org> > Signed-off-by: Konrad Dybcio <konrad.dybcio@linaro.org> > --- > drivers/media/platform/qcom/venus/vdec.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/media/platform/qcom/venus/vdec.c b/drivers/media/platform/qcom/venus/vdec.c > index 51a53bf82bd3..33e3f7208b1a 100644 > --- a/drivers/media/platform/qcom/venus/vdec.c > +++ b/drivers/media/platform/qcom/venus/vdec.c > @@ -701,7 +701,7 @@ static int vdec_set_work_route(struct venus_inst *inst) > u32 ptype = HFI_PROPERTY_PARAM_WORK_ROUTE; > struct hfi_video_work_route wr; > > - if (!IS_V6(inst->core)) > + if (!(IS_IRIS1(inst->core) || IS_IRIS2(inst->core) || IS_IRIS2_1(inst->core))) Not a good idea to add IRIS1 just for deciding work route and not at other places in driver. Add IRIS1 relevant code in other aspects as well, if the patch needs to handle anything w.r.t IRIS1. > return 0; > > wr.video_work_route = inst->core->res->num_vpp_pipes; >
On 5.05.2023 16:02, Vikash Garodia wrote: > > On 5/4/2023 1:31 PM, Konrad Dybcio wrote: >> This is not so much V6-dependent as it's IRIS(1|2|2_1). Fix it. > Again, why is it marked as fix ? It corrects the logic but does not manifest on currently supported hardware. I'll reword it and drop the fixes tag. >> >> Fixes: 6483a8cbea54 ("media: venus: vdec: set work route to fw") >> Reviewed-by: Bryan O'Donoghue <bryan.odonoghue@linaro.org> >> Signed-off-by: Konrad Dybcio <konrad.dybcio@linaro.org> >> --- >> drivers/media/platform/qcom/venus/vdec.c | 2 +- >> 1 file changed, 1 insertion(+), 1 deletion(-) >> >> diff --git a/drivers/media/platform/qcom/venus/vdec.c b/drivers/media/platform/qcom/venus/vdec.c >> index 51a53bf82bd3..33e3f7208b1a 100644 >> --- a/drivers/media/platform/qcom/venus/vdec.c >> +++ b/drivers/media/platform/qcom/venus/vdec.c >> @@ -701,7 +701,7 @@ static int vdec_set_work_route(struct venus_inst *inst) >> u32 ptype = HFI_PROPERTY_PARAM_WORK_ROUTE; >> struct hfi_video_work_route wr; >> - if (!IS_V6(inst->core)) >> + if (!(IS_IRIS1(inst->core) || IS_IRIS2(inst->core) || IS_IRIS2_1(inst->core))) > > Not a good idea to add IRIS1 just for deciding work route and not at other places in driver. Add IRIS1 relevant > > code in other aspects as well, if the patch needs to handle anything w.r.t IRIS1. I'd say that correcting this condition is fair regardless. I can however delay this patch until IRIS1 enablement if you'd prefer that. Konrad > >> return 0; >> wr.video_work_route = inst->core->res->num_vpp_pipes; >>
On 5/6/2023 12:45 AM, Konrad Dybcio wrote: > > > On 5.05.2023 16:02, Vikash Garodia wrote: >> >> On 5/4/2023 1:31 PM, Konrad Dybcio wrote: >>> This is not so much V6-dependent as it's IRIS(1|2|2_1). Fix it. >> Again, why is it marked as fix ? > It corrects the logic but does not manifest on currently > supported hardware. I'll reword it and drop the fixes tag. > >>> >>> Fixes: 6483a8cbea54 ("media: venus: vdec: set work route to fw") >>> Reviewed-by: Bryan O'Donoghue <bryan.odonoghue@linaro.org> >>> Signed-off-by: Konrad Dybcio <konrad.dybcio@linaro.org> >>> --- >>> drivers/media/platform/qcom/venus/vdec.c | 2 +- >>> 1 file changed, 1 insertion(+), 1 deletion(-) >>> >>> diff --git a/drivers/media/platform/qcom/venus/vdec.c b/drivers/media/platform/qcom/venus/vdec.c >>> index 51a53bf82bd3..33e3f7208b1a 100644 >>> --- a/drivers/media/platform/qcom/venus/vdec.c >>> +++ b/drivers/media/platform/qcom/venus/vdec.c >>> @@ -701,7 +701,7 @@ static int vdec_set_work_route(struct venus_inst *inst) >>> u32 ptype = HFI_PROPERTY_PARAM_WORK_ROUTE; >>> struct hfi_video_work_route wr; >>> - if (!IS_V6(inst->core)) >>> + if (!(IS_IRIS1(inst->core) || IS_IRIS2(inst->core) || IS_IRIS2_1(inst->core))) >> >> Not a good idea to add IRIS1 just for deciding work route and not at other places in driver. Add IRIS1 relevant >> >> code in other aspects as well, if the patch needs to handle anything w.r.t IRIS1. > I'd say that correcting this condition is fair regardless. I can > however delay this patch until IRIS1 enablement if you'd prefer > that. Lets add IRIS1 along with other IRIS1 changes. > Konrad >> >>> return 0; >>> wr.video_work_route = inst->core->res->num_vpp_pipes; >>>
diff --git a/drivers/media/platform/qcom/venus/vdec.c b/drivers/media/platform/qcom/venus/vdec.c index 51a53bf82bd3..33e3f7208b1a 100644 --- a/drivers/media/platform/qcom/venus/vdec.c +++ b/drivers/media/platform/qcom/venus/vdec.c @@ -701,7 +701,7 @@ static int vdec_set_work_route(struct venus_inst *inst) u32 ptype = HFI_PROPERTY_PARAM_WORK_ROUTE; struct hfi_video_work_route wr; - if (!IS_V6(inst->core)) + if (!(IS_IRIS1(inst->core) || IS_IRIS2(inst->core) || IS_IRIS2_1(inst->core))) return 0; wr.video_work_route = inst->core->res->num_vpp_pipes;