From patchwork Wed Jun 14 14:22:04 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bjorn Andersson X-Patchwork-Id: 107996 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:6358:640b:b0:12b:d5da:ddc2 with SMTP id f11csp1351181rwh; Wed, 14 Jun 2023 07:49:40 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ6+35HJG2sBRDw3ylHwBWMzVNll7orJo+X0hEo1RZw/dm8KRlPICt0X9OHdEg3g3T78fulu X-Received: by 2002:a17:907:3f82:b0:97a:e496:c121 with SMTP id hr2-20020a1709073f8200b0097ae496c121mr16175477ejc.69.1686754179906; Wed, 14 Jun 2023 07:49:39 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1686754179; cv=none; d=google.com; s=arc-20160816; b=kcvr5PbYzPbM5IKA0qZywMNWgCSZGUqCoblK4hdVw+tAO0yUet0O3YMjfQCpQuq4ar q4YF0Kfcv3h5At4OwhZfnccfq206RsNjfOjYKW+E7yfrZr7JQtvHn57pT5aG4n+OAlxq VWQEgDwDxrJZbaHThuhUQ+hZ4KKlRBys7CNDnHc5coENl5OOv60WwqL5z1D97uSrMVnX Oi27Gl4Epn2uMbAHZJPA1DME/toIQoAPUewdNIq6mnz2PUyaW5k76NzHHgbtvTL6LXoM 7kJc+26BSzOiBjkeuqIQ5TcY7rWl8KzYP9zdHilFlwSb4WaBfekPS2RWSVGwLXLtjzFF YDww== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=RItX9jbfeXEodO4/EXY2nGdLddbQVMaHdAExv3SXWco=; b=gEzQCvPCLO6jYwkqDn0hqZf0lB5jTbmHjr3BHEzQop0KXn5NLw/+t8/eOJXfIhurRK Ygava2REM+RavgikLTNrK2LaptyOnEzBnwVh6SFicgQG+qKqgkQR12y1vgljrljzvGQv AGpbPESL2uiUi9gl6R6JaoLrim5LudVdFQMyiT8dMUdWDEmgWWvcZ54Bpl2/QDOFADpg IOFPGQ0hKIf9lq1zW1lTO+EA6SF+jkpK6L3H81x+eDfERn8FDqXGmRsTN0zombw5UZ6u Pv83ZYsLsIguOG+jzeyZ28ui4+loIUJQakp6LJj0jGKgkUS2L1K8qy8MctVA/T7iQTXg rDQQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@quicinc.com header.s=qcppdkim1 header.b=O5X+PqVg; 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=quicinc.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id g14-20020a1709061e0e00b009781805f34fsi8260504ejj.732.2023.06.14.07.48.52; Wed, 14 Jun 2023 07:49:39 -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=@quicinc.com header.s=qcppdkim1 header.b=O5X+PqVg; 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=quicinc.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S245563AbjFNOWb (ORCPT + 99 others); Wed, 14 Jun 2023 10:22:31 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48164 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S245541AbjFNOW3 (ORCPT ); Wed, 14 Jun 2023 10:22:29 -0400 Received: from mx0b-0031df01.pphosted.com (mx0b-0031df01.pphosted.com [205.220.180.131]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6B8EE10F6; Wed, 14 Jun 2023 07:22:28 -0700 (PDT) Received: from pps.filterd (m0279870.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 35EDOA11027717; Wed, 14 Jun 2023 14:22:12 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=quicinc.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : mime-version : content-transfer-encoding : content-type; s=qcppdkim1; bh=RItX9jbfeXEodO4/EXY2nGdLddbQVMaHdAExv3SXWco=; b=O5X+PqVgdFpODgGidEDfv4nLc1GiYEWDSz6tzlpn3U5ZQEm6xXS5nBWceI8qx4NgUm90 wKrvx60Os69LUva5Py3MTA7L/hh2nBfxYaAOiqKZfhBfNh1XBbsBDCjhQzpZfF8viRmx 07xi4SO3658l4lC2l0KEmKNGpKllBqzRMiCz7FJkW+3JtDQyYmKGQVkP6ckf4VPsHbP0 BX0Qof+2hYTdjVUZK3hbWyZl2zVniR1kaNMam1XDQIHLxVYc8SOp/wDvJ6s4Bz8fIHJx 1KTCAJSwRWr5788KpVPkwnEdmbUn3fFxrCcwaveyvYNhe9C3w4HIAFcwlbAk04yFFMZO 8Q== Received: from nalasppmta01.qualcomm.com (Global_NAT1.qualcomm.com [129.46.96.20]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 3r7ebt84ac-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 14 Jun 2023 14:22:11 +0000 Received: from nalasex01c.na.qualcomm.com (nalasex01c.na.qualcomm.com [10.47.97.35]) by NALASPPMTA01.qualcomm.com (8.17.1.5/8.17.1.5) with ESMTPS id 35EEMAQh008624 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 14 Jun 2023 14:22:10 GMT Received: from hu-bjorande-lv.qualcomm.com (10.49.16.6) by nalasex01c.na.qualcomm.com (10.47.97.35) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.42; Wed, 14 Jun 2023 07:22:10 -0700 From: Bjorn Andersson To: Bjorn Andersson , Konrad Dybcio CC: Rob Clark , Dmitry Baryshkov , Akhil P Oommen , , , , , , , Steev Klimaszewski , Johan Hovold Subject: [PATCH v4 2/2] arm64: dts: qcom: sc8280xp: Enable GPU related nodes Date: Wed, 14 Jun 2023 07:22:04 -0700 Message-ID: <20230614142204.2675653-3-quic_bjorande@quicinc.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230614142204.2675653-1-quic_bjorande@quicinc.com> References: <20230614142204.2675653-1-quic_bjorande@quicinc.com> MIME-Version: 1.0 X-Originating-IP: [10.49.16.6] X-ClientProxiedBy: nalasex01c.na.qualcomm.com (10.47.97.35) To nalasex01c.na.qualcomm.com (10.47.97.35) X-QCInternal: smtphost X-Proofpoint-Virus-Version: vendor=nai engine=6200 definitions=5800 signatures=585085 X-Proofpoint-GUID: SHl4N8nS31imK2LITXrGIWFS6vdrmBvq X-Proofpoint-ORIG-GUID: SHl4N8nS31imK2LITXrGIWFS6vdrmBvq X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.254,Aquarius:18.0.957,Hydra:6.0.573,FMLib:17.11.176.26 definitions=2023-06-14_10,2023-06-14_01,2023-05-22_02 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 clxscore=1011 spamscore=0 mlxscore=0 suspectscore=0 lowpriorityscore=0 adultscore=0 priorityscore=1501 bulkscore=0 mlxlogscore=989 impostorscore=0 phishscore=0 malwarescore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2305260000 definitions=main-2306140124 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_MSPIKE_H2,SPF_HELO_NONE, SPF_PASS,T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED autolearn=ham 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?1768689950777295986?= X-GMAIL-MSGID: =?utf-8?q?1768689950777295986?= From: Bjorn Andersson Add memory reservation for the zap-shader and enable the Adreno SMMU, GPU clock controller, GMU and the GPU nodes for the SC8280XP CRD and the Lenovo ThinkPad X13s. Tested-by: Steev Klimaszewski Signed-off-by: Bjorn Andersson Tested-by: Johan Hovold Signed-off-by: Bjorn Andersson Reviewed-by: Konrad Dybcio --- arch/arm64/boot/dts/qcom/sc8280xp-crd.dts | 14 ++++++++++++++ .../dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dts | 14 ++++++++++++++ 2 files changed, 28 insertions(+) diff --git a/arch/arm64/boot/dts/qcom/sc8280xp-crd.dts b/arch/arm64/boot/dts/qcom/sc8280xp-crd.dts index cd7e0097d8bc..b566e403d1db 100644 --- a/arch/arm64/boot/dts/qcom/sc8280xp-crd.dts +++ b/arch/arm64/boot/dts/qcom/sc8280xp-crd.dts @@ -210,6 +210,11 @@ vreg_wwan: regulator-wwan { }; reserved-memory { + gpu_mem: gpu-mem@8bf00000 { + reg = <0 0x8bf00000 0 0x2000>; + no-map; + }; + linux,cma { compatible = "shared-dma-pool"; size = <0x0 0x8000000>; @@ -390,6 +395,15 @@ &dispcc0 { status = "okay"; }; +&gpu { + status = "okay"; + + zap-shader { + memory-region = <&gpu_mem>; + firmware-name = "qcom/sc8280xp/qcdxkmsuc8280.mbn"; + }; +}; + &mdss0 { status = "okay"; }; diff --git a/arch/arm64/boot/dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dts b/arch/arm64/boot/dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dts index 5ae057ad6438..7cc3028440b6 100644 --- a/arch/arm64/boot/dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dts +++ b/arch/arm64/boot/dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dts @@ -264,6 +264,11 @@ vreg_wwan: regulator-wwan { }; reserved-memory { + gpu_mem: gpu-mem@8bf00000 { + reg = <0 0x8bf00000 0 0x2000>; + no-map; + }; + linux,cma { compatible = "shared-dma-pool"; size = <0x0 0x8000000>; @@ -518,6 +523,15 @@ &dispcc0 { status = "okay"; }; +&gpu { + status = "okay"; + + zap-shader { + memory-region = <&gpu_mem>; + firmware-name = "qcom/sc8280xp/LENOVO/21BX/qcdxkmsuc8280.mbn"; + }; +}; + &mdss0 { status = "okay"; };