From patchwork Fri Mar 31 01:14:51 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Konrad Dybcio X-Patchwork-Id: 77502 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp247945vqo; Thu, 30 Mar 2023 18:20:56 -0700 (PDT) X-Google-Smtp-Source: AK7set8nSf1dgYlWIH5JY4L6rg3fpXFBFoiMEia4o1OAL9LoTgvgGk7Kl7Gr3kDOlHRM1uI7kE1v X-Received: by 2002:a05:6a20:1aaf:b0:da:53ca:8f26 with SMTP id ci47-20020a056a201aaf00b000da53ca8f26mr19540498pzb.30.1680225655932; Thu, 30 Mar 2023 18:20:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1680225655; cv=none; d=google.com; s=arc-20160816; b=xLnPPllBmOyPKXXiBFgYxHvQVRG+JZDQDjYmxjhkF1BtfEtU1mO1fPrKAzmOdT1WLT Qd4jxEd/FnuEghK4foLXgxikyotF4yZtGBHG8830eqBHjqNCgGUJGh/dTXA/EGJI/sqs EXQXdQ1sTcjmA3245agCt1DaQceOnLA+6NB+31BDFrpYayNZM/lao6hve2fnzg03xusZ vbLptGOjaUq1pzeqDlzYliId1PBEkCzE0VNEjsxjkliOzx8nf65NInUtUBRBm/tE4KEs 0vM/iDExjMivI7hAx9x1nchva7XmuukGgmWXpVAoyi+enOcizOQXuUlTpXHDzJjrBbuI siww== 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=blSlteeDXapXNIOhzXC0rq6pPvL6cTVyW1O/lnNGmF0=; b=0bBex2n5JqYQpxPyNzlRrVifqkNBCGQR2TjkIqDY0/DV3Ad6fMIqen3tm+eLT+KOUP co2dY3N7zwR1abvc6dnvebgekHg7D/dPj+h95RQLtgZHeCyJ2EABCAMBIURqEAKFd4e1 Nz4FmTa8EfOXpe+bofdH9yJT8s/BavqM1bNHQEPBAlPLygD59dZJS2QOEn4VdniebtBQ 4hg2pMvaUCOWB4/rkY2IMESKu9eqRqdv6BxydVAR8+mivKIJBSfOutXtFMwtu4y0joxz w4RrmrdDF95BG6PeadElWo2aGkrBWIS21/Z+I2BpTrISJfFT4acRU3qB/ESh3pafagGV rOHw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=VC6VR4H4; 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 x18-20020aa79412000000b005cd3a233e3asi1113437pfo.346.2023.03.30.18.20.42; Thu, 30 Mar 2023 18:20:55 -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=VC6VR4H4; 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 S229941AbjCaBPL (ORCPT + 99 others); Thu, 30 Mar 2023 21:15:11 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33914 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229835AbjCaBPD (ORCPT ); Thu, 30 Mar 2023 21:15:03 -0400 Received: from mail-lj1-x22a.google.com (mail-lj1-x22a.google.com [IPv6:2a00:1450:4864:20::22a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A63F1CDC1 for ; Thu, 30 Mar 2023 18:15:01 -0700 (PDT) Received: by mail-lj1-x22a.google.com with SMTP id bx10so3159227ljb.8 for ; Thu, 30 Mar 2023 18:15:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1680225300; 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=blSlteeDXapXNIOhzXC0rq6pPvL6cTVyW1O/lnNGmF0=; b=VC6VR4H4P2QtQTCqLLC4/MwOy0wHaM5qNA8k8sWIHp52m8jZ3puSBQxY35FlCNKRN9 h/DDCnw3q8/QmtFLdONh3eRfNJ3MHwlQepC9ulr73d78X7vfiamM/Phln2RRc9+CSEyd eczSC3hxuNsyYFU7TVRTqrOzDxom/eIbxtLDnWuqA1amNr6IP9iDKkkzOUP3NmrTSOLx Tp48D9QSaoPowZXXMN5lvTyYAdQmBamgBGUz5zh0/E8FCbobitRkauSjl4Ip61NBywDl NN7jqFx9CSYEwmVk0ypX2LshW4tR2+frPq52XQr+2Cc7TgYyZ2TBag8Rae/x8AwgM6DL Qx8g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1680225300; 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=blSlteeDXapXNIOhzXC0rq6pPvL6cTVyW1O/lnNGmF0=; b=Dr94nAMRu7JpoWBSXobjUJIyG7y39bWmYnYPtHc7AktfFRMmfS0ZR+n8rT57EyftOb H+wEumo/i2tRKPInzjqgsEKh4RBR+n+TYSrY6RrfLUyyPYJ4QL3sba/BJpydSbVmwArw H78es52UIvr9jQu5WDtkfOVHkQujr6q20Mci/v2uq9peEh1zp99fCyfg5byvOUYVqoRM iGNGC/JIXmhaayFOIU+4QnhgvWoo07fwvv73DxOd5J/wLy3mMf7Ivb14U4NB+NBs5zp+ 9h3ik6CN4FlxPRiQfzF6pBvr3cZCqAQJFttqzsuRP+7jOqwEMNG4FX/lQnLw2wYCkSs3 2sqA== X-Gm-Message-State: AAQBX9cnjG06IsAnhL3NYuRVV8nh02z6Ts09bDQou2EZIkV8dLw6VTE8 qMAUoQRGmkGXXP8v0zW3YWIArg== X-Received: by 2002:a2e:9b81:0:b0:295:a8e6:6b15 with SMTP id z1-20020a2e9b81000000b00295a8e66b15mr2359539lji.4.1680225299834; Thu, 30 Mar 2023 18:14:59 -0700 (PDT) Received: from [192.168.1.101] (abxj225.neoplus.adsl.tpnet.pl. [83.9.3.225]) by smtp.gmail.com with ESMTPSA id n7-20020a2e7207000000b002986854f27dsm134573ljc.23.2023.03.30.18.14.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 30 Mar 2023 18:14:59 -0700 (PDT) From: Konrad Dybcio Date: Fri, 31 Mar 2023 03:14:51 +0200 Subject: [PATCH v3 3/5] arm64: dts: qcom: sm8150: Don't start Adreno in headless mode MIME-Version: 1.0 Message-Id: <20230331-topic-konahana_speedbin-v3-3-2dede22dd7f7@linaro.org> References: <20230331-topic-konahana_speedbin-v3-0-2dede22dd7f7@linaro.org> In-Reply-To: <20230331-topic-konahana_speedbin-v3-0-2dede22dd7f7@linaro.org> To: Rob Clark , Abhinav Kumar , Dmitry Baryshkov , Sean Paul , David Airlie , Daniel Vetter , Andy Gross , Bjorn Andersson , Rob Herring , Krzysztof Kozlowski Cc: Marijn Suijten , 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 X-Mailer: b4 0.12.2 X-Developer-Signature: v=1; a=ed25519-sha256; t=1680225294; l=2441; i=konrad.dybcio@linaro.org; s=20230215; h=from:subject:message-id; bh=0bRNNECqfQgn0pE7kzclN0Aj6mArWM+WKgBFrwJE5/c=; b=rY3AlxaGIds0zRkZc6EUU8QyjZ2q/ehkONWRm0jX7zPOtPLrGM+GM/crsgiPjJVlzNqZTedPu68T dRs/eZDgB18cMnsKLK17usLH/teBLab307MB3WtKpMfneulMWUq4 X-Developer-Key: i=konrad.dybcio@linaro.org; a=ed25519; pk=iclgkYvtl2w05SSXO5EjjSYlhFKsJ+5OSZBjOkQuEms= X-Spam-Status: No, score=-0.2 required=5.0 tests=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-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1761844297444885056?= X-GMAIL-MSGID: =?utf-8?q?1761844297444885056?= Now that there's display support, there is no reason to assume the default mode for Adreno should be headless. Keep it like that for boards that previously enabled it, so as not to create regressions though. Tested-by: Marijn Suijten # On Sony Xperia 5 Reviewed-by: Marijn Suijten Reviewed-by: Dmitry Baryshkov Signed-off-by: Konrad Dybcio --- arch/arm64/boot/dts/qcom/sm8150-hdk.dts | 5 +++++ arch/arm64/boot/dts/qcom/sm8150-mtp.dts | 5 +++++ arch/arm64/boot/dts/qcom/sm8150.dtsi | 10 +--------- 3 files changed, 11 insertions(+), 9 deletions(-) diff --git a/arch/arm64/boot/dts/qcom/sm8150-hdk.dts b/arch/arm64/boot/dts/qcom/sm8150-hdk.dts index 8f014a232526..c0200e7f3f74 100644 --- a/arch/arm64/boot/dts/qcom/sm8150-hdk.dts +++ b/arch/arm64/boot/dts/qcom/sm8150-hdk.dts @@ -359,6 +359,11 @@ &gmu { }; &gpu { + /* + * NOTE: "amd,imageon" makes Adreno start in headless mode, remove it + * after display support is added on this board. + */ + compatible = "qcom,adreno-640.1", "qcom,adreno", "amd,imageon"; status = "okay"; }; diff --git a/arch/arm64/boot/dts/qcom/sm8150-mtp.dts b/arch/arm64/boot/dts/qcom/sm8150-mtp.dts index eff995a07ab7..34ec84916bdd 100644 --- a/arch/arm64/boot/dts/qcom/sm8150-mtp.dts +++ b/arch/arm64/boot/dts/qcom/sm8150-mtp.dts @@ -354,6 +354,11 @@ &gmu { }; &gpu { + /* + * NOTE: "amd,imageon" makes Adreno start in headless mode, remove it + * after display support is added on this board. + */ + compatible = "qcom,adreno-640.1", "qcom,adreno", "amd,imageon"; status = "okay"; }; diff --git a/arch/arm64/boot/dts/qcom/sm8150.dtsi b/arch/arm64/boot/dts/qcom/sm8150.dtsi index 9491be4a6bf0..880483922f22 100644 --- a/arch/arm64/boot/dts/qcom/sm8150.dtsi +++ b/arch/arm64/boot/dts/qcom/sm8150.dtsi @@ -2157,15 +2157,7 @@ compute-cb@3 { }; gpu: gpu@2c00000 { - /* - * note: the amd,imageon compatible makes it possible - * to use the drm/msm driver without the display node, - * make sure to remove it when display node is added - */ - compatible = "qcom,adreno-640.1", - "qcom,adreno", - "amd,imageon"; - + compatible = "qcom,adreno-640.1", "qcom,adreno"; reg = <0 0x02c00000 0 0x40000>; reg-names = "kgsl_3d0_reg_memory";