Received: by 2002:a05:7412:3784:b0:e2:908c:2ebd with SMTP id jk4csp1596921rdb; Mon, 2 Oct 2023 14:56:56 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFKtz7aPXa2FMhr6+81fxTH5g2kJRzB3JxjGaxED1K1k7pMk5ulmN7U0Jh7bm97QzMURmJb X-Received: by 2002:a17:902:c946:b0:1c5:fa71:22fb with SMTP id i6-20020a170902c94600b001c5fa7122fbmr15404116pla.65.1696283815815; Mon, 02 Oct 2023 14:56:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1696283815; cv=none; d=google.com; s=arc-20160816; b=0E6gdlY7/fYjzRlXM+2fckOG2X5F+y/Bu/pRMv0loq56t/UBMFaph0epn5zwSU0eFp b+03tgavJlSnOPJrEle4/x+dITwkTFWHXQ5E1+w2NpOk3sO43RJXg1CDMMBO0rHosraT CM6/gz3BhC/M9QGWpmhtBVpbEvJ4WXye46dCtAx6bR3MKWgx6VxMNiSo69z0VxNaXMOk 9sQkYt4DQ53jnTUh6ONxx3gkZrpZ2GyEzVfJza4vK47IyD5bJLvAN9kA7q21LXkE2XSp kv6mh4ZjRfo27OTJ9Ksrxc98WE/88V76b15e0XxH1ueJoDpJv0ZQQG1t0HfmhT2OBpLZ sYHw== 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=W3IqRDQO3YMqUzu0c5SK0CfZMleyMRbL6H+Fh9GL8Gk=; fh=RbuVdAHdkZh3zmsnEBmnbXgcSPvehQVzUrpFzUODU6Y=; b=RekUSk52ojvhdGnOwnC8ULrjOlHPpSE5j0sfbbasXIEQ45wryqY0PVe8o4ETx/3zR4 xX3qqJyHkvBnSRQ4kw7yqWGI9wqJdCsf7egBpi0YxD1/baqvzP7lcNQammz5vDdIIGm8 frqXvEmJ52LP2M41f9aGyYvwqNbHzqrRqI/jOfJPHj76NW2DgeE9ZhktPrX57cpGNMm1 OQWJXC5Kqk/RereraQgwqhTZ3vWRjbDznp2OthiaUiecK/MKLfQNGRYM36Snayqy+h3k 2S6ax6sl35TLgspDmRBF0qsXsBFLbSxwt5rcNyDGUT7tG4ogdgUv4oO7QoEDIejImsmK 24GA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@fairphone.com header.s=fair header.b=30g4eMrW; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.34 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=fairphone.com Return-Path: Received: from howler.vger.email (howler.vger.email. [23.128.96.34]) by mx.google.com with ESMTPS id s11-20020a170902ea0b00b001c36705bce1si30010592plg.474.2023.10.02.14.56.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 Oct 2023 14:56:55 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.34 as permitted sender) client-ip=23.128.96.34; Authentication-Results: mx.google.com; dkim=pass header.i=@fairphone.com header.s=fair header.b=30g4eMrW; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.34 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=fairphone.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by howler.vger.email (Postfix) with ESMTP id 3D2118065C83; Mon, 2 Oct 2023 07:20:58 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at howler.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237730AbjJBOUr (ORCPT + 99 others); Mon, 2 Oct 2023 10:20:47 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38940 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237741AbjJBOUh (ORCPT ); Mon, 2 Oct 2023 10:20:37 -0400 Received: from mail-ed1-x52b.google.com (mail-ed1-x52b.google.com [IPv6:2a00:1450:4864:20::52b]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 70BF7E6 for ; Mon, 2 Oct 2023 07:20:33 -0700 (PDT) Received: by mail-ed1-x52b.google.com with SMTP id 4fb4d7f45d1cf-5346b64f17aso13616805a12.2 for ; Mon, 02 Oct 2023 07:20:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fairphone.com; s=fair; t=1696256432; x=1696861232; darn=vger.kernel.org; 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=W3IqRDQO3YMqUzu0c5SK0CfZMleyMRbL6H+Fh9GL8Gk=; b=30g4eMrWlMyBhabHisXWqEIatsSjDwWwPdceCWbL8z0f+GQwKFnRdUNXrQSNrPEqGg SK1+1BYenMY+AIEQnQpIw6jYLBaxOZ/VITRhXOxc+EQbV9mzHrc3ZBHAC8XX3v5wzdul OISuWWMWnY4SKbOZhlaAaKzPlIa/9BWO8t0emwJlqVe0/8K+XU8YQ4ZR0pDQMPLiuEc7 qS4OfkMvlmj0kPdQUnorTU4HlWg/j/gLneP2fSg4ubTY222Jpn3YmZd/5XIWCDai+s0i NiwZLyFVvJwgh/bo8r8ca1Z6mhaquRHT5mwnYCQwGbrijny5NIBuAKhCj2SGv4soqxFX jV0w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696256432; x=1696861232; 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=W3IqRDQO3YMqUzu0c5SK0CfZMleyMRbL6H+Fh9GL8Gk=; b=gKd3pHahtRy4VgPMsamfFR06DWcF4FHxSh9J6YKqj/gmm7lS8rQIklybxqLhtcF3+9 BkVxh65RkXG+dvpBTjh5DEyFhl2z1SEYJIj3DIR0eZbVPJHwrWbozUIiPKuvc8Rb+3ZO HojHrR3rX10gSvKvG+VhXAYxlAOaCwE51irloW8QC4Om+JePstIGlyjISNq0SVAVjcCX 4m20T16cJMZWk9WEBy3OvcBJKXrm2xDAXFqGNtCVf8ka251agSLIRbTTAf5hYmjnsPoA DxWo74oIHA0GiiwyZ+j6i37bYetdzPwITBB3qbg5hWJ9zt7NU217LM5XfrveLIhAHYtH JHbA== X-Gm-Message-State: AOJu0YzcPYvN2EK8jQsPgSFCeEYYi0pCKhj+pzhwbPDtMvoSGNb/zgpi bG2TNf9zyLUCekB3M35E8g+MvA== X-Received: by 2002:aa7:c584:0:b0:530:a226:1f25 with SMTP id g4-20020aa7c584000000b00530a2261f25mr9383353edq.17.1696256431920; Mon, 02 Oct 2023 07:20:31 -0700 (PDT) Received: from otso.luca.vpn.lucaweiss.eu (144-178-202-138.static.ef-service.nl. [144.178.202.138]) by smtp.gmail.com with ESMTPSA id w10-20020aa7dcca000000b005309eb7544fsm15583356edu.45.2023.10.02.07.20.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 Oct 2023 07:20:31 -0700 (PDT) From: Luca Weiss Date: Mon, 02 Oct 2023 16:20:30 +0200 Subject: [PATCH v2 2/3] arm64: dts: qcom: sc7280: Move video-firmware to chrome-common MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20231002-sc7280-venus-pas-v2-2-bd2408891317@fairphone.com> References: <20231002-sc7280-venus-pas-v2-0-bd2408891317@fairphone.com> In-Reply-To: <20231002-sc7280-venus-pas-v2-0-bd2408891317@fairphone.com> To: Stanimir Varbanov , Vikash Garodia , Bryan O'Donoghue , Andy Gross , Bjorn Andersson , Konrad Dybcio , Mauro Carvalho Chehab , cros-qcom-dts-watchers@chromium.org, Rob Herring , Krzysztof Kozlowski , Conor Dooley Cc: ~postmarketos/upstreaming@lists.sr.ht, phone-devel@vger.kernel.org, linux-media@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org, devicetree@vger.kernel.org, Luca Weiss X-Mailer: b4 0.12.3 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-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (howler.vger.email [0.0.0.0]); Mon, 02 Oct 2023 07:20:58 -0700 (PDT) If the video-firmware node is present, the venus driver assumes we're on a system that doesn't use TZ for starting venus, like on ChromeOS devices. Move the video-firmware node to chrome-common.dtsi so we can use venus on a non-ChromeOS devices. At the same time also disable the venus node by default in the dtsi, like it's done on other SoCs. Reviewed-by: Bryan O'Donoghue Signed-off-by: Luca Weiss --- arch/arm64/boot/dts/qcom/sc7280-chrome-common.dtsi | 8 ++++++++ arch/arm64/boot/dts/qcom/sc7280.dtsi | 6 ++---- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/arch/arm64/boot/dts/qcom/sc7280-chrome-common.dtsi b/arch/arm64/boot/dts/qcom/sc7280-chrome-common.dtsi index 5d462ae14ba1..cd491e46666d 100644 --- a/arch/arm64/boot/dts/qcom/sc7280-chrome-common.dtsi +++ b/arch/arm64/boot/dts/qcom/sc7280-chrome-common.dtsi @@ -104,6 +104,14 @@ &scm { dma-coherent; }; +&venus { + status = "okay"; + + video-firmware { + iommus = <&apps_smmu 0x21a2 0x0>; + }; +}; + &watchdog { status = "okay"; }; diff --git a/arch/arm64/boot/dts/qcom/sc7280.dtsi b/arch/arm64/boot/dts/qcom/sc7280.dtsi index 66f1eb83cca7..fa53f54d4675 100644 --- a/arch/arm64/boot/dts/qcom/sc7280.dtsi +++ b/arch/arm64/boot/dts/qcom/sc7280.dtsi @@ -3740,6 +3740,8 @@ venus: video-codec@aa00000 { <&apps_smmu 0x2184 0x20>; memory-region = <&video_mem>; + status = "disabled"; + video-decoder { compatible = "venus-decoder"; }; @@ -3748,10 +3750,6 @@ video-encoder { compatible = "venus-encoder"; }; - video-firmware { - iommus = <&apps_smmu 0x21a2 0x0>; - }; - venus_opp_table: opp-table { compatible = "operating-points-v2"; -- 2.42.0