From patchwork Wed Feb 8 03:40:52 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bjorn Andersson X-Patchwork-Id: 54165 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp3232279wrn; Tue, 7 Feb 2023 19:44:25 -0800 (PST) X-Google-Smtp-Source: AK7set8zDng4iL67keWvCW4M4UB04eh/joFMPdjdQIyyUbhSjMauARuo55xcP3YqgiM80aB4rl+2 X-Received: by 2002:a17:902:c20d:b0:199:3fcd:1755 with SMTP id 13-20020a170902c20d00b001993fcd1755mr1430512pll.46.1675827865006; Tue, 07 Feb 2023 19:44:25 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1675827864; cv=none; d=google.com; s=arc-20160816; b=i7GM36aQcgeG9zhxuG+ZgSxnwdRMxahVHA7K15rWU6eHQa1/duWZRWH1pxuTCC9FPF SqcRwQ3CGKkKK+7FUV9L3LDnBTVZK8MHrco5WfqiCh0ZDA62YInS+AXGQihcjo2hf61e LgJs4/A4T2ModzHn9+zuG/kFKRNDzHYWqDmoS94e4m+MNppcYEj/y3MbriZ9uqBif1CT fbyBmYy3hX02U9H6wPBiGPgZ4Qn2zFbKYOlh6agI8v5krwrpB9yDQ1wrF55hS3GHAHKV O2cDPtEmisVSNxEExmgHiD9e+FJhr/0DkqiBBa6TDRzuxKeux4zk8CDtVNGVOwdM2/tt 9ZXw== 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=mpyxYB8aw5p7/AWO9C6mI8MLXsrMCsTIU77U25Tqs5M=; b=nEOlJzDu31uRq79CKPke0qqS9vtqYysyZiUmklsFxSLwgwTZHf/7IVnQRTY9X8AV3W Z2SZerooFREbNnYet8xH0TfoaU+1tHJG6JrjD31nFKRZ7/sjgbZN6n6tCrsb8gadVW16 ADnXQjHs1ktJhhflEBoEzZgvTYCUr4kXoFfPILDS67t4Pq9frfWucXDi9NCa2xnXoX3L EBkVYg68WF8hMwnxS9jM3hcIBW8BS/PQPeycCXJvhCTof/ZGy+g8svLEzLkf5xyotYzC c2APkByXgqBJzSg3aWPTQzRXOEnZjP3KM61MS7aez/9qdDqRKM8OwixHGBxfZoGzlzY9 TPqA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@quicinc.com header.s=qcppdkim1 header.b=TnVyYPFP; 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 a14-20020a170902ecce00b00198e1af3198si17648788plh.604.2023.02.07.19.44.11; Tue, 07 Feb 2023 19:44:24 -0800 (PST) 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=TnVyYPFP; 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 S230196AbjBHDl0 (ORCPT + 99 others); Tue, 7 Feb 2023 22:41:26 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47652 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229892AbjBHDlO (ORCPT ); Tue, 7 Feb 2023 22:41:14 -0500 Received: from mx0b-0031df01.pphosted.com (mx0b-0031df01.pphosted.com [205.220.180.131]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 26A3B40BFB; Tue, 7 Feb 2023 19:41:09 -0800 (PST) Received: from pps.filterd (m0279872.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 3183XVuU013410; Wed, 8 Feb 2023 03:41:00 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=mpyxYB8aw5p7/AWO9C6mI8MLXsrMCsTIU77U25Tqs5M=; b=TnVyYPFPWLoEPwvJpFa01KXEFkOoy56972kFrVx4UWfKfWsArJn18S+AcdQI9BSS68bY lEQYl5rVRwc6QAy4vDhe8iAdYKAU4brct1z2KpcVJae4ju3fqsAHxV5jDKWHTLYM7bvo aiEm1JJMyWjjtCKn7jAJoqJbIJFTIQlD1l95fFTyFz2zta5XVzMbnAvaorLovtd2HpJ4 6UQSWj/WDnvFL1q/xzA8wuOn7GjS6WJ4kXdTvwbyRW4GfhMFPSDGzFxc5AekxQ+tkAYE G9UNtswrrhUCQ2rsnt2dzFbt6HGgVVBL2jC/TZWzRvBZ5iHUNgFWNlABrRpoYVKITfFV Qw== Received: from nalasppmta04.qualcomm.com (Global_NAT1.qualcomm.com [129.46.96.20]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 3nm1yf0947-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 08 Feb 2023 03:41:00 +0000 Received: from nalasex01c.na.qualcomm.com (nalasex01c.na.qualcomm.com [10.47.97.35]) by NALASPPMTA04.qualcomm.com (8.17.1.5/8.17.1.5) with ESMTPS id 3183exhX016742 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 8 Feb 2023 03:40:59 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.36; Tue, 7 Feb 2023 19:40:58 -0800 From: Bjorn Andersson To: Bjorn Andersson , Konrad Dybcio CC: Rob Clark , Abhinav Kumar , Dmitry Baryshkov , Sean Paul , Akhil P Oommen , , , , , , , Subject: [PATCH 3/3] arm64: dts: qcom: sc8280xp: Enable GPU related nodes Date: Tue, 7 Feb 2023 19:40:52 -0800 Message-ID: <20230208034052.2047681-4-quic_bjorande@quicinc.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230208034052.2047681-1-quic_bjorande@quicinc.com> References: <20230208034052.2047681-1-quic_bjorande@quicinc.com> MIME-Version: 1.0 X-Originating-IP: [10.49.16.6] X-ClientProxiedBy: nalasex01b.na.qualcomm.com (10.47.209.197) 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-ORIG-GUID: fzNF1rsz-y6EM37YG9BePN4AEj8AXD9x X-Proofpoint-GUID: fzNF1rsz-y6EM37YG9BePN4AEj8AXD9x X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.219,Aquarius:18.0.930,Hydra:6.0.562,FMLib:17.11.122.1 definitions=2023-02-07_15,2023-02-06_03,2022-06-22_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 lowpriorityscore=0 adultscore=0 impostorscore=0 mlxscore=0 phishscore=0 clxscore=1015 mlxlogscore=999 suspectscore=0 malwarescore=0 bulkscore=0 priorityscore=1501 spamscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2212070000 definitions=main-2302080031 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_PASS 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?1757232879275440746?= X-GMAIL-MSGID: =?utf-8?q?1757232879275440746?= 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. Signed-off-by: Bjorn Andersson Signed-off-by: Bjorn Andersson --- arch/arm64/boot/dts/qcom/sc8280xp-crd.dts | 26 +++++++++++++++++++ .../qcom/sc8280xp-lenovo-thinkpad-x13s.dts | 26 +++++++++++++++++++ 2 files changed, 52 insertions(+) diff --git a/arch/arm64/boot/dts/qcom/sc8280xp-crd.dts b/arch/arm64/boot/dts/qcom/sc8280xp-crd.dts index 35b63c3962f0..1d1ad43040ac 100644 --- a/arch/arm64/boot/dts/qcom/sc8280xp-crd.dts +++ b/arch/arm64/boot/dts/qcom/sc8280xp-crd.dts @@ -203,6 +203,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>; @@ -252,6 +257,10 @@ usb1_sbu_mux: endpoint { }; }; +&adreno_smmu { + status = "okay"; +}; + &apps_rsc { pmc8280-1-rpmh-regulators { compatible = "qcom,pm8350-rpmh-regulators"; @@ -369,6 +378,23 @@ &dispcc0 { status = "okay"; }; +&gmu { + status = "okay"; +}; + +&gpu { + status = "okay"; + + zap-shader { + memory-region = <&gpu_mem>; + firmware-name = "qcom/sc8280xp/qcdxkmsuc8280.mbn"; + }; +}; + +&gpucc { + status = "okay"; +}; + &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 4ef15edd6c0f..7967e951a8ee 100644 --- a/arch/arm64/boot/dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dts +++ b/arch/arm64/boot/dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dts @@ -256,6 +256,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>; @@ -351,6 +356,10 @@ usb1_sbu_mux: endpoint { }; }; +&adreno_smmu { + status = "okay"; +}; + &apps_rsc { pmc8280-1-rpmh-regulators { compatible = "qcom,pm8350-rpmh-regulators"; @@ -484,6 +493,23 @@ &dispcc0 { status = "okay"; }; +&gmu { + status = "okay"; +}; + +&gpu { + status = "okay"; + + zap-shader { + memory-region = <&gpu_mem>; + firmware-name = "qcom/sc8280xp/LENOVO/21BX/qcdxkmsuc8280.mbn"; + }; +}; + +&gpucc { + status = "okay"; +}; + &mdss0 { status = "okay"; };