[v3,13/17] media: venus: hfi_platform: Check vpu_version instead of device compatible
Message ID | 20230228-topic-venus-v3-13-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 b10csp66704vqo; Wed, 17 May 2023 14:37:13 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ65bKKjGDCEGSPyqTU85lZ0yUGUb2tawMHQZYj8F7k3w9Cs9rj/ZtMFkbrCwh3JQMSK0jCn X-Received: by 2002:a17:90a:ccf:b0:24e:37c6:9681 with SMTP id 15-20020a17090a0ccf00b0024e37c69681mr263993pjt.38.1684359433030; Wed, 17 May 2023 14:37:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1684359432; cv=none; d=google.com; s=arc-20160816; b=fLfypVkKV6oihVPpXx9oJyN6CMr8i6Car3/pVRJ3Z+oBVV45vCL9wDGcBT81R07dPQ bNNX87Za77hQ1ZY6auD8FT2AtdEzYSJcy3wqQ65tS3GHXAo1eLIm8JiD6zGROWU0nqnx xpLY12QSm7NQnTRze7Osu+7SVJ/Xqbtn5us4Tzkhc172Lbo1zk6X0FBRRq315gyU+1HP mC+KGt1S/EX28FtM3TO6pviQignn/PVAymCemdBtaw54gCbKKNYwb0h41jPzy1zR7s82 gc3RMD7tkYKI0jy0TNjKfXjk2dxWryMWHoq8Zi8CaVUbCT9IIjCNgJRwhRkNVnxER+jB vS9g== 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=NCbmXotl4JHp6511qJyB6cem0LHm1+AqjQQ+gB6Kt5k=; b=qn2ladkjGHnhx6IElxUOZQ+WrrUNuMcPANnCch0oxtVVTlYgafGtnkofFejsJuOIii Ykl3IymRHLMLXNkVUt8Oe0cj4LIwgi+nM9pFpnI03DKCARrEA6AwOsTSh/97YZrfYJm7 oEnUurEf/32LAta9503A7p8+H28xFBOVT5QgU7g/OPbOhnPlDwDtbXj/hVhOBOBvYRTh 2xKMApkw8xO4ygGxlXVYRAIler3qRK3RFBcOzE70KwmtoWKrc9I5RGefm/GRAKHuDm4w NZmubpFM1TipOU2sukSPhGgs0bg0I7dUt6ga17QdI89oRel61IGIKcRgmIgQlv5Q0sL6 AM7A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="UQjG0/Wu"; 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 144-20020a630096000000b00528a60cc065si21582155pga.380.2023.05.17.14.36.42; Wed, 17 May 2023 14:37:12 -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="UQjG0/Wu"; 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 S230033AbjEQVPV (ORCPT <rfc822;abdi.embedded@gmail.com> + 99 others); Wed, 17 May 2023 17:15:21 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53120 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229988AbjEQVO6 (ORCPT <rfc822;linux-kernel@vger.kernel.org>); Wed, 17 May 2023 17:14:58 -0400 Received: from mail-lj1-x232.google.com (mail-lj1-x232.google.com [IPv6:2a00:1450:4864:20::232]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7BEE18A67 for <linux-kernel@vger.kernel.org>; Wed, 17 May 2023 14:14:46 -0700 (PDT) Received: by mail-lj1-x232.google.com with SMTP id 38308e7fff4ca-2af1551b2a3so4223001fa.1 for <linux-kernel@vger.kernel.org>; Wed, 17 May 2023 14:14:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1684358086; x=1686950086; 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=NCbmXotl4JHp6511qJyB6cem0LHm1+AqjQQ+gB6Kt5k=; b=UQjG0/WuV5etiyDEFOP94o2jTjOe5xRhvCKVl73vhfDmGmrmoPKZM9TbL7d2MMqSYm wESmm+0FW+v1QpAlutjXMT99Eves69zCtLY7SdsXo5dvFZbkhBuFIOjHDRS5ba6sHGV9 QJw7yG6oT1jZqx0xZmQSMC0t5j8Muy//u36CzJAAHS+APAwxpKHzmwmoGQS94hRi4XUK kLmwRzv3wVB9vlGSmQlRQ1bBQ6w486spfmfYe82it95DiK5rwdv5xx0aYx0+IY5fR5ZS 7sCchTViFV/BCsoIDiTb0tXxxtNBW4J8qxdnpMnAvqnUwGWSUqKzog1izUwYeLLRJSfv j+dQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684358086; x=1686950086; 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=NCbmXotl4JHp6511qJyB6cem0LHm1+AqjQQ+gB6Kt5k=; b=cbfQlYxrCfYlQRum4CH1OV1ECksfGVkLZFgbypEbeIDYYq/R+cEKBBgaF7WC9moveo R49LLPzu3mWDONYfhV4BKHfYcB5hNJKjHHiztYfYzWdvdlYjxm2V2YEFENiXQGQdNIlE SpKg6efmVRvsn73JwNmbv57636qbsxZIbck8CiN0CQKrWCRWZ/5EZOvuEktpp8RKjeRS B7rhdZUvE7G9QxEF+cf+OPoFTow4IlN+d9q7TMOJeiN/xNDbM5MIC0enLBn/5chtYnSC j4WBrDkccJO+XyLbEITDDiS32rZBjELTpkdxiFf70m0Er23wdIhzBe1MYhH8m8eohuYy DUAg== X-Gm-Message-State: AC+VfDzGGOEK2mojdKrj1Ccr+51qQgRfqN2X+iBVY6sJQvS9zihgWzxd xflM8bKLNisVPDsHevJhtFDcZw== X-Received: by 2002:a2e:aa94:0:b0:2ad:90bf:a5a9 with SMTP id bj20-20020a2eaa94000000b002ad90bfa5a9mr1298857ljb.1.1684358085936; Wed, 17 May 2023 14:14:45 -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.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 17 May 2023 14:14:45 -0700 (PDT) From: Konrad Dybcio <konrad.dybcio@linaro.org> Date: Wed, 17 May 2023 23:14:26 +0200 Subject: [PATCH v3 13/17] media: venus: hfi_platform: Check vpu_version instead of device compatible MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20230228-topic-venus-v3-13-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=1007; i=konrad.dybcio@linaro.org; s=20230215; h=from:subject:message-id; bh=EUWf2T+I6vhFizSQGtxC124WvawcGCVn6gQZEf/m3uU=; b=UpdjgwgmzcU1sXtNPOGiLxsGyZkEb7Yb3IUpfGrtlJyrVgA12baH+lL/rASjTNvM2lvrLsbPS gxBq5TpxWgaAioFlLIcq6de3Jo54QZn9Zh1W3oWvMKGdDIkEhzA1UV8 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?1766178876526727388?= X-GMAIL-MSGID: =?utf-8?q?1766178876526727388?= |
Series |
Venus QoL / maintainability fixes
|
|
Commit Message
Konrad Dybcio
May 17, 2023, 9:14 p.m. UTC
This is not a matter of the host SoC, but the VPU chip in Venus. Fix it. Reviewed-by: Bryan O'Donoghue <bryan.odonoghue@linaro.org> Reviewed-by: Vikash Garodia <quic_vgarodia@quicinc.com> Signed-off-by: Konrad Dybcio <konrad.dybcio@linaro.org> --- drivers/media/platform/qcom/venus/hfi_platform.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/media/platform/qcom/venus/hfi_platform.c b/drivers/media/platform/qcom/venus/hfi_platform.c index f07f554bc5fe..d163d5b0e6b7 100644 --- a/drivers/media/platform/qcom/venus/hfi_platform.c +++ b/drivers/media/platform/qcom/venus/hfi_platform.c @@ -80,7 +80,7 @@ hfi_platform_get_codecs(struct venus_core *core, u32 *enc_codecs, u32 *dec_codec if (plat->codecs) plat->codecs(enc_codecs, dec_codecs, count); - if (of_device_is_compatible(core->dev->of_node, "qcom,sc7280-venus")) { + if (IS_IRIS2_1(core)) { *enc_codecs &= ~HFI_VIDEO_CODEC_VP8; *dec_codecs &= ~HFI_VIDEO_CODEC_VP8; }