Message ID | 20230926-topic-a643-v1-4-7af6937ac0a3@linaro.org |
---|---|
State | New |
Headers |
Return-Path: <linux-kernel-owner@vger.kernel.org> Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:cae8:0:b0:403:3b70:6f57 with SMTP id r8csp2202133vqu; Tue, 26 Sep 2023 14:26:32 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGKD4b18QZq3F1u44LN9ehob8vBQhKm/GJNlBJVjTbwHODPOJfLCzNNSNCdCiimPZDSmJwD X-Received: by 2002:a05:6358:7252:b0:141:3a1:1877 with SMTP id i18-20020a056358725200b0014103a11877mr289610rwa.14.1695763592545; Tue, 26 Sep 2023 14:26:32 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1695763592; cv=none; d=google.com; s=arc-20160816; b=pu1ijz6agylti0eaIv8Cd3g8kPzz/FchkwS4XvsgN5fIG+1s+G800pXydsBuRuZrCy ufIUH8n/xBWZY7+PbAum82TyZl+MymVNKef4+kTI7hU/7FvTQCWthypw2VeY5ErYIaEW kEr7XkM0yJxGsM6MRdqap6+afYS2b8gv0sbBJ2OWjqY70Fc8w1sKarcErV+je1WyRQlz bb/D2nYKrhNSDDWK5gfBENjE5l2vC+JVBTb46QbbXuJFsU1/vveYV+ArZYsXmBr/pxsb OKXdfufuhOQBb/roupVAnpxI/kcpyd4V3gZh34V9XoMZdfzBwzd0MbFKxQP06UAWNk8r aGEQ== 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=Hv259dlxpBQTllwsNOUgVjMH2doZt+8ko67T2DfMJJY=; fh=mlIZHPbN87mtISF6MqYNWpjXSb9fByWKfC3t5kuxP6o=; b=0926PHIgm5ZnKgJ/wRIXkEElup5erpJ8VNXF5lTYpSi7uegtVlKq7NpIjzag+P7xBO DCddPsz090MIQcvgc0cyTHgfkoJVXP37qtQfYgoTAJhcM5u7idpHAvLY5CkgtBXLAEBU NS6g3NKRg8EgjucUtFhTAc0dqeMrdXDuNgKFEuiJMX73r1VwKVe1kr6pyh6GNEVFKeXO RwoB1z2ClOwsynPXvYey3LaUKsPwl2RJrN9f8SwRVeSc8j9hRl26b/5KkOgWJMJ1T6iH Ch+b5IdpYw8TUfj6oMlRRQOb4hL7GRJmixwdeY1VC7tT321sWSTj4q6GjP9ChU2bXFh/ APYw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Mg0irCEX; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 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 snail.vger.email (snail.vger.email. [2620:137:e000::3:7]) by mx.google.com with ESMTPS id cf4-20020a056a02084400b00578b2728aa4si12961772pgb.129.2023.09.26.14.26.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 26 Sep 2023 14:26:32 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) client-ip=2620:137:e000::3:7; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Mg0irCEX; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 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 (depot.vger.email [IPv6:2620:137:e000::3:0]) by snail.vger.email (Postfix) with ESMTP id 7D57D81CC87B; Tue, 26 Sep 2023 11:25:08 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235529AbjIZSZD (ORCPT <rfc822;pwkd43@gmail.com> + 28 others); Tue, 26 Sep 2023 14:25:03 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45588 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235488AbjIZSY5 (ORCPT <rfc822;linux-kernel@vger.kernel.org>); Tue, 26 Sep 2023 14:24:57 -0400 Received: from mail-lf1-x134.google.com (mail-lf1-x134.google.com [IPv6:2a00:1450:4864:20::134]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3EF10136 for <linux-kernel@vger.kernel.org>; Tue, 26 Sep 2023 11:24:50 -0700 (PDT) Received: by mail-lf1-x134.google.com with SMTP id 2adb3069b0e04-5041cc983f9so15335570e87.3 for <linux-kernel@vger.kernel.org>; Tue, 26 Sep 2023 11:24:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1695752688; x=1696357488; 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=Hv259dlxpBQTllwsNOUgVjMH2doZt+8ko67T2DfMJJY=; b=Mg0irCEXsuqsYZW+3vR9Hpq0O3Dx7ThkfnDxkbR8CdtuHkM/uQB4llkPZgx5B7A/4P PEL/mIvtJGzYrWXv3sSffo2aqrs0JWwh+EHf4eNZ3GdOPE4nhFe5AVSFLGT41rYMaTPB q8esbkj+D2rYz9VWcZ6ovSyiXbFAMOt8ieyH4+6HWVgk/KrD5AHVgT3zdn1GXKF0qO1g r9sO4kRWYgGSlOclHeTutFGIDGwwNj4DdZR28I8TIlzBpXusPn9/dTPJlxQcs7pxqkat dzYYdr26I9Nj7KXyWpi2+OD/7hN55CKl6ngMDb8Cl/FsosCJ9wr1w9Ws7XvDuSlXV8// YD+g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1695752688; x=1696357488; 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=Hv259dlxpBQTllwsNOUgVjMH2doZt+8ko67T2DfMJJY=; b=jhziAyQLob1/mlpEvqM8sdbxfbE7u+teXODqzN29MsajDxKUH7zJvyNWwoNu0LrO6i Vze71YFCyrNrBRsVlECDuGqVxdHp+0Otao6fsNGQqA6JAC/uyBTnCFiA27PNUBmGBIFG GDUvVqRwgbPCP2s8jZS9dDhwL0mxFRQLIez35SB2mqlNxm6ySNN5o291fiOe5OXv34lB cW4lXqisb8z7J39PdtsLDRPD1ZybQohrmKYCu1GU2TExG2bVr29PfVjKvfxskSHLHlpD bDmZp33d5U4xWIswLbAPGzzkFK1xK5/NYevrJ5nnaaA6VAHa2N78UfB2FzEgK4ypZVeT jZ5Q== X-Gm-Message-State: AOJu0YxIBRp7+CIeTjnFWr+n0h7xrNdVpFf2fd4WkIwUxo0QWiLbvs5R jDoXWkfmZ3naiAwYwGFdaeEbVg== X-Received: by 2002:ac2:5990:0:b0:4fe:7e7f:1328 with SMTP id w16-20020ac25990000000b004fe7e7f1328mr8327434lfn.16.1695752688279; Tue, 26 Sep 2023 11:24:48 -0700 (PDT) Received: from [10.167.154.1] (178235177023.dynamic-4-waw-k-1-1-0.vectranet.pl. [178.235.177.23]) by smtp.gmail.com with ESMTPSA id f19-20020a056402151300b0053090e2afafsm7020643edw.22.2023.09.26.11.24.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 26 Sep 2023 11:24:48 -0700 (PDT) From: Konrad Dybcio <konrad.dybcio@linaro.org> Date: Tue, 26 Sep 2023 20:24:39 +0200 Subject: [PATCH 4/7] arm64: dts: qcom: sc7280: Add ZAP shader support MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20230926-topic-a643-v1-4-7af6937ac0a3@linaro.org> References: <20230926-topic-a643-v1-0-7af6937ac0a3@linaro.org> In-Reply-To: <20230926-topic-a643-v1-0-7af6937ac0a3@linaro.org> To: Rob Clark <robdclark@gmail.com>, Abhinav Kumar <quic_abhinavk@quicinc.com>, Dmitry Baryshkov <dmitry.baryshkov@linaro.org>, Sean Paul <sean@poorly.run>, David Airlie <airlied@gmail.com>, Daniel Vetter <daniel@ffwll.ch>, cros-qcom-dts-watchers@chromium.org, Andy Gross <agross@kernel.org>, Bjorn Andersson <andersson@kernel.org>, Rob Herring <robh+dt@kernel.org>, Krzysztof Kozlowski <krzysztof.kozlowski+dt@linaro.org>, Conor Dooley <conor+dt@kernel.org>, Stephen Boyd <swboyd@chromium.org>, Akhil P Oommen <quic_akhilpo@quicinc.com> Cc: Marijn Suijten <marijn.suijten@somainline.org>, Luca Weiss <luca.weiss@fairphone.com>, Rob Clark <robdclark@chromium.org>, linux-arm-msm@vger.kernel.org, dri-devel@lists.freedesktop.org, freedreno@lists.freedesktop.org, linux-kernel@vger.kernel.org, devicetree@vger.kernel.org, Konrad Dybcio <konrad.dybcio@linaro.org> X-Mailer: b4 0.12.2 X-Developer-Signature: v=1; a=ed25519-sha256; t=1695752677; l=1716; i=konrad.dybcio@linaro.org; s=20230215; h=from:subject:message-id; bh=KPLzI8JFAgOM8lipaf6IRavq4f0Qs8pGOQ9Xz036QH0=; b=PDlPugMO+iF59ClerI17jCYJbl64YHQKAQ2PSltxjIudAdlihLWSc6nsLkhRsORmNGP+5xoQK f6Hn3X2fOEGDA22Z+Akv8Movy+kal6fJjl/lAjkYrwFQELNg6ZJ4gyA 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 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-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (snail.vger.email [0.0.0.0]); Tue, 26 Sep 2023 11:25:08 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1778137004615966119 X-GMAIL-MSGID: 1778137004615966119 |
Series |
Adreno 643 + fixes
|
|
Commit Message
Konrad Dybcio
Sept. 26, 2023, 6:24 p.m. UTC
Non-Chrome SC7280-family platforms ship a ZAP shader with the Adreno GPU.
Describe that and make sure it doesn't interfere with Chrome devices.
Signed-off-by: Konrad Dybcio <konrad.dybcio@linaro.org>
---
arch/arm64/boot/dts/qcom/sc7280-chrome-common.dtsi | 2 ++
arch/arm64/boot/dts/qcom/sc7280.dtsi | 10 ++++++++++
2 files changed, 12 insertions(+)
Comments
On 26.09.2023 20:24, Konrad Dybcio wrote: > Non-Chrome SC7280-family platforms ship a ZAP shader with the Adreno GPU. > Describe that and make sure it doesn't interfere with Chrome devices. > > Signed-off-by: Konrad Dybcio <konrad.dybcio@linaro.org> > --- > arch/arm64/boot/dts/qcom/sc7280-chrome-common.dtsi | 2 ++ > arch/arm64/boot/dts/qcom/sc7280.dtsi | 10 ++++++++++ > 2 files changed, 12 insertions(+) > > diff --git a/arch/arm64/boot/dts/qcom/sc7280-chrome-common.dtsi b/arch/arm64/boot/dts/qcom/sc7280-chrome-common.dtsi > index 5d462ae14ba1..88fc67c3646e 100644 > --- a/arch/arm64/boot/dts/qcom/sc7280-chrome-common.dtsi > +++ b/arch/arm64/boot/dts/qcom/sc7280-chrome-common.dtsi > @@ -17,6 +17,8 @@ > * required by the setup for Chrome boards. > */ > > +/delete-node/ &gpu_zap_mem; > +/delete-node/ &gpu_zap_shader; > /delete-node/ &hyp_mem; > /delete-node/ &xbl_mem; > /delete-node/ &reserved_xbl_uefi_log; > diff --git a/arch/arm64/boot/dts/qcom/sc7280.dtsi b/arch/arm64/boot/dts/qcom/sc7280.dtsi > index 66f1eb83cca7..c38ddf267ef5 100644 > --- a/arch/arm64/boot/dts/qcom/sc7280.dtsi > +++ b/arch/arm64/boot/dts/qcom/sc7280.dtsi > @@ -152,6 +152,11 @@ ipa_fw_mem: memory@8b700000 { > no-map; > }; > > + gpu_zap_mem: zap@8b71a000 { > + reg = <0 0x8b71a000 0 0x2000>; > + no-map; > + }; > + > rmtfs_mem: memory@9c900000 { > compatible = "qcom,rmtfs-mem"; > reg = <0x0 0x9c900000 0x0 0x280000>; > @@ -2608,6 +2613,11 @@ gpu: gpu@3d00000 { > nvmem-cells = <&gpu_speed_bin>; > nvmem-cell-names = "speed_bin"; > > + gpu_zap_shader: zap-shader { > + memory-region = <&gpu_zap_mem>; > + firmware-name = "qcom/a660_zap.mdt"; Gah. This line shouldn't have been there. Considering it's not the only oops, I'll resend. Konrad
diff --git a/arch/arm64/boot/dts/qcom/sc7280-chrome-common.dtsi b/arch/arm64/boot/dts/qcom/sc7280-chrome-common.dtsi index 5d462ae14ba1..88fc67c3646e 100644 --- a/arch/arm64/boot/dts/qcom/sc7280-chrome-common.dtsi +++ b/arch/arm64/boot/dts/qcom/sc7280-chrome-common.dtsi @@ -17,6 +17,8 @@ * required by the setup for Chrome boards. */ +/delete-node/ &gpu_zap_mem; +/delete-node/ &gpu_zap_shader; /delete-node/ &hyp_mem; /delete-node/ &xbl_mem; /delete-node/ &reserved_xbl_uefi_log; diff --git a/arch/arm64/boot/dts/qcom/sc7280.dtsi b/arch/arm64/boot/dts/qcom/sc7280.dtsi index 66f1eb83cca7..c38ddf267ef5 100644 --- a/arch/arm64/boot/dts/qcom/sc7280.dtsi +++ b/arch/arm64/boot/dts/qcom/sc7280.dtsi @@ -152,6 +152,11 @@ ipa_fw_mem: memory@8b700000 { no-map; }; + gpu_zap_mem: zap@8b71a000 { + reg = <0 0x8b71a000 0 0x2000>; + no-map; + }; + rmtfs_mem: memory@9c900000 { compatible = "qcom,rmtfs-mem"; reg = <0x0 0x9c900000 0x0 0x280000>; @@ -2608,6 +2613,11 @@ gpu: gpu@3d00000 { nvmem-cells = <&gpu_speed_bin>; nvmem-cell-names = "speed_bin"; + gpu_zap_shader: zap-shader { + memory-region = <&gpu_zap_mem>; + firmware-name = "qcom/a660_zap.mdt"; + }; + gpu_opp_table: opp-table { compatible = "operating-points-v2";