From nobody Mon Feb 9 10:51:47 2026 Received: from mx0a-0031df01.pphosted.com (mx0a-0031df01.pphosted.com [205.220.168.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id D6308350A22 for ; Tue, 28 Oct 2025 21:00:09 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=205.220.168.131 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1761685211; cv=none; b=oiNuJDsXmR9/MzZjMbEflebc9iuapadoVXygUt7aK+HZV/U21wwARkJXJvbKSucNrV5bUeeJNlWiSoJYATNcQDEpdkT+kB2O6s1n3SOqaU3GQsEVzDK08i/KBQEf71BzhLqamzvDNmow1npRhC/OYXI3P3irb/W5J7qarCB6GuM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1761685211; c=relaxed/simple; bh=ngFuqL8e6vn7AeTmEciPRYus7VIaj3l4wQX40ezMA04=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=cmkevY2vzTR7h50JdKBjVt3pRxLWozCrJZ6SF+9UD7xwXmRv4hxXs3HJR9IyG8+orxgC8FofTjwgs2Qh7vo9GCdYc5Oa03/XwxWfbVdLgbIoFS/JUdprIvYTOo03si7TiB+2RuQpRWJ+MlMmII9dws9f691WyxdiyYdLVIvaoL4= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oss.qualcomm.com; spf=pass smtp.mailfrom=oss.qualcomm.com; dkim=pass (2048-bit key) header.d=qualcomm.com header.i=@qualcomm.com header.b=bOhALAsD; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b=Z/ZaxSTW; arc=none smtp.client-ip=205.220.168.131 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oss.qualcomm.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=oss.qualcomm.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=qualcomm.com header.i=@qualcomm.com header.b="bOhALAsD"; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="Z/ZaxSTW" Received: from pps.filterd (m0279863.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 59SJllFA2524097 for ; Tue, 28 Oct 2025 21:00:09 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qualcomm.com; h= cc:content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s=qcppdkim1; bh= aOiNxLQmP8RoIKFStjGNuJ1SrPaHoJhdU4dMQ0leeQ8=; b=bOhALAsDQwhakDi9 EZDpAj8U+U8ax2igbc3RGTyoxD4T0c046t0Trq+w/xWHraqQ0i0U9dMoHxLVYBou PSmUMUkjD8B3dY0N7fDQ9w31Bg0lYP2xXt3IIe+jSyew7u2SLAbQ/u6pCDwIHO+g pCgXSbYghX3vLbnBkuwbD0ty7ZJuK54G4e1K0kRJSIzYyY4c2I3xL8wEVS+jhX80 ygSzdZqynnr2Z1g9k6vpPBRFvLiVhbiqfbFpriwDinAw8WvafwN0fp4PUfP0t2/M cWBJteWaBmQ9GfHR8BeVgLkKJnvea4CPFm8fk/rzv91ggEpnDQLtSB8bFBRsglVi DgTDjg== Received: from mail-qt1-f197.google.com (mail-qt1-f197.google.com [209.85.160.197]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4a34a1r5tk-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Tue, 28 Oct 2025 21:00:08 +0000 (GMT) Received: by mail-qt1-f197.google.com with SMTP id d75a77b69052e-4e88ddf3cd0so175293801cf.3 for ; Tue, 28 Oct 2025 14:00:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1761685208; x=1762290008; 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=aOiNxLQmP8RoIKFStjGNuJ1SrPaHoJhdU4dMQ0leeQ8=; b=Z/ZaxSTW2i54IHDl0YN7s9T+B0FoRYX4d71imw3ZzfHXYK/d/pJ/v4vFElXB4lI6UU U7NyRTfT8neUpjCSqWxdF2GySqsIXsJzxOTQ3WFIpUK8X3xcSMQM/eoJWlMn7FIuQpm/ ZFAPH/78Gvxmq6JJKnV3YThwdpWoBR/Qz2BGEj7PGp2EsVTjhEXAIiIK3FKsj2E2j7T1 qWMLaXs+nStxp8qr6eWvSx0IwK4rwSjyJKprbrt6ou0doy3b1KoFkzjnN49n+z6t4YMW Nlbyw//MHHreNZr3ZoGTeQ1mESZ8yghasb0BGRp7GcJgSCEX05OGpFvHhLS7L9xcKl9F xBBA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1761685208; x=1762290008; 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=aOiNxLQmP8RoIKFStjGNuJ1SrPaHoJhdU4dMQ0leeQ8=; b=rlv39EIb4Owf7lo7votxfxpV8sUWV2Uy5GxIL6arSyPfQiO5j5hdIeSaJg7q3Gvxoa qo1lytj2hmf6WHSxw9i579k9ZLMD26rd0YjPnJ6k1VPyNzZDCtVq71kkzIFsBKkuGZ5b koqU1ll3hFJ4giAxsQcs32qupHbZ65f/hspci/bL0Pvek/y4EmQ52iL558cjma9IoaVK Xc7ACbdQ+9NHlc5+pahB9m229QlzZFFeuu2MmnJvBYYpENKRZ+Jyf5SRJjGMiq6r6cRp 9KFoQbU2bjZHSZ3nudh97t4SOmfirV9/K4ywIrvQB/FbDnEj29h+MfMRiBTWIdT7rTWY wthA== X-Forwarded-Encrypted: i=1; AJvYcCXkiTqDeF85PB11NnjvgA2jxwu2DEIzBXs2jPWGoNeTmgodLVVPI6aJimDHFy2Ls5UmwtI/Rmo0i14cCd0=@vger.kernel.org X-Gm-Message-State: AOJu0YzQ5EdDQXEQcp8Zzc8bbz8fLK9QS1nO9EsM1mKCt+eH3L/l9IhN HFlQSgFZVtFg/1nfo7QOzkdBEO3JKy0hb2nXhJ8AwOQ91nMph6smnBBSCU+bAyVMnfTc24k2Ond dvXIrvtcdzRsyP1AlPzwaBayBhE42Ag680SKlOunIjVhJS8MLNn9ewJ5xnibRtpuus4s= X-Gm-Gg: ASbGncs19S7J4563sSzd1o93MMBwVB4XwsJO95gLylr/04jKKjfZEXZbCoY+yIx3HII uCVr+eGsLIdZPHYgknzeR0YGOZXqRHEkddDU2l5C/X0020CDUze/fBm7GGgGP9jpB1MyHRE21u1 qVHIe2IztxOa8B0e/GsupUSVsToxU1evF7au8NAjr0qBhB/FlNMnw5F6DZ/MvhB8WJoRBTQPg76 0Bzps7dE6/4PGIBq8/iYS92+YqUj+J+oepA67ohWzHnNTC+UThZxqH3HfxLf1uEmtmpIA/G9I5D 66TIVuJg65ZpNEjWKHB+7lbtFFMeQN2ierxx58tJqRr/IcJDxs0cibJbSet3gMe11c+s0ZPg7vo nCjdCjV5ZaW2lAvIxEytbDqkYYn2ToozxfEb8MNq0ZG8OImUFKn5v1B4OZxxiEEggFpENYNZxdF 1bOTyU8t7sZfYS X-Received: by 2002:a05:622a:11c8:b0:4e8:9c45:de4b with SMTP id d75a77b69052e-4ed15c88d01mr10638431cf.44.1761685207741; Tue, 28 Oct 2025 14:00:07 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFlnuhRA+a2bwubA2labJ4tMSfpNg2VOPqsfAoc82W5MiPjYfnN4MLZt+qYb2juROwA9rbEFA== X-Received: by 2002:a05:622a:11c8:b0:4e8:9c45:de4b with SMTP id d75a77b69052e-4ed15c88d01mr10637891cf.44.1761685207269; Tue, 28 Oct 2025 14:00:07 -0700 (PDT) Received: from umbar.lan (2001-14ba-a0c3-3a00-264b-feff-fe8b-be8a.rev.dnainternet.fi. [2001:14ba:a0c3:3a00:264b:feff:fe8b:be8a]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-59301f861f5sm3283594e87.107.2025.10.28.14.00.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 28 Oct 2025 14:00:06 -0700 (PDT) From: Dmitry Baryshkov Date: Tue, 28 Oct 2025 23:00:00 +0200 Subject: [PATCH 1/7] arm64: dts: qcom: sdm670: create common zap-shader node Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20251028-dt-zap-shader-v1-1-7eccb823b986@oss.qualcomm.com> References: <20251028-dt-zap-shader-v1-0-7eccb823b986@oss.qualcomm.com> In-Reply-To: <20251028-dt-zap-shader-v1-0-7eccb823b986@oss.qualcomm.com> To: Bjorn Andersson , Konrad Dybcio , Rob Herring , Krzysztof Kozlowski , Conor Dooley , cros-qcom-dts-watchers@chromium.org Cc: linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=1352; i=dmitry.baryshkov@oss.qualcomm.com; h=from:subject:message-id; bh=ngFuqL8e6vn7AeTmEciPRYus7VIaj3l4wQX40ezMA04=; b=owEBbQGS/pANAwAKAYs8ij4CKSjVAcsmYgBpAS7StKy5BloAfwDT3vMyJtx0pNXwptmkf9FT6 ZqABp785xGJATMEAAEKAB0WIQRMcISVXLJjVvC4lX+LPIo+Aiko1QUCaQEu0gAKCRCLPIo+Aiko 1cTfB/9WEbl4yKd7GmpkNHWAo0vRfwuV/5D3e7GAwwsXoYEPJHfBLWWuxcGY+TzG7rB6zhG5pBc 9kuTXLC7AkDG1rAO7vjZzi2jKXEjNa+xphnJB+6OnAzkGAxBFm2IDsLY54TBoA4UfG3J+9RmQEE cMRnT1//qL9+B3HpetBvAUjoqp1e4Mbb7G17vID73K4ibzPt35IxnCvmXRVO9SLtOxMvlLTwzfG 3Aoxoo+sWYVG6vrvwLw2ECeI/yE6/EH+ChFgt8bslDgkqfaGpQ/1SKs/oyix+tGgnB7hz1yTOiD 9DyW0vp2lH5Eyi9YPTCvbBoGxUitSGukfnLhuSkjFMnvkp1P X-Developer-Key: i=dmitry.baryshkov@oss.qualcomm.com; a=openpgp; fpr=8F88381DD5C873E4AE487DA5199BF1243632046A X-Proofpoint-GUID: h_-XLZAIHc9kAt2WVhwyGxjkjWr1fFWn X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUxMDI4MDE3NiBTYWx0ZWRfX8djva4C/WKXr fxTwZuveHKDNEXxat+DVOVHCOg9FEMb3c6HUuU4LGfssvZQg75s3t84GG+XYbb84+A5LwWifU+7 kOeZvJErJLbSLMkSpTq+wNo5wnt/GpeXkLvIu7iGffDNxcjkneYcZZJ0BcHCC6ActaS4TA+pZ+n gptjM0wrPwUbWn7ZtBciTgm4lBD1zRF4cIaDPiGgh0hpR6gLO1QsMIIEBAfBgcQnSeneemxMeSF pNgPW96x3vl3s0Vg2XYz4xOmDQcZUkof7RiPfpQy3PK0D+34gDZeCcPBxDvuI9hI9bbCN5Rg23s N6r1j3uleq1JITe2+HIveD3k0hf4NLDCPI3RnG2hhpnktfAbXTJQr7OrRbWcfX0W74kD1iUrgUb Y0RrAghMjkIm/DfY/sPOOr7OimOwNg== X-Proofpoint-ORIG-GUID: h_-XLZAIHc9kAt2WVhwyGxjkjWr1fFWn X-Authority-Analysis: v=2.4 cv=UObQ3Sfy c=1 sm=1 tr=0 ts=69012ed8 cx=c_pps a=EVbN6Ke/fEF3bsl7X48z0g==:117 a=xqWC_Br6kY4A:10 a=IkcTkHD0fZMA:10 a=x6icFKpwvdMA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=EUspDBNiAAAA:8 a=OJPj2qZnrzgMreAcce0A:9 a=QEXdDO2ut3YA:10 a=a_PwQJl-kcHnX1M80qC6:22 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1121,Hydra:6.1.9,FMLib:17.12.80.40 definitions=2025-10-28_08,2025-10-22_01,2025-03-28_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 clxscore=1015 malwarescore=0 phishscore=0 bulkscore=0 priorityscore=1501 spamscore=0 impostorscore=0 adultscore=0 lowpriorityscore=0 suspectscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2510240001 definitions=main-2510280176 In order to reduce duplication, move common GPU memory configuration from individual board files to sdm670.dtsi. Signed-off-by: Dmitry Baryshkov Reviewed-by: David Heidelberg Reviewed-by: Konrad Dybcio --- arch/arm64/boot/dts/qcom/sdm670-google-sargo.dts | 1 - arch/arm64/boot/dts/qcom/sdm670.dtsi | 4 ++++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/arch/arm64/boot/dts/qcom/sdm670-google-sargo.dts b/arch/arm64/= boot/dts/qcom/sdm670-google-sargo.dts index d01422844fbfdec6b4944378a16d9458a4c00bba..760f21f19ca472d620ab1a0703d= e6e0d69237b55 100644 --- a/arch/arm64/boot/dts/qcom/sdm670-google-sargo.dts +++ b/arch/arm64/boot/dts/qcom/sdm670-google-sargo.dts @@ -406,7 +406,6 @@ &gpu { status =3D "okay"; =20 zap-shader { - memory-region =3D <&gpu_mem>; firmware-name =3D "qcom/sdm670/sargo/a615_zap.mbn"; }; }; diff --git a/arch/arm64/boot/dts/qcom/sdm670.dtsi b/arch/arm64/boot/dts/qco= m/sdm670.dtsi index c3264a31bccf25fca9eae7fa7734ff43c9db410a..57a3ffedc432b08aa7d7918c9bd= 0f9714dbb3951 100644 --- a/arch/arm64/boot/dts/qcom/sdm670.dtsi +++ b/arch/arm64/boot/dts/qcom/sdm670.dtsi @@ -1382,6 +1382,10 @@ gpu: gpu@5000000 { =20 status =3D "disabled"; =20 + zap-shader { + memory-region =3D <&gpu_mem>; + }; + gpu_opp_table: opp-table { compatible =3D "operating-points-v2"; =20 --=20 2.47.3 From nobody Mon Feb 9 10:51:47 2026 Received: from mx0a-0031df01.pphosted.com (mx0a-0031df01.pphosted.com [205.220.168.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id EE2A2350D48 for ; Tue, 28 Oct 2025 21:00:10 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=205.220.168.131 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1761685212; cv=none; b=QDVcnxbNlWeTOVUKIUIchc2osHGBVzLn61qUPTcOfBqZ4/8iuiHqeK5M67cII2GZusW7Nd6XmsuMxWoxhLNZ1t8GLQBEkOv0P2TkSgu4xR1HFVgg7xe0DMUmlxJ5LIZIrAelrR30qnnouH+9ze0OhRo2HdO3fWf0MoaRyDoygOI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1761685212; c=relaxed/simple; bh=3J4fuWFWNFHF+/rRsGFk3aPO2J9M1d/P9hBhGCblRCo=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=NijKgARAlG7fj+qmnKCSzshO/RFZg4KYdKVyTZ5IdXo7XpgFTaYZ0ZkMcYy4HYzD8ImeF2Z8aeCnJHq9RoIjDRlu9dzqTXhivrtq/8sL130sk2xzGHWSU0LIdYwO8gJzpeFcX8KUjfjsvv47151oXN5hjLDNX+vWrdViWapdDIk= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oss.qualcomm.com; spf=pass smtp.mailfrom=oss.qualcomm.com; dkim=pass (2048-bit key) header.d=qualcomm.com header.i=@qualcomm.com header.b=Z2yBx+Q7; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b=GJmqdRHS; arc=none smtp.client-ip=205.220.168.131 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oss.qualcomm.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=oss.qualcomm.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=qualcomm.com header.i=@qualcomm.com header.b="Z2yBx+Q7"; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="GJmqdRHS" Received: from pps.filterd (m0279864.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 59SJloAM2554715 for ; Tue, 28 Oct 2025 21:00:10 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qualcomm.com; h= cc:content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s=qcppdkim1; bh= X/ZmLcOwVTgqaHSdIV+9fQF703khVD2MDhcprQ9yZUE=; b=Z2yBx+Q7wRguamtw tLSEDlVaJ4Nn3RiQa+nu+M9884n9V2y8elw8LvBoDdWMc7rTAs6R5xMxFT44jCJ6 DBScgdSdseea90U1+DgkZnoIC/wXDSQbYLN6bkzSy/CxjD9llhGALK0dTrbIj1dg eAuuT16LY6kKNT5jX5bv5NiV7V4BWrdSzvLS0SALvDHn3PmV/DhS3XWVwra0xh0n YvSx0l8pcmW0UT2o/CIYpB6NEdnGXGS11Ct8CLbjms6Xy0/Zng2Pz5vJwNlM0DY/ jodQGv83YuTIuWIY/kmhnm2sVUUAdtDUFdTbeoSKGvhnNjyoHYBGNaer/sIUunOl fWJZQw== Received: from mail-qt1-f198.google.com (mail-qt1-f198.google.com [209.85.160.198]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4a34a105um-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Tue, 28 Oct 2025 21:00:10 +0000 (GMT) Received: by mail-qt1-f198.google.com with SMTP id d75a77b69052e-4e88947a773so327645411cf.2 for ; Tue, 28 Oct 2025 14:00:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1761685209; x=1762290009; 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=X/ZmLcOwVTgqaHSdIV+9fQF703khVD2MDhcprQ9yZUE=; b=GJmqdRHSL1iGq4MqWyZKgDAOrpQPrUO0utBZ0KVqWyDAeDtFWKMuqvYd4YIcOsEIG5 BGv9S1S3jVEyzcYPF/ckmf2Rs3ggzlSdSBFZwFTcytOdTSrJNrIdLvma6SNV5YOlnm3N QAnJn7Komzti9rfAUwVyyPZPchSUXGdRhgceMs5aJNLk4/fFS/Xsu7qSm7hocYpbi68g 8EuRznnzZ5iu6BXvjAl05f4IrjZ6S5bcZYmkG0UXsKu459o7AYpKAPGZuufe1H7RCpzw r1NbuIwahA6S2unD1oNZHgv7qxshPf7W9GmasdGh2fq0uZS/vN4Z39zFBUNJXDlmXCyL vL8Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1761685209; x=1762290009; 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=X/ZmLcOwVTgqaHSdIV+9fQF703khVD2MDhcprQ9yZUE=; b=S5dYCO/Zhh0q6C0qE9SIc/3imSXUN6JSBjc9lQTHJaQ/iKekRUyDiAo7ZWwPV/04zJ mZeVeBMFz+Wqmrsog4N/eL/ap4KpU1wQn/RtSHXDkrOLyKT2W2ohjaTliU1ekx9KetG0 eH28iWe/F0IxKnPhlxZ82QgCP7ZbjdwChQP6ytt1xzMFQoEqGqLKVvL5PYFhDH9UX6wp Jn5sgJlPuRn8VwM/2WsQ9kp2uD1IimpMpm3tEz0lq4APUAYJfQ/B4UQnFBXcUtgvyG+o 9aw9UW6ZcYdjWBjCswoRqGzacmYO0j1URVSIxm174v12zP8ky/yd6qI9h+ojPLTFhjT0 6ELw== X-Forwarded-Encrypted: i=1; AJvYcCUW4tjJXhm/FdhW7fdpUjLcmy9JqdrjCk1CeoZR+sxPgKZH2bdRvJNrOJBeAtPf9ccG5nUbl6rZvLF6Hls=@vger.kernel.org X-Gm-Message-State: AOJu0Yxm4/ZP4/Rx+l6+FZpjFNYCtS/U6rOZDojJIzFrY+whZCXXXXJz 5G/0CWkvrohmh8f8F5SnXa1rd25sXOyLcxtS4Q34dst8MGVsX2YOzI63Gso4GEc8OmAqeHV5P1c NNAOOsdOQq4ph9zRnfs/3XHYKRoxqmdYUSDoxY53AUMjrFBXENv+KCkb1kxG8zETxX90= X-Gm-Gg: ASbGncukmyLzDUDxqTL+KJS39gkn0LyG+aCDuvW6yUkRh6DWz/ppbtE+ozfZMkVntoD xD3uKIvAPy62hpC3kr5+92fzXiuqEV4VrjhD4dfxOMh9A4eFQ0qhdnJ22fCeUGt8Yn7YSuH4FJ6 udhK2UHTuMVTkHcHA6uiElC0DMZxY/SavU2ON/M/KWPqOUO9f8sxbChAHNUMJK8YcAhD5LBuD6p k7LuAKLpfRtdOpiJqvfLd2zE/ApwrCCTzwhAWYiX7VN2uH1X3zSko4ZMn6txZCnOKLICLfv5VES t5xvYiDnelFlNYz598UPqwkDxFRK0Nft2GZl+Q+h9iveSQtiixj2DD0+Ym2jLLgtbsDNTojAGyB 4FLuiyEaM3C4YWwCuTey4iLzlLNXUnj5SngfwVaCMvF412E4+7CGSq+ZT4ab0IrK9WXsub5eVxi MyP6Zd4+je3spz X-Received: by 2002:ac8:7c4e:0:b0:4ec:f153:3562 with SMTP id d75a77b69052e-4ed15c25099mr8921941cf.59.1761685208849; Tue, 28 Oct 2025 14:00:08 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFMgeUM17c43Y/LSCQhwCKsld4n6+veGLuBUG+V9ycQJnaLhlctI2mmo8Lbs8gVqJ341PGRaw== X-Received: by 2002:ac8:7c4e:0:b0:4ec:f153:3562 with SMTP id d75a77b69052e-4ed15c25099mr8921401cf.59.1761685208279; Tue, 28 Oct 2025 14:00:08 -0700 (PDT) Received: from umbar.lan (2001-14ba-a0c3-3a00-264b-feff-fe8b-be8a.rev.dnainternet.fi. [2001:14ba:a0c3:3a00:264b:feff:fe8b:be8a]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-59301f861f5sm3283594e87.107.2025.10.28.14.00.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 28 Oct 2025 14:00:07 -0700 (PDT) From: Dmitry Baryshkov Date: Tue, 28 Oct 2025 23:00:01 +0200 Subject: [PATCH 2/7] arm64: dts: qcom: sdm845: create common zap-shader node Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20251028-dt-zap-shader-v1-2-7eccb823b986@oss.qualcomm.com> References: <20251028-dt-zap-shader-v1-0-7eccb823b986@oss.qualcomm.com> In-Reply-To: <20251028-dt-zap-shader-v1-0-7eccb823b986@oss.qualcomm.com> To: Bjorn Andersson , Konrad Dybcio , Rob Herring , Krzysztof Kozlowski , Conor Dooley , cros-qcom-dts-watchers@chromium.org Cc: linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=7067; i=dmitry.baryshkov@oss.qualcomm.com; h=from:subject:message-id; bh=3J4fuWFWNFHF+/rRsGFk3aPO2J9M1d/P9hBhGCblRCo=; b=owEBbQGS/pANAwAKAYs8ij4CKSjVAcsmYgBpAS7Tl8ITmL35JNCMCtV6n4AFSMLyfrI2M7nro OHEUVN9sSCJATMEAAEKAB0WIQRMcISVXLJjVvC4lX+LPIo+Aiko1QUCaQEu0wAKCRCLPIo+Aiko 1a0SB/40PMJmUG68LWQzfUD/Vz0jZg50JoQE5QYYEidxNPNiVxwjfQ+7GAjOdu5qj6FduR1L4i7 +LKxsBCJ00JTTPM+s2ZPAZBtSq93yTSmkGinT24m+vySDSMnOOtT8nWvHILDH7ShMR/K54ZJmeg mlzfuBjmCeh70372FcgmEYZdShCDGdvXMrhwe6y2XffHOdr52GMMCYM8kkQTFzTziazNtJDpaE7 5xNzR5d05sPK77r54JJLLuVfZmRNx1fn1VGKP6+nd6v9ZgHe+YyZk5TtSA8HmOptzhIRRcQnZAA z52k31JYI1PYjB8oY/ugO7f9Q0ZIbo7/JTUgKzyKECw4KAQ9 X-Developer-Key: i=dmitry.baryshkov@oss.qualcomm.com; a=openpgp; fpr=8F88381DD5C873E4AE487DA5199BF1243632046A X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUxMDI4MDE3NiBTYWx0ZWRfXw7NYJCaQQhpk 7wCuYnnLL5bvj5dw7labZQdAW/W9fVT72dGBnG5huC3s4QL3MWcFUDIQ0MomNmklkra34n0ZiG9 QQwSd2CQUuXz1Pu1RnjvABzujL1//H0sHkTXmlah/GZKEzLuEqDXvnMfEchwCZcfKi1qZVOnhac C9xRMN4SDg/qGZ7H918yJ2NQxN4fjYsTCXqDdxip/bv+gerbCrK6nZwPf/P+Dx2Mhbk8j/Sq3FW CogISWfjZ+pDHnrYiij8VH7OwvzQV1qlQM4Sg0/+A0mR/G8qviEUxxQrYGvXHetrY/zL2b0jFBa 1s8Es7Krj88o6Gj8wcWc/Kt6j4016InHCK44eMAkj7pAl7Ly6Ze8Xys7q7fU64c0F412C53BXcD izWyzTMnjMWuka1gRKOvd2NoTJfjew== X-Proofpoint-ORIG-GUID: xIB4Dp7HjzwP3_LhIFWAXxT8lPM4NfBj X-Authority-Analysis: v=2.4 cv=EKULElZC c=1 sm=1 tr=0 ts=69012eda cx=c_pps a=mPf7EqFMSY9/WdsSgAYMbA==:117 a=xqWC_Br6kY4A:10 a=IkcTkHD0fZMA:10 a=x6icFKpwvdMA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=EUspDBNiAAAA:8 a=YgUc9-wyc0V7V68UJQQA:9 a=QEXdDO2ut3YA:10 a=dawVfQjAaf238kedN5IG:22 X-Proofpoint-GUID: xIB4Dp7HjzwP3_LhIFWAXxT8lPM4NfBj X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1121,Hydra:6.1.9,FMLib:17.12.80.40 definitions=2025-10-28_08,2025-10-22_01,2025-03-28_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 malwarescore=0 priorityscore=1501 impostorscore=0 lowpriorityscore=0 phishscore=0 clxscore=1015 suspectscore=0 adultscore=0 bulkscore=0 spamscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2510240001 definitions=main-2510280176 In order to reduce duplication, move common GPU memory configuration from individual board files to sdm845.dtsi. Signed-off-by: Dmitry Baryshkov Reviewed-by: David Heidelberg Reviewed-by: Konrad Dybcio --- arch/arm64/boot/dts/qcom/sdm845-db845c.dts | 1 - arch/arm64/boot/dts/qcom/sdm845-lg-common.dtsi | 4 ---- arch/arm64/boot/dts/qcom/sdm845-mtp.dts | 1 - arch/arm64/boot/dts/qcom/sdm845-oneplus-common.dtsi | 1 - arch/arm64/boot/dts/qcom/sdm845-samsung-starqltechn.dts | 1 - arch/arm64/boot/dts/qcom/sdm845-shift-axolotl.dts | 1 - arch/arm64/boot/dts/qcom/sdm845-sony-xperia-tama.dtsi | 1 - arch/arm64/boot/dts/qcom/sdm845-xiaomi-beryllium-common.dtsi | 1 - arch/arm64/boot/dts/qcom/sdm845-xiaomi-polaris.dts | 1 - arch/arm64/boot/dts/qcom/sdm845.dtsi | 4 ++++ arch/arm64/boot/dts/qcom/sdm850-huawei-matebook-e-2019.dts | 1 - arch/arm64/boot/dts/qcom/sdm850-lenovo-yoga-c630.dts | 1 - 12 files changed, 4 insertions(+), 14 deletions(-) diff --git a/arch/arm64/boot/dts/qcom/sdm845-db845c.dts b/arch/arm64/boot/d= ts/qcom/sdm845-db845c.dts index 8abf3e909502f3c3b82c0ca3d7509fdaf23d882c..662722adf20b7d1b6a44a28ba3b= bf6b3e373cd0d 100644 --- a/arch/arm64/boot/dts/qcom/sdm845-db845c.dts +++ b/arch/arm64/boot/dts/qcom/sdm845-db845c.dts @@ -456,7 +456,6 @@ &gpi_dma1 { &gpu { status =3D "okay"; zap-shader { - memory-region =3D <&gpu_mem>; firmware-name =3D "qcom/sdm845/a630_zap.mbn"; }; }; diff --git a/arch/arm64/boot/dts/qcom/sdm845-lg-common.dtsi b/arch/arm64/bo= ot/dts/qcom/sdm845-lg-common.dtsi index 83b98bad19dd2824650378da7ad02e6f41a68d9f..0ee2f4b99fbdb6bd8019187dbfa= b5f9977c8973f 100644 --- a/arch/arm64/boot/dts/qcom/sdm845-lg-common.dtsi +++ b/arch/arm64/boot/dts/qcom/sdm845-lg-common.dtsi @@ -456,10 +456,6 @@ &gcc { =20 &gpu { status =3D "okay"; - - zap-shader { - memory-region =3D <&gpu_mem>; - }; }; =20 &ipa { diff --git a/arch/arm64/boot/dts/qcom/sdm845-mtp.dts b/arch/arm64/boot/dts/= qcom/sdm845-mtp.dts index 63d2993536ade229a84da16e811e8bc83c46bd15..971bdb9c3693bfafab820a5242a= 82874340b6c4f 100644 --- a/arch/arm64/boot/dts/qcom/sdm845-mtp.dts +++ b/arch/arm64/boot/dts/qcom/sdm845-mtp.dts @@ -418,7 +418,6 @@ &gpu { status =3D "okay"; =20 zap-shader { - memory-region =3D <&gpu_mem>; firmware-name =3D "qcom/sdm845/a630_zap.mbn"; }; }; diff --git a/arch/arm64/boot/dts/qcom/sdm845-oneplus-common.dtsi b/arch/arm= 64/boot/dts/qcom/sdm845-oneplus-common.dtsi index eb708ebdb0202c7e453bd01124166dd050de8d28..3fe71adf1dbb0f05fc4aa0d0bf4= d0c6bf14af6e4 100644 --- a/arch/arm64/boot/dts/qcom/sdm845-oneplus-common.dtsi +++ b/arch/arm64/boot/dts/qcom/sdm845-oneplus-common.dtsi @@ -341,7 +341,6 @@ &gpu { status =3D "okay"; =20 zap-shader { - memory-region =3D <&gpu_mem>; firmware-name =3D "qcom/sdm845/oneplus6/a630_zap.mbn"; }; }; diff --git a/arch/arm64/boot/dts/qcom/sdm845-samsung-starqltechn.dts b/arch= /arm64/boot/dts/qcom/sdm845-samsung-starqltechn.dts index 493c69e9917461600b2400b6dde78443342139c8..45e9dda007cec2500bf5b6990e7= d8b1ba56a67c6 100644 --- a/arch/arm64/boot/dts/qcom/sdm845-samsung-starqltechn.dts +++ b/arch/arm64/boot/dts/qcom/sdm845-samsung-starqltechn.dts @@ -253,7 +253,6 @@ &gpu { status =3D "okay"; =20 zap-shader { - memory-region =3D <&gpu_mem>; firmware-name =3D "qcom/sdm845/starqltechn/a630_zap.mbn"; }; }; diff --git a/arch/arm64/boot/dts/qcom/sdm845-shift-axolotl.dts b/arch/arm64= /boot/dts/qcom/sdm845-shift-axolotl.dts index f0ae0159f32a05edc376007d1d792e70a51a0db5..238471267e1feace68487aa25f9= 7748704ebb18c 100644 --- a/arch/arm64/boot/dts/qcom/sdm845-shift-axolotl.dts +++ b/arch/arm64/boot/dts/qcom/sdm845-shift-axolotl.dts @@ -425,7 +425,6 @@ &gpu { status =3D "okay"; =20 zap-shader { - memory-region =3D <&gpu_mem>; firmware-name =3D "qcom/sdm845/axolotl/a630_zap.mbn"; }; }; diff --git a/arch/arm64/boot/dts/qcom/sdm845-sony-xperia-tama.dtsi b/arch/a= rm64/boot/dts/qcom/sdm845-sony-xperia-tama.dtsi index f3f4c0900572a85ec173539f09074ae9c1025591..f3ff0b3352bcf7c3eccf7ebe615= cd2e40cee7847 100644 --- a/arch/arm64/boot/dts/qcom/sdm845-sony-xperia-tama.dtsi +++ b/arch/arm64/boot/dts/qcom/sdm845-sony-xperia-tama.dtsi @@ -428,7 +428,6 @@ &gpu { status =3D "okay"; =20 zap-shader { - memory-region =3D <&gpu_mem>; firmware-name =3D "qcom/sdm845/Sony/tama/a630_zap.mbn"; }; }; diff --git a/arch/arm64/boot/dts/qcom/sdm845-xiaomi-beryllium-common.dtsi b= /arch/arm64/boot/dts/qcom/sdm845-xiaomi-beryllium-common.dtsi index 7480c8d7ac5b7f84a742dc6c77943c547c49fafb..5b30ace99579d014d762865377d= 5e9fdd5bab371 100644 --- a/arch/arm64/boot/dts/qcom/sdm845-xiaomi-beryllium-common.dtsi +++ b/arch/arm64/boot/dts/qcom/sdm845-xiaomi-beryllium-common.dtsi @@ -248,7 +248,6 @@ &gpu { status =3D "okay"; =20 zap-shader { - memory-region =3D <&gpu_mem>; firmware-name =3D "qcom/sdm845/beryllium/a630_zap.mbn"; }; }; diff --git a/arch/arm64/boot/dts/qcom/sdm845-xiaomi-polaris.dts b/arch/arm6= 4/boot/dts/qcom/sdm845-xiaomi-polaris.dts index 1c50a0563bc4728e67fa2dca76bdb6a503ebf102..26f0900513169368ecfb65b01ee= dcaf1050e3f53 100644 --- a/arch/arm64/boot/dts/qcom/sdm845-xiaomi-polaris.dts +++ b/arch/arm64/boot/dts/qcom/sdm845-xiaomi-polaris.dts @@ -394,7 +394,6 @@ &gpu { status =3D "okay"; =20 zap-shader { - memory-region =3D <&gpu_mem>; firmware-name =3D "qcom/sdm845/polaris/a630_zap.mbn"; }; }; diff --git a/arch/arm64/boot/dts/qcom/sdm845.dtsi b/arch/arm64/boot/dts/qco= m/sdm845.dtsi index 1c3a7371a2d371f78e13a5b0bc400f79c62d210b..8c90f652afff25a0860ae993e71= 3f94dc9b39f00 100644 --- a/arch/arm64/boot/dts/qcom/sdm845.dtsi +++ b/arch/arm64/boot/dts/qcom/sdm845.dtsi @@ -4902,6 +4902,10 @@ gpu: gpu@5000000 { =20 status =3D "disabled"; =20 + zap-shader { + memory-region =3D <&gpu_mem>; + }; + gpu_opp_table: opp-table { compatible =3D "operating-points-v2"; =20 diff --git a/arch/arm64/boot/dts/qcom/sdm850-huawei-matebook-e-2019.dts b/a= rch/arm64/boot/dts/qcom/sdm850-huawei-matebook-e-2019.dts index 117cc0133363bfb6ab1118312ab6be7f797a203b..57afb35770058b84c592db9f20e= 82ebb7c4f8374 100644 --- a/arch/arm64/boot/dts/qcom/sdm850-huawei-matebook-e-2019.dts +++ b/arch/arm64/boot/dts/qcom/sdm850-huawei-matebook-e-2019.dts @@ -490,7 +490,6 @@ &gpu { status =3D "okay"; =20 zap-shader { - memory-region =3D <&gpu_mem>; firmware-name =3D "qcom/sdm850/HUAWEI/AL09/qcdxkmsuc850.mbn"; }; }; diff --git a/arch/arm64/boot/dts/qcom/sdm850-lenovo-yoga-c630.dts b/arch/ar= m64/boot/dts/qcom/sdm850-lenovo-yoga-c630.dts index 90efbb7e3799b9aa75ac4df84fe0006d470ae131..35121cbcd37b08029d3e1a12b99= fca44f3e4846d 100644 --- a/arch/arm64/boot/dts/qcom/sdm850-lenovo-yoga-c630.dts +++ b/arch/arm64/boot/dts/qcom/sdm850-lenovo-yoga-c630.dts @@ -358,7 +358,6 @@ &gcc { &gpu { status =3D "okay"; zap-shader { - memory-region =3D <&gpu_mem>; firmware-name =3D "qcom/sdm850/LENOVO/81JL/qcdxkmsuc850.mbn"; }; }; --=20 2.47.3 From nobody Mon Feb 9 10:51:47 2026 Received: from mx0b-0031df01.pphosted.com (mx0b-0031df01.pphosted.com [205.220.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 3DE46350A0D for ; Tue, 28 Oct 2025 21:00:11 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=205.220.180.131 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1761685214; cv=none; b=XjbccaJGlLR37IcdPmSXXuZNYrF/iiKLZvhvR/U4O+xZDME5/Tq/SRi39nkeVfdWmpXK/4uYsYp+9WzpPyLDTVjq03ZWLPGAerSl8wuAbI1p/kIi5IBjKr6e0pAcyay7Fbd6ho1sCzIh7JP0jxvbBl55aYcbtNGwas23FsAnWBw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1761685214; c=relaxed/simple; bh=CwYtSL3ydaPjZtAAIaViNMdmrzUpICYZyoSsjpUWKZk=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=hSDQPjjT6i+fUxLAHvZqUNq0Nz2g7YLo7k8Hf5gnhXf3s7LqiHJ0qlhK0+bS3ssXOmnLk94trz6ss1ApLH7AEqo0aHjw5SLne9eFWOb0sYWz9/fa8vDYBP1nS7pR3m+KnuOUnqmo0MXyy3XA64W+e8P/r/Wgv2m2M09TPtsemUU= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oss.qualcomm.com; spf=pass smtp.mailfrom=oss.qualcomm.com; dkim=pass (2048-bit key) header.d=qualcomm.com header.i=@qualcomm.com header.b=jFAnUJSh; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b=Ox6MNUtg; arc=none smtp.client-ip=205.220.180.131 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oss.qualcomm.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=oss.qualcomm.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=qualcomm.com header.i=@qualcomm.com header.b="jFAnUJSh"; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="Ox6MNUtg" Received: from pps.filterd (m0279873.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 59SJlH0H2615908 for ; Tue, 28 Oct 2025 21:00:11 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qualcomm.com; h= cc:content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s=qcppdkim1; bh= FKJZs4WeO9wG/g/LdylOAbfrDrIQHhIXPp1U//b927M=; b=jFAnUJShYJnGsEEa ZpgdiUuqUuGqIMOhyp6BgGWMzuh8CqG4qPdTE8qgSD9/2AzFtQfrJHcgp5TsjLFJ TwZ0BYLHnmZSqRhAXIdIFH1ua1uK/pUg44kSAtDMfPjiygGL8YhjpKCUzjv9kdJ5 bRoihPK8MGvewxN4HAdJXMXbUaHv06zHEjdQGmIbJuLqtEscEVIwA/0YKXWovvBN wnMy9sfaPAuiWF5UUM5p4cnAgszwm/kJxGauuqodMaSCBNiewgIMjKJOjjA1eXCy FB0uCIEN1UMxdUurVme8DWDPbI17+QyAIIOi8PyU24HYB8QekPqTprnkxBF8OTx0 1iTxHw== Received: from mail-qt1-f197.google.com (mail-qt1-f197.google.com [209.85.160.197]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4a34a0g58u-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Tue, 28 Oct 2025 21:00:10 +0000 (GMT) Received: by mail-qt1-f197.google.com with SMTP id d75a77b69052e-4ecf2adbd3bso23070301cf.2 for ; Tue, 28 Oct 2025 14:00:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1761685210; x=1762290010; 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=FKJZs4WeO9wG/g/LdylOAbfrDrIQHhIXPp1U//b927M=; b=Ox6MNUtgrAnIvKLoBZey+24otVKem66hyuLLj+NHTaEjPnSok81SnlCvHfQpSIoDMP Chw019kXP8+U5vcpSYfVB8cEEtCw/5e1LtfitY8Ce520EDnqoiTtYd8WlYVCNv6ZuXC/ 5Kt9A/q/BXJnpGDhQMi4zhk/hG74F6xKMfqmM7NuYloFhomGC3zlG6zKEeQD9OHyw8tN g2KNp6aex20WGRXbGqxALen//lw28269WIl5Kl8EYGPNIzUgWRhiQ3TBLMPvFx9eeDoE LUr7S4a1ney5TfkDA8vkkS4AEuJ6N6UxRPpK7Dn2xKr2Bpe2OUfK7ghoaCsLtkHsNoZT OlpA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1761685210; x=1762290010; 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=FKJZs4WeO9wG/g/LdylOAbfrDrIQHhIXPp1U//b927M=; b=UjQacu88Sk4xs4PzgVnglEZzc0Aj1Xn7NtiFL1rZtMdNHoWNl4pKqoLgO8kHPvihzd cVh81vIMErlqUwjMJmGtb0XQQAascfHZijInuLQZ7RXeXm1JVL5BjXqUncEsrYX8b8IY HBj9R/i9WzRKN8EjuG326fCGldx6goL34S+pjqmFX4eTuYl0Q4ckXcsQBSYBXsoQJuM8 Gk6VrF6YUEhcGtPn8O61FIrUd89z6zTWg24flw9Y4cKPE5VkRmN4URxR0kaQLE+uXdKC N5ydtdg5lb4eCeCJPbqR4Ntwgz+DKmGVomuSf3Ghvv9/Ks0thOzDrx0tmdrU5nmsZzjt cbxg== X-Forwarded-Encrypted: i=1; AJvYcCWAELYOZ5kCiYIYd4ZI1NTSqKqYV/+WZJ4Ihx4cEs+48wabkCETX1ypQKmamTfnqTVtA2gDFMNj5C3Zc0E=@vger.kernel.org X-Gm-Message-State: AOJu0Yw3LdLhzciZkKQGOU0JaigotJR5/vD6H6QudsvhN1D+V5PQ9V0l PnPuciYewlNRo2WdhRyf7dUt5PPVK68lEWtbp4aRohdjsR6HWoXYCw368nIwFZSQqyowY2ZUAij JWyKuotOCegWNg5PBrfA95T2qTEOR5VWTWUDvGJLqrvmuSnUJ8s8Za4bazrHqD4MpR+o= X-Gm-Gg: ASbGnctvnjRii52aO9gG02yLVhLy+EYj+96N4/08FoLDwz452XMGq5xWxpNExn8UZEY OoHUOnNw24A+ptjKnCAY54XBEdlADNxid2f/xvzLc9NtisF4TtU5m+K+QrFYuzNwQlk2PNYg769 OSimq0EleqKrzK4p7BsVteekw7YZVMO1v2Lg2KYuVo4MqjxzRSXBPhwe6c0nLcNmSuhVPBQuvgY ToryDwMhiapKvsl53J7mZzx8QQKMBSsuEwrCXe0nTlgBqo5FuvaIS85z7IQz9H2RIPUslIgQvIR ZMH2WmlF9xMywvHqFBYC0n05zzHi1ByW+oA7tjwsiuJmIFTvkqUZIaHQSeSBdK5qkp9S5I7ve12 eBcf36HCOuL9ieltnQOJdW7ohskkMdpPe0Duum0aOrCKU5398FuSdnWBzh0nl7SRMwi+PvrZImD xeBVGldkgdWoqI X-Received: by 2002:ac8:570b:0:b0:4e8:9920:be58 with SMTP id d75a77b69052e-4ed15a3c027mr8115981cf.0.1761685209860; Tue, 28 Oct 2025 14:00:09 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGYsTaZ2jdJMiMfGuRq3YefyAWHJmT6QsE8Ud6CA7utk+BwEHqJQK55j+Vy7cSqUKHznLRDeg== X-Received: by 2002:ac8:570b:0:b0:4e8:9920:be58 with SMTP id d75a77b69052e-4ed15a3c027mr8115591cf.0.1761685209384; Tue, 28 Oct 2025 14:00:09 -0700 (PDT) Received: from umbar.lan (2001-14ba-a0c3-3a00-264b-feff-fe8b-be8a.rev.dnainternet.fi. [2001:14ba:a0c3:3a00:264b:feff:fe8b:be8a]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-59301f861f5sm3283594e87.107.2025.10.28.14.00.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 28 Oct 2025 14:00:08 -0700 (PDT) From: Dmitry Baryshkov Date: Tue, 28 Oct 2025 23:00:02 +0200 Subject: [PATCH 3/7] arm64: dts: qcom: sc8180x: create common zap-shader node Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20251028-dt-zap-shader-v1-3-7eccb823b986@oss.qualcomm.com> References: <20251028-dt-zap-shader-v1-0-7eccb823b986@oss.qualcomm.com> In-Reply-To: <20251028-dt-zap-shader-v1-0-7eccb823b986@oss.qualcomm.com> To: Bjorn Andersson , Konrad Dybcio , Rob Herring , Krzysztof Kozlowski , Conor Dooley , cros-qcom-dts-watchers@chromium.org Cc: linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=2644; i=dmitry.baryshkov@oss.qualcomm.com; h=from:subject:message-id; bh=CwYtSL3ydaPjZtAAIaViNMdmrzUpICYZyoSsjpUWKZk=; b=owEBbQGS/pANAwAKAYs8ij4CKSjVAcsmYgBpAS7T12d55mqeVo5ywuIYzsFgdFy3gAjM9XMyp yF8OjughTOJATMEAAEKAB0WIQRMcISVXLJjVvC4lX+LPIo+Aiko1QUCaQEu0wAKCRCLPIo+Aiko 1eyKB/oDtn9PWtRtn06HR3BUcJVXCT7j1t/JPU0CXkfcW1A28McDCX+/LYtZ+MZUwG6BvQo0Rk2 jKv4+78nJJ7CZxo+MtgKhDq/cGulzzRhAKfMa2FWFitCIIN8Hr6s9A2MnGaNT8jLHxVgnb+JU3/ R3Oc2zmEsIM3CBKc/9ir/aeBHn3n1LLrkIHc2q5/J1r4oxPBIVTwJYEgkmcTGoDEcSSCwtCfaxo iEDV1GzF8STQvkZadiqLPjTqdziPn5EmtbIF2iLI3fAjBPXiI4qLDWkuXqkD68oTYwWkoGgw7Aj rvIOob9UirhmOGqbm+L/2lPfwFYvu+IoUeorw1ugqBDW+xBb X-Developer-Key: i=dmitry.baryshkov@oss.qualcomm.com; a=openpgp; fpr=8F88381DD5C873E4AE487DA5199BF1243632046A X-Authority-Analysis: v=2.4 cv=HvZ72kTS c=1 sm=1 tr=0 ts=69012eda cx=c_pps a=EVbN6Ke/fEF3bsl7X48z0g==:117 a=xqWC_Br6kY4A:10 a=IkcTkHD0fZMA:10 a=x6icFKpwvdMA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=EUspDBNiAAAA:8 a=IGUcv2A_Vedk0hkw8VMA:9 a=QEXdDO2ut3YA:10 a=a_PwQJl-kcHnX1M80qC6:22 X-Proofpoint-GUID: Ic46D_saBYp7qogEdQwUASsUFcYlgubH X-Proofpoint-ORIG-GUID: Ic46D_saBYp7qogEdQwUASsUFcYlgubH X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUxMDI4MDE3NiBTYWx0ZWRfXw2ojtrYvz+b1 ZrNrcrrzk4+i9nO0BmLctkYjeAjy2pFlawSgu29bKhIKJE+o4GrT0Hf2fq9Bxujw8jtwOBsTWyE xjIyDkwOA9vjg3631OZ6BgAzJMA5izxDFAWKpmiSclUWD2Wn0pkLvtn/Nn6CMb5Y+ptldmk0s7v os8yPvVWn1izT5LBcrkCk1rqLqEzR+I4cWi/pI71+VyRPSq55RDbQ+sf7jXjKpvMs6cyTep045o 6t/XMwLFc/VmzIgU+i0CxL7OffQs0BA6R8t/kzM/K1Z7WN+RhvsYYg/ykAprF/WyyecUw6+wEFO zhmhvZNJB87FaRSjH1ACZUksvgEImGG9fpMVbI6lFULQiFWwjbetkvismYe1erAGM4v5kaHv1hF 9G7/7X6Cwue8lwL+AUxCBjz5VzXNMg== X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1121,Hydra:6.1.9,FMLib:17.12.80.40 definitions=2025-10-28_08,2025-10-22_01,2025-03-28_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 clxscore=1015 priorityscore=1501 malwarescore=0 adultscore=0 impostorscore=0 lowpriorityscore=0 phishscore=0 bulkscore=0 spamscore=0 suspectscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2510240001 definitions=main-2510280176 In order to reduce duplication, move common GPU memory configuration from individual board files to sc8180x.dtsi. Signed-off-by: Dmitry Baryshkov Reviewed-by: David Heidelberg --- arch/arm64/boot/dts/qcom/sc8180x-lenovo-flex-5g.dts | 6 ------ arch/arm64/boot/dts/qcom/sc8180x-primus.dts | 3 ++- arch/arm64/boot/dts/qcom/sc8180x.dtsi | 9 +++++++++ 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/arch/arm64/boot/dts/qcom/sc8180x-lenovo-flex-5g.dts b/arch/arm= 64/boot/dts/qcom/sc8180x-lenovo-flex-5g.dts index 08d0784d0cbb899b021198bd85e26f1a93861713..625a155a584ae4ca14c6f373ef2= 1b773ea7311cb 100644 --- a/arch/arm64/boot/dts/qcom/sc8180x-lenovo-flex-5g.dts +++ b/arch/arm64/boot/dts/qcom/sc8180x-lenovo-flex-5g.dts @@ -151,11 +151,6 @@ adsp_mem: adsp-region@90800000 { no-map; }; =20 - gpu_mem: gpu-region@98715000 { - reg =3D <0x0 0x98715000 0x0 0x2000>; - no-map; - }; - cdsp_mem: cdsp-region@98900000 { reg =3D <0x0 0x98900000 0x0 0x1400000>; no-map; @@ -357,7 +352,6 @@ &gpu { status =3D "okay"; =20 zap-shader { - memory-region =3D <&gpu_mem>; firmware-name =3D "qcom/sc8180x/LENOVO/82AK/qcdxkmsuc8180.mbn"; }; }; diff --git a/arch/arm64/boot/dts/qcom/sc8180x-primus.dts b/arch/arm64/boot/= dts/qcom/sc8180x-primus.dts index 93de9fe918ebdadf239832db647b84ac9d5a33f6..069953dcad378448800d45e1493= 1efe1fe1a69fc 100644 --- a/arch/arm64/boot/dts/qcom/sc8180x-primus.dts +++ b/arch/arm64/boot/dts/qcom/sc8180x-primus.dts @@ -14,6 +14,8 @@ #include "sc8180x.dtsi" #include "sc8180x-pmics.dtsi" =20 +/delete-node/ &gpu_mem; + / { model =3D "Qualcomm SC8180x Primus"; compatible =3D "qcom,sc8180x-primus", "qcom,sc8180x"; @@ -444,7 +446,6 @@ &gpu { status =3D "okay"; =20 zap-shader { - memory-region =3D <&gpu_mem>; firmware-name =3D "qcom/sc8180x/qcdxkmsuc8180.mbn"; }; }; diff --git a/arch/arm64/boot/dts/qcom/sc8180x.dtsi b/arch/arm64/boot/dts/qc= om/sc8180x.dtsi index e3143a4a41c948cf4ddbf4b137a1323366566fdc..42ab76d52ae21c39d5855e20e11= f9cb2319f3afa 100644 --- a/arch/arm64/boot/dts/qcom/sc8180x.dtsi +++ b/arch/arm64/boot/dts/qcom/sc8180x.dtsi @@ -646,6 +646,11 @@ reserved@89b00000 { no-map; }; =20 + gpu_mem: memory@98715000 { + reg =3D <0x0 0x98715000 0x0 0x2000>; + no-map; + }; + reserved@9d400000 { reg =3D <0x0 0x9d400000 0x0 0x1000000>; no-map; @@ -2274,6 +2279,10 @@ gpu: gpu@2c00000 { =20 status =3D "disabled"; =20 + zap-shader { + memory-region =3D <&gpu_mem>; + }; + gpu_opp_table: opp-table { compatible =3D "operating-points-v2"; =20 --=20 2.47.3 From nobody Mon Feb 9 10:51:47 2026 Received: from mx0a-0031df01.pphosted.com (mx0a-0031df01.pphosted.com [205.220.168.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 91AB6351FD5 for ; Tue, 28 Oct 2025 21:00:14 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=205.220.168.131 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1761685216; cv=none; b=dJXfkoB0/t25buda+Vv7SfXoSQMvfyC2qtXKEhuoyfEEDT7cX99HZWBVe74+J8VXF/ZjBnKQjbaquOjHlfS+599LqZnS4h8B2Va5t4WwxtZn5BdahueI4KMwRwqJBfNvEF7XlBimJYjeoXyeIE0uHJXoEbd9wRWYXBpv6vAUlr0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1761685216; c=relaxed/simple; bh=EsmtIGGogp83Wk5re8Qo1ymE2FtIHHnW81gg07LjkxE=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=ndGC9QbA77UDA7LUaWCjYNtjcGjWqYYBVZEsmAa4rX7mRNh5w6VRu75Ulq15uQlek+Xtl/j3a8oAGmswVZ+5hZdJsqfLIcBIBcuGHlKXJihbRx4gaFoHeUUwLcI6bJFvXLQ5iVFZoAXCHXdapX++RyLZXqCKnZZsdQ3uHk4lEeY= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oss.qualcomm.com; spf=pass smtp.mailfrom=oss.qualcomm.com; dkim=pass (2048-bit key) header.d=qualcomm.com header.i=@qualcomm.com header.b=jb4lnCP2; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b=JYbl6qo6; arc=none smtp.client-ip=205.220.168.131 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oss.qualcomm.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=oss.qualcomm.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=qualcomm.com header.i=@qualcomm.com header.b="jb4lnCP2"; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="JYbl6qo6" Received: from pps.filterd (m0279866.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 59SJlUQs2525419 for ; Tue, 28 Oct 2025 21:00:14 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qualcomm.com; h= cc:content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s=qcppdkim1; bh= VziEZZGKxOa0Rm1W6uu/3kIDvdp59RTq7ZhYSMj/7Y0=; b=jb4lnCP2QE+Dj1sk 8w+zQB+pHI1fUeKzl4nAhMsGlHQ6qMSBQzkVzFK+sb5KRfqSVJ/w/esWQSBhhJUF loVt/ICWM8joT8KbgrAVzfO4ygUCuJ1+L77RfycRYNzCdHPd2ttc4feNmkxBQYlx Ks4rJBFBojTNKnXql3Ng6B28ol+TQ+aQe1Dc9M+erhCUS+99kDnSizA7vn7wbqz/ v5mkQfqRanaZV0EB2X0nArtAlws/25iVAvD9QjJ4PpYxzJ/u+5UFiTWxfnjWw+Bs MBdaksDVuFDBnNVCKi58E4ErJcr7IdJuZ62NED0m4/PdFuuF1QD5fAcLyj4lxqnC E3aygw== Received: from mail-qt1-f198.google.com (mail-qt1-f198.google.com [209.85.160.198]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4a34a3r5uq-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Tue, 28 Oct 2025 21:00:13 +0000 (GMT) Received: by mail-qt1-f198.google.com with SMTP id d75a77b69052e-4e8a387d01bso289373071cf.3 for ; Tue, 28 Oct 2025 14:00:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1761685213; x=1762290013; 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=VziEZZGKxOa0Rm1W6uu/3kIDvdp59RTq7ZhYSMj/7Y0=; b=JYbl6qo6UUG6sekcwmSnXudptfbsJXls6kKec4GdBiCThuH46aHhwDUDGTh94MhNg9 kIQjE97o3LfzVTl/mtE4iCLfI9pMtfMuRTbjxjcXSJZNlyWOPC0v0WHOZZN8JtGdi37x VUtNoVqrVNk0/gGEjBzyhH6xJyibXgcF6L9p39Vh+nB2T/bqjDvPhH7Jq3y1aNjg6xeC yekd2MdgX4hlXFDb4Z3JIuxIRaJlKbsoTJK0PzlzHhLLNdGUB1rW7Is3/7kdN4MCXbV7 JSt9ImHgslX9QRsp24YYnyjltnnvET2/0aiX7Di21pmYByjnP8yaWrhYzYE12sXX/nKk m9iQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1761685213; x=1762290013; 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=VziEZZGKxOa0Rm1W6uu/3kIDvdp59RTq7ZhYSMj/7Y0=; b=GjkFJAVfp+cP6ZEz8s4h/ZzNrDt8yTcrWfWSXdIGjILuENGZFRUQbEr7xQh95lXxdE 6I7IHnwL734yTfFdv1ahTQ8u+J/ho8AEeCQoIInuimtXggGICfqpB8FfRYV8atu0kSeX BcdX17GSTyy2Qu9WudMEZxI2qP2UYB3UNKeC0kIMNTltlmJDUy+VR7fU+9MQlaQBTsJu yVtYXEOtbvkQ82JlOaQ4ID/upP8i5uDJZv13q71QHh7jFOq0Iy5qCjNLm0JAPc+124KC d/BHDMjeZf9aT1dK1PH8Dw+DMYoST4KAnaErRZaYP1pHUH4PINsDIG4EoI3IIXug6kxp 3CWQ== X-Forwarded-Encrypted: i=1; AJvYcCXxHdfMrD4vNoI06KlPu+1+tiwBGkjYiSM2qXLhYpdxXBaIAF8IZvohVTmn6tEzCGc3Uur2eDvIE53doyk=@vger.kernel.org X-Gm-Message-State: AOJu0YzI7iquc0yyaUKz8UyYhf1da6Xe1s8J6t9LSxAk/ALC2KvVtFU3 AqwW7q1z7nGyHlAMgXKeGejUW2539r37q8f5qYO7ZexoKraFVA5GJa8cHeUgMykjhPKNcg342rb 2Yzq6VL4I1bDUMzHll9rPg+HiUHTW/WxVHo4j6hJtJ//pIGrp//tbzBeKceG+QafQ/yg= X-Gm-Gg: ASbGncsOQFx68V8P7f/XZSsk9ifPYSZisVYudxlJ2hX9AKww5ePhsqSbxszmkjusfI9 GCrDpBdBM9joL7UQQgGFMbIflo6hFxEgeksXCoim370qY/yvj2YhuzCE0/KOLv7oUph6BOb7pUf Sw2bU51foRroF1fnh1JrQGA9WNKZK8lSLUb9/ebt/UJLRuvguVLeROfk2/0RQ/iXVCoIt3KUfw3 rVqJl3+hjcNZ1sTWgygwDN6940nijswuVr93OHPTvC4g8nNP/oKoaKFmHT68qKtaxQLzpdtMIzp Pgy+K94OJ/80dxQOKDt7/fBFJukkKwPedN1n/9wEDDcth25/hTja0/tZxobHlfOI7LoqgvN8yXQ 3xaIgS10oVjqER72wjfXvddadNPi8uIl/hT5ahCdp2AX3dj9rDhXOMGmtZSwqNj0R6UZx1Ns9ff 2wNns+YjjGq99s X-Received: by 2002:a05:622a:145:b0:4e8:b559:7b90 with SMTP id d75a77b69052e-4ed15c2be04mr8766321cf.68.1761685211109; Tue, 28 Oct 2025 14:00:11 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHp4D699l/ScHj7pfWPbaPFKoz3mBy5SEBiI9F++8ubrl1KHnuXbAI3V3Z9L/DoSu4ZDbRHlQ== X-Received: by 2002:a05:622a:145:b0:4e8:b559:7b90 with SMTP id d75a77b69052e-4ed15c2be04mr8765751cf.68.1761685210484; Tue, 28 Oct 2025 14:00:10 -0700 (PDT) Received: from umbar.lan (2001-14ba-a0c3-3a00-264b-feff-fe8b-be8a.rev.dnainternet.fi. [2001:14ba:a0c3:3a00:264b:feff:fe8b:be8a]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-59301f861f5sm3283594e87.107.2025.10.28.14.00.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 28 Oct 2025 14:00:09 -0700 (PDT) From: Dmitry Baryshkov Date: Tue, 28 Oct 2025 23:00:03 +0200 Subject: [PATCH 4/7] arm64: dts: qcom: sc8280xp: create common zap-shader node Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20251028-dt-zap-shader-v1-4-7eccb823b986@oss.qualcomm.com> References: <20251028-dt-zap-shader-v1-0-7eccb823b986@oss.qualcomm.com> In-Reply-To: <20251028-dt-zap-shader-v1-0-7eccb823b986@oss.qualcomm.com> To: Bjorn Andersson , Konrad Dybcio , Rob Herring , Krzysztof Kozlowski , Conor Dooley , cros-qcom-dts-watchers@chromium.org Cc: linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=6085; i=dmitry.baryshkov@oss.qualcomm.com; h=from:subject:message-id; bh=EsmtIGGogp83Wk5re8Qo1ymE2FtIHHnW81gg07LjkxE=; b=owEBbQGS/pANAwAKAYs8ij4CKSjVAcsmYgBpAS7T+HSRF/+ghtiyTHIQaLfnd0SxBR4GSWkMp mM+P/YmLlOJATMEAAEKAB0WIQRMcISVXLJjVvC4lX+LPIo+Aiko1QUCaQEu0wAKCRCLPIo+Aiko 1R6XB/9dAt3BGICXtu+OkJl+yIc4PbcgFV24nXy89BncoNanCMevExzEIR3UvR6SySBSije3zi/ nuTbuPCN7FSHaLsrcFrnKLzMU7wy+osvL2gfgZ8nia40bjzGQW5+vmybQ5c5EgletwAPYyehtXg pQTxoNYbJ6N2HIguojwSL2t5CNSheSSN8Fk+HyuvyJUajX6ohTjNB9jm0Yml/9aCSqlC6vz1rPW MsSN3+b40z1xto6TvAgQQ9hBjIk7GqyIXe2d+pBgM4cnvoUJ1OGDgHYBPp/+0dHDGqGtSZdf6NX n+lxG2ReX1DrOIs2IzRmVJGUnVxWvhIthvYkkkaJ+sYoyoaf X-Developer-Key: i=dmitry.baryshkov@oss.qualcomm.com; a=openpgp; fpr=8F88381DD5C873E4AE487DA5199BF1243632046A X-Proofpoint-ORIG-GUID: MKKmc0M-G9THgFbOu47LenVIaFdQQ2Xe X-Authority-Analysis: v=2.4 cv=HM3O14tv c=1 sm=1 tr=0 ts=69012edd cx=c_pps a=mPf7EqFMSY9/WdsSgAYMbA==:117 a=xqWC_Br6kY4A:10 a=IkcTkHD0fZMA:10 a=x6icFKpwvdMA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=EUspDBNiAAAA:8 a=B_G8A1FuJYmnm4XSS68A:9 a=QEXdDO2ut3YA:10 a=dawVfQjAaf238kedN5IG:22 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUxMDI4MDE3NiBTYWx0ZWRfX0pTKX5BuyOQF +UHjBCoXkhgFAVeDGglx/BM62HNNbGc8nnkTM72xuViApagOEvP3BerAZVc7k2dyF+O2CFt2i1n dtHxzOHC/fxFkash6JIzZHmF+ngXhthcA2/VUhmvyDYBM+o2XtHvtJ8tojtuSjx7QVlCyuwAWOj dzi2AVfLiEPQEzelv/ptbLmy/EXB6f6Mk8X7w+Om0kvBJ6tR0Vg0eFyJikeUas54PcNOnn+RAb7 OTECi83awF/yXEAYUT40Xk2HERV8400BlATY3/EVVQK05uLl/WTcytFgJJPTdiJHJIxLTjku02b +c0O+tVmTdM4g0Buj7Z19QegWLZhgANZCjFw2aYDvHoC9i4I02NtsHnThEH+erdFAtZUpYUxLA5 ZBZb0QBJPStNHkHrCU3UDtIwmHGEoQ== X-Proofpoint-GUID: MKKmc0M-G9THgFbOu47LenVIaFdQQ2Xe X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1121,Hydra:6.1.9,FMLib:17.12.80.40 definitions=2025-10-28_08,2025-10-22_01,2025-03-28_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 suspectscore=0 priorityscore=1501 malwarescore=0 adultscore=0 phishscore=0 spamscore=0 lowpriorityscore=0 impostorscore=0 clxscore=1015 bulkscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2510240001 definitions=main-2510280176 In order to reduce duplication, mMove common GPU memory configuration from individual board files to sc8280xp.dtsi. Signed-off-by: Dmitry Baryshkov Reviewed-by: David Heidelberg Reviewed-by: Konrad Dybcio --- arch/arm64/boot/dts/qcom/sa8295p-adp.dts | 8 -------- arch/arm64/boot/dts/qcom/sc8280xp-crd.dts | 6 ------ arch/arm64/boot/dts/qcom/sc8280xp-huawei-gaokun3.dts | 6 ------ arch/arm64/boot/dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dts | 6 ------ arch/arm64/boot/dts/qcom/sc8280xp-microsoft-arcata.dts | 6 ------ arch/arm64/boot/dts/qcom/sc8280xp-microsoft-blackrock.dts | 6 ------ arch/arm64/boot/dts/qcom/sc8280xp.dtsi | 9 +++++++++ 7 files changed, 9 insertions(+), 38 deletions(-) diff --git a/arch/arm64/boot/dts/qcom/sa8295p-adp.dts b/arch/arm64/boot/dts= /qcom/sa8295p-adp.dts index 64e59299672cbf316b4eddb978e4583ff34c0299..524d44cbae740577e010f156308= a715962db1a36 100644 --- a/arch/arm64/boot/dts/qcom/sa8295p-adp.dts +++ b/arch/arm64/boot/dts/qcom/sa8295p-adp.dts @@ -149,13 +149,6 @@ regulator-usb5-vbus { enable-active-high; regulator-always-on; }; - - reserved-memory { - gpu_mem: gpu-mem@8bf00000 { - reg =3D <0 0x8bf00000 0 0x2000>; - no-map; - }; - }; }; =20 &apps_rsc { @@ -347,7 +340,6 @@ &gpu { status =3D "okay"; =20 zap-shader { - memory-region =3D <&gpu_mem>; firmware-name =3D "qcom/sa8295p/a690_zap.mbn"; }; }; diff --git a/arch/arm64/boot/dts/qcom/sc8280xp-crd.dts b/arch/arm64/boot/dt= s/qcom/sc8280xp-crd.dts index 490e970c54a24203ab297dfabed7e21c2be244e9..858f71737d93fd8591ba42eb363= 748ac51699d63 100644 --- a/arch/arm64/boot/dts/qcom/sc8280xp-crd.dts +++ b/arch/arm64/boot/dts/qcom/sc8280xp-crd.dts @@ -225,11 +225,6 @@ vreg_wwan: regulator-wwan { }; =20 reserved-memory { - gpu_mem: gpu-mem@8bf00000 { - reg =3D <0 0x8bf00000 0 0x2000>; - no-map; - }; - linux,cma { compatible =3D "shared-dma-pool"; size =3D <0x0 0x8000000>; @@ -511,7 +506,6 @@ &gpu { status =3D "okay"; =20 zap-shader { - memory-region =3D <&gpu_mem>; firmware-name =3D "qcom/sc8280xp/qcdxkmsuc8280.mbn"; }; }; diff --git a/arch/arm64/boot/dts/qcom/sc8280xp-huawei-gaokun3.dts b/arch/ar= m64/boot/dts/qcom/sc8280xp-huawei-gaokun3.dts index 0374251d33291fc5804c9be0dc649ccea1c1c0e0..69d0d6c12e58653f8cb56cb7d38= 3ad9d64699d18 100644 --- a/arch/arm64/boot/dts/qcom/sc8280xp-huawei-gaokun3.dts +++ b/arch/arm64/boot/dts/qcom/sc8280xp-huawei-gaokun3.dts @@ -158,11 +158,6 @@ vreg_wlan: regulator-wlan { }; =20 reserved-memory { - gpu_mem: gpu-mem@8bf00000 { - reg =3D <0 0x8bf00000 0 0x2000>; - no-map; - }; - linux,cma { compatible =3D "shared-dma-pool"; size =3D <0x0 0x8000000>; @@ -602,7 +597,6 @@ &gpu { status =3D "okay"; =20 zap-shader { - memory-region =3D <&gpu_mem>; firmware-name =3D "qcom/sc8280xp/HUAWEI/gaokun3/qcdxkmsuc8280.mbn"; }; }; diff --git a/arch/arm64/boot/dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dts b/a= rch/arm64/boot/dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dts index 637430719e6d7d3c0eeb4abf2b80eea1f8289530..87bb42d9cc327a1d1811f15605a= 369dc8760557d 100644 --- a/arch/arm64/boot/dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dts +++ b/arch/arm64/boot/dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dts @@ -283,11 +283,6 @@ vreg_wwan: regulator-wwan { }; =20 reserved-memory { - gpu_mem: gpu-mem@8bf00000 { - reg =3D <0 0x8bf00000 0 0x2000>; - no-map; - }; - linux,cma { compatible =3D "shared-dma-pool"; size =3D <0x0 0x8000000>; @@ -724,7 +719,6 @@ &gpu { status =3D "okay"; =20 zap-shader { - memory-region =3D <&gpu_mem>; firmware-name =3D "qcom/sc8280xp/LENOVO/21BX/qcdxkmsuc8280.mbn"; }; }; diff --git a/arch/arm64/boot/dts/qcom/sc8280xp-microsoft-arcata.dts b/arch/= arm64/boot/dts/qcom/sc8280xp-microsoft-arcata.dts index aeed3ef152eba0fff13f8fc150f32974bffbe8e8..ea50e370f69837ec9412efc17e2= a41034b0736fd 100644 --- a/arch/arm64/boot/dts/qcom/sc8280xp-microsoft-arcata.dts +++ b/arch/arm64/boot/dts/qcom/sc8280xp-microsoft-arcata.dts @@ -186,11 +186,6 @@ vreg_wwan: regulator-wwan { }; =20 reserved-memory { - gpu_mem: gpu-mem@8bf00000 { - reg =3D <0 0x8bf00000 0 0x2000>; - no-map; - }; - linux,cma { compatible =3D "shared-dma-pool"; size =3D <0x0 0x8000000>; @@ -464,7 +459,6 @@ &gpu { status =3D "okay"; =20 zap-shader { - memory-region =3D <&gpu_mem>; firmware-name =3D "qcom/sc8280xp/MICROSOFT/SurfacePro9/qcdxkmsuc8280.mbn= "; }; }; diff --git a/arch/arm64/boot/dts/qcom/sc8280xp-microsoft-blackrock.dts b/ar= ch/arm64/boot/dts/qcom/sc8280xp-microsoft-blackrock.dts index a40dccd70dfda873fb963b71e39617a2025b86db..48b60f6186fc1d69178902f2cc3= bee324144202c 100644 --- a/arch/arm64/boot/dts/qcom/sc8280xp-microsoft-blackrock.dts +++ b/arch/arm64/boot/dts/qcom/sc8280xp-microsoft-blackrock.dts @@ -227,11 +227,6 @@ vreg_wwan: regulator-wwan { }; =20 reserved-memory { - gpu_mem: gpu-mem@8bf00000 { - reg =3D <0 0x8bf00000 0 0x2000>; - no-map; - }; - linux,cma { compatible =3D "shared-dma-pool"; size =3D <0x0 0x8000000>; @@ -581,7 +576,6 @@ &gpu { status =3D "okay"; =20 zap-shader { - memory-region =3D <&gpu_mem>; firmware-name =3D "qcom/sc8280xp/microsoft/blackrock/qcdxkmsuc8280.mbn"; }; }; diff --git a/arch/arm64/boot/dts/qcom/sc8280xp.dtsi b/arch/arm64/boot/dts/q= com/sc8280xp.dtsi index 7b89d3d422ea62012daeb423e457a20e84eeb0b5..b7044b9d656e4991e737f7008a7= cf8f0619dd115 100644 --- a/arch/arm64/boot/dts/qcom/sc8280xp.dtsi +++ b/arch/arm64/boot/dts/qcom/sc8280xp.dtsi @@ -691,6 +691,11 @@ reserved-region@85b00000 { no-map; }; =20 + pil_gpu_mem: gpu-mem@8bf00000 { + reg =3D <0 0x8bf00000 0 0x2000>; + no-map; + }; + pil_adsp_mem: adsp-region@86c00000 { reg =3D <0 0x86c00000 0 0x2000000>; no-map; @@ -3366,6 +3371,10 @@ gpu: gpu@3d00000 { =20 status =3D "disabled"; =20 + zap-shader { + memory-region =3D <&pil_gpu_mem>; + }; + gpu_opp_table: opp-table { compatible =3D "operating-points-v2"; =20 --=20 2.47.3 From nobody Mon Feb 9 10:51:47 2026 Received: from mx0a-0031df01.pphosted.com (mx0a-0031df01.pphosted.com [205.220.168.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 4AA22351FB9 for ; Tue, 28 Oct 2025 21:00:16 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=205.220.168.131 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1761685217; cv=none; b=ZUkOyEglkk6EgRr93msME32TqRRI7TnWxied0/kdoS+3hDSQj1B0L27MmATDHsVLHXtWK098qg8blEIGRuHJ6Afpgx+Uoc/+xM2rKFVZpEBlTqDZm270TMDfC1n3oJlhw4Lmg4Jbx+xMMH2z7xN0rXHqjhJKvfyZvmKQoZj0CWU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1761685217; c=relaxed/simple; bh=gNbzf2MPr+aBgX3mmP29VAz6QE1K5U58z9DMT83UfZU=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=Kr5T1XK8+h9knHnZ/7vMcecYE2rdWPtCxKMKpi/OVfiLKRTknWBHO683rFajlnqjtBGOQG6fSrfvmf4ju2O3XBVjgmCccMEitIlJomoXKSkaAjAyRzs5gTM7FIDk1G1HSD90oOchwgQuObqFu/O1EDJ4SD3FJiv7X10F/70lqck= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oss.qualcomm.com; spf=pass smtp.mailfrom=oss.qualcomm.com; dkim=pass (2048-bit key) header.d=qualcomm.com header.i=@qualcomm.com header.b=XrTLILI7; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b=ctwHs//X; arc=none smtp.client-ip=205.220.168.131 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oss.qualcomm.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=oss.qualcomm.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=qualcomm.com header.i=@qualcomm.com header.b="XrTLILI7"; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="ctwHs//X" Received: from pps.filterd (m0279864.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 59SJlOS92554348 for ; Tue, 28 Oct 2025 21:00:15 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qualcomm.com; h= cc:content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s=qcppdkim1; bh= NKcHfkgTZdnk410USJtHf5FZ+SnDF1WbC9y8f6X/XPg=; b=XrTLILI7wBZXwYgi /VUy+r5luFriKFS+e+4cQ8pTV+tGAnO7yKU4ukk/2pVBqF5f10jTXeNzUB8/R3x0 TW7RTjeX79b/tWP7ufCXGFdLhFVDQFyQVChErGwD/uc+JnvQVX76J+paa64Q3kTK 17gDhrojUA3KdLBaBqWDVK9I0jEvJ8uRZ9G4E1SjxIQbi8WbB88OZ1+msbnZiy7Q mo8+EzNDdbQgF1mRAhIzx1mTbb9ttjAHe+IVUSpvYlFh/71XXmsohFAu1YAJF4Wb bpjJzxSku4C4y0BT9lm32vayYEm6plvf6lMS55hMbUStOKgtKlqG4hIdBkVG4JvI Sq+p6w== Received: from mail-qt1-f197.google.com (mail-qt1-f197.google.com [209.85.160.197]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4a34a105uv-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Tue, 28 Oct 2025 21:00:15 +0000 (GMT) Received: by mail-qt1-f197.google.com with SMTP id d75a77b69052e-4e8bb155690so85749811cf.0 for ; Tue, 28 Oct 2025 14:00:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1761685214; x=1762290014; 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=NKcHfkgTZdnk410USJtHf5FZ+SnDF1WbC9y8f6X/XPg=; b=ctwHs//XcU2M2zplzGQ0Pt+6LIkVVVKvn6myPh9cvtE8k73SXMQorcOH78CSowqQkS CXgcEl/Klwvry0NJlMSAhnAcXDm7IrP35vFFmNCNu2PTimKt3apiE+CRs/0mEmQCtMN8 a/INANXWoVoABYw+Ujv44wV51uedkVUWDsgy2dWhFFyJztAr2zZwlpu1aURtwkaGtZMJ fMuRxcTq9hP+lSMoc4+I8N35GrbAErU7xMRVQYCDVDML5mazASbu/sWpW60zlMWVH0+p LwQPNmbQosH1q+eo0YBM4rShuVLA60qSQEOoHIVqrZo+AkyZI/IS62m4WzJ8DJPdgxGk djlA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1761685214; x=1762290014; 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=NKcHfkgTZdnk410USJtHf5FZ+SnDF1WbC9y8f6X/XPg=; b=LlxPtmiKzbSMGKJpJ/a1879E/4BZkeeg08J0JKj26/fYy+RqbHgd2E2smDU+H3mZqV ANOClFr4DhDyCAm5FrxG9pT49qQ4V+c2D30BC3uHF3/G4EDjOgZPSEIbp/gt5qRLT9w/ xlnjaWxhS7guLf1BOXT1HyhCn7bGILEcUah2CbD6eD9Zc5nOBWG9XOXlzdAMrAmBNlkO KTzYzv2V242fPMZpHKhRhNGwPFFOblqBuEZUS/axlKf7zlpDIw0ERv/BgvFkZ1QdXpZv KcuyMALUwi/cf65O2X+XQp0f2HEs42ENqOKUiwb5hAbSc0xlWSYIG6OJb2jtsoFZlDbW BUDA== X-Forwarded-Encrypted: i=1; AJvYcCWxIRu8aR07OAc1EsZltANFI9A+RlMr6N046n9ymlI8VvJ+50P8Wb1blSSfCjzuZ9bIEBHitbRu08joyq8=@vger.kernel.org X-Gm-Message-State: AOJu0YyzNbSr6l+KqQ6bFjeAtLPWhgBjrAnn7JUZPx/jgvetAt4GhhZf hhK/xF+7HAmArAkFnXHO3DXu8JChZyWaiugYlhC+7+UJQo0++i49ldyAZRDsd03zH0XrX6VViRR 45m0jTFeUAIxwdG2qcVxuYuu4uXNrRsbEX8TZzTh/F/SdcGSMuVzNuMYMU8hO7LU6YCqTg0xXDN M= X-Gm-Gg: ASbGncvVTR7nbT43N53Kn602/72vnLejlSOnifMVHlu4TSbtu8mivEF4zlLRPaZQ2x/ juZuIwWqM5zZ1DxvzXfhqy7PcQCX2lKWH845OFYl4Lr0UK+iYpj/cnMIwIM6y+O3bBSKAb/0Gpc VBn/FVJbhoF2Wm5HmfKCJ1PWWVh0H18T1/OM8Gpy29F50y0czaKCNA0OKDq2cWBJ/c7lB2VQe8L nLKgD+A+Mjt32CAN90UrKi1BgQJs0jZR6YCn6B3yWSAzLbGQVQG+7GAcjvEgMsxjpkGtZGjbtsR 9xeahRMUXdItnOExkjzrzu92hg4hl21nfNBF0hhTXFDrZuN6xotR5Xn7d1D9K/XVnlO01qO7xcX ok52gL4GpaY6j60v8pW04PF8SoFhtKwFalwJ88fFgPDgcnsLXJS2TwUM3HLl8qYmfOgLz8dz4zJ spqSmC0D6Wj/rc X-Received: by 2002:a05:622a:5598:b0:4ec:f2a4:f27e with SMTP id d75a77b69052e-4ed15beb88fmr9739731cf.51.1761685213469; Tue, 28 Oct 2025 14:00:13 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGEyhDF1HpOlX9VCBQo9hbkONm73nZjFChvahYmFfx/awPnktOZQYzI1cLFrJPwZv59XTkjbw== X-Received: by 2002:a05:622a:5598:b0:4ec:f2a4:f27e with SMTP id d75a77b69052e-4ed15beb88fmr9739241cf.51.1761685212937; Tue, 28 Oct 2025 14:00:12 -0700 (PDT) Received: from umbar.lan (2001-14ba-a0c3-3a00-264b-feff-fe8b-be8a.rev.dnainternet.fi. [2001:14ba:a0c3:3a00:264b:feff:fe8b:be8a]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-59301f861f5sm3283594e87.107.2025.10.28.14.00.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 28 Oct 2025 14:00:10 -0700 (PDT) From: Dmitry Baryshkov Date: Tue, 28 Oct 2025 23:00:04 +0200 Subject: [PATCH 5/7] arm64: dts: qcom: sm8250: drop duplicate memory-region defs Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20251028-dt-zap-shader-v1-5-7eccb823b986@oss.qualcomm.com> References: <20251028-dt-zap-shader-v1-0-7eccb823b986@oss.qualcomm.com> In-Reply-To: <20251028-dt-zap-shader-v1-0-7eccb823b986@oss.qualcomm.com> To: Bjorn Andersson , Konrad Dybcio , Rob Herring , Krzysztof Kozlowski , Conor Dooley , cros-qcom-dts-watchers@chromium.org Cc: linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=2438; i=dmitry.baryshkov@oss.qualcomm.com; h=from:subject:message-id; bh=gNbzf2MPr+aBgX3mmP29VAz6QE1K5U58z9DMT83UfZU=; b=owGbwMvMwMXYbdNlx6SpcZXxtFoSQyaj3hVehcPyJpo1Uub8BnF/dqbm568JPpN3eal50If06 +X/wtI7GY1ZGBi5GGTFFFl8ClqmxmxKDvuwY2o9zCBWJpApDFycAjARlkr2v4Ii2UtOCN0VXWDM eOi/WEtrvdUFQRF7TcXtvU4R0y0Dr7IZNsuz9/H93+Ja7740tHlu1YOpMkzVXP7y+pf/3hFo1Ih jO7vN4ujJbIGIWgPdkn5Ju9VPddwSX+zcc6NTNTJQkf3mQn8L4ex8H/1W23yxm1q3dm04zNH8uS frb35q0xLWg1qCMZp6uXXX7jBZGdz8ssP2Z37iqoM/mUyloh+UfpqldsRVxlDn+O4zB37sEsh54 9xcfXxr1eGPlz3Zyv/4zI4qn/lD59ndi3NeTc1oU7py8+nzDWYbPNsWO34zt987OTNU7jr3PcMt EaZN1eZ/bPOv/VHcb19aMd99U+PN6QXhSz+lG5dsTqwGAA== X-Developer-Key: i=dmitry.baryshkov@oss.qualcomm.com; a=openpgp; fpr=8F88381DD5C873E4AE487DA5199BF1243632046A X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUxMDI4MDE3NiBTYWx0ZWRfX8QS+wJV7gZFW MQh9o5XogocANqwy+CHV8URXNZpokE3riJkMCZcc21/QJ7/dQ3nmWWC1Czf/3p7GVFtYu84CUKx gIBRujQB2YByBaonebc79o12J2JeQVX20s9paUdklBVqZKXBGrPs8jaaoOGsLAqWlsqjuw4sWmw POe9gfkBYGfXK0oCbmV7jszmUqKfNZaYVMDH9KEHOrMt86yaFeI8QqeamTQfy0P7nXEj8JpHyFc PB2V42QY6DOB5oAhf+jTGvthPNe7woBCthSjju1qFpcqXO50xooSarygg5peTw3MsWlkP5x+1oa lll7OBKJ2DzEx3Zv7Zi2qZu2/8CqTLz7+EuGZ+ckTym0GUBYHLxgpNzIDDg+GnAOI1gEDDkMxep iKQGXBi3PXvbSWhlZNMYz9w7n8ahBg== X-Proofpoint-ORIG-GUID: CnT0sAxlG8zJdUBe09EeA_4Ld1ciVgNl X-Authority-Analysis: v=2.4 cv=EKULElZC c=1 sm=1 tr=0 ts=69012edf cx=c_pps a=EVbN6Ke/fEF3bsl7X48z0g==:117 a=xqWC_Br6kY4A:10 a=IkcTkHD0fZMA:10 a=x6icFKpwvdMA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=EUspDBNiAAAA:8 a=-YGnug1cYvQUASFw60IA:9 a=QEXdDO2ut3YA:10 a=a_PwQJl-kcHnX1M80qC6:22 X-Proofpoint-GUID: CnT0sAxlG8zJdUBe09EeA_4Ld1ciVgNl X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1121,Hydra:6.1.9,FMLib:17.12.80.40 definitions=2025-10-28_08,2025-10-22_01,2025-03-28_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 malwarescore=0 priorityscore=1501 impostorscore=0 lowpriorityscore=0 phishscore=0 clxscore=1015 suspectscore=0 adultscore=0 bulkscore=0 spamscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2510240001 definitions=main-2510280176 The base file, sm8250.dtsi, alread includes memory-region under the GPU's zap-shader node. Drop duplicates from the individual board files. Signed-off-by: Dmitry Baryshkov Reviewed-by: David Heidelberg Reviewed-by: Konrad Dybcio --- arch/arm64/boot/dts/qcom/qrb5165-rb5.dts | 1 - arch/arm64/boot/dts/qcom/sm8250-mtp.dts | 1 - arch/arm64/boot/dts/qcom/sm8250-xiaomi-elish-common.dtsi | 1 - arch/arm64/boot/dts/qcom/sm8250-xiaomi-pipa.dts | 1 - 4 files changed, 4 deletions(-) diff --git a/arch/arm64/boot/dts/qcom/qrb5165-rb5.dts b/arch/arm64/boot/dts= /qcom/qrb5165-rb5.dts index d99448a0732d9d165be1b5a1b1e15b2424b98b55..964e33b6e74aee9582d8eba32f9= 76c6998d36c68 100644 --- a/arch/arm64/boot/dts/qcom/qrb5165-rb5.dts +++ b/arch/arm64/boot/dts/qcom/qrb5165-rb5.dts @@ -596,7 +596,6 @@ &gpu { status =3D "okay"; =20 zap-shader { - memory-region =3D <&gpu_mem>; firmware-name =3D "qcom/sm8250/a650_zap.mbn"; }; }; diff --git a/arch/arm64/boot/dts/qcom/sm8250-mtp.dts b/arch/arm64/boot/dts/= qcom/sm8250-mtp.dts index 7f592bd3024868c6ab4c9c61051d3f2cf5707a1a..5c40d4e869d354870828629238d= 6e14364f438aa 100644 --- a/arch/arm64/boot/dts/qcom/sm8250-mtp.dts +++ b/arch/arm64/boot/dts/qcom/sm8250-mtp.dts @@ -486,7 +486,6 @@ &gpu { status =3D "okay"; =20 zap-shader { - memory-region =3D <&gpu_mem>; firmware-name =3D "qcom/sm8250/a650_zap.mbn"; }; }; diff --git a/arch/arm64/boot/dts/qcom/sm8250-xiaomi-elish-common.dtsi b/arc= h/arm64/boot/dts/qcom/sm8250-xiaomi-elish-common.dtsi index 465fd6e954a347acf15ef3199afd8d1a198f95e8..6c9bb993dc2a3d12b1c7972128e= 2a2f64fa8dfab 100644 --- a/arch/arm64/boot/dts/qcom/sm8250-xiaomi-elish-common.dtsi +++ b/arch/arm64/boot/dts/qcom/sm8250-xiaomi-elish-common.dtsi @@ -556,7 +556,6 @@ &gpu { status =3D "okay"; =20 zap-shader { - memory-region =3D <&gpu_mem>; firmware-name =3D "qcom/sm8250/xiaomi/elish/a650_zap.mbn"; }; }; diff --git a/arch/arm64/boot/dts/qcom/sm8250-xiaomi-pipa.dts b/arch/arm64/b= oot/dts/qcom/sm8250-xiaomi-pipa.dts index 4ad24974c09f9bb75cc24e55bd4869b52a39ac7c..12565ad87890fea1cc6c25cc161= 072d75b793c1d 100644 --- a/arch/arm64/boot/dts/qcom/sm8250-xiaomi-pipa.dts +++ b/arch/arm64/boot/dts/qcom/sm8250-xiaomi-pipa.dts @@ -426,7 +426,6 @@ &gpu { status =3D "okay"; =20 zap-shader { - memory-region =3D <&gpu_mem>; firmware-name =3D "qcom/sm8250/xiaomi/pipa/a650_zap.mbn"; }; }; --=20 2.47.3 From nobody Mon Feb 9 10:51:47 2026 Received: from mx0b-0031df01.pphosted.com (mx0b-0031df01.pphosted.com [205.220.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id E3FAB2BDC13 for ; Tue, 28 Oct 2025 21:00:16 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=205.220.180.131 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1761685218; cv=none; b=PhnUHoasec4IaB1aPwm5kVPNr4UKirQrKAqe/437Jt84Mk04Oosv1X5Rg7zjvAhLH/SFQf9nD/NY+Z2efgf8ncajGuKd58X8stlrKUH7ZYqdZSYtvK6kg11s54s96AoO3GoQsoe0WM17wPVPhm+P8/zRaWd0jAuMxyFU/hCSwow= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1761685218; c=relaxed/simple; bh=XZlVanBK07YsrrAgPlVUCFnWnH1kW6H3soUn83IKxhE=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=URY++LkK36soZQc5/sNvxHNa+i6fOoQgi34LY9q/mWJ40NnA4ATntLm2HawQyeBNa91XgMLp+icFsKPtT7WhU/NEZraH9Gwc+ywwk02VYZTTsD4r9e4/7216xMgPxbbjSW+tQYGErHcCq7biMy9SdZN7uXwekcS67Ftvs8tZGZc= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oss.qualcomm.com; spf=pass smtp.mailfrom=oss.qualcomm.com; dkim=pass (2048-bit key) header.d=qualcomm.com header.i=@qualcomm.com header.b=BfdmuA3+; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b=b/ikvQuI; arc=none smtp.client-ip=205.220.180.131 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oss.qualcomm.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=oss.qualcomm.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=qualcomm.com header.i=@qualcomm.com header.b="BfdmuA3+"; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="b/ikvQuI" Received: from pps.filterd (m0279873.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 59SJlWdJ2616495 for ; Tue, 28 Oct 2025 21:00:15 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qualcomm.com; h= cc:content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s=qcppdkim1; bh= ztnEZ8z8mQZFEmEJLlZF9ukU00RhQZ/xEw/G6uwQnzQ=; b=BfdmuA3+YsIOLaKZ OEmDBEtxZIim0jIMIePePy4rTHY/Tejh99PDKqn5z5Yl6keatB5yoTnu9F2uahRL DJHFIvUABnWHIWc+fuHrGM/IhniABjKTD0s7ml76WbyXGVJp4N6bvXi7INJ44xyI OOfyZSsqZt/6KoYoCz9ELUwOrNAVSRsNMRG0w8CKlrik7HRquMj5CM/Et2EKPARG FJbIT0oica6WY+NVk3QHrw6oexwJ7W+Yppa0yGrTlFlQGPnKXubFb5Lk3TmoTfPY DsWlzJhnWHkPt7hf27Z2Zqejf41g7DNX00u62gL6lqR+NiswBrOksJ0LGYXOgHT1 VbHOzA== Received: from mail-qt1-f198.google.com (mail-qt1-f198.google.com [209.85.160.198]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4a34a0g593-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Tue, 28 Oct 2025 21:00:15 +0000 (GMT) Received: by mail-qt1-f198.google.com with SMTP id d75a77b69052e-4e892f776d0so291423811cf.0 for ; Tue, 28 Oct 2025 14:00:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1761685215; x=1762290015; 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=ztnEZ8z8mQZFEmEJLlZF9ukU00RhQZ/xEw/G6uwQnzQ=; b=b/ikvQuItpK8l9qQocARbG+pDR9D74rWXX4iMDPeE+iLSm5GP1BOuYWVaAAbPLKxLE VbAZeRUorKb/ZbYdDZbL646sCmY2aLaDCLCvGY2zVjnXCFBDKITCQ7vbcM/EawSR+Kk+ WqCQCZA7VImjfGESkV6cbpwkneznwtnHo4o23eKXI+9LdFc424IJ5rNrRPnBnWc+9n7z NlEo1wOTF+CGtreTmF78MMl+7Qr3UoYBchgGO5qqgffAt+KMOP3UbHPgcPWlk69K9Wf7 6lDgPInTnJMO9so0v/s7mTOhGdnJVucUaT+BcEVUAsVpWyBgHvjh7pll9wSVG/ySTeUl 5TEw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1761685215; x=1762290015; 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=ztnEZ8z8mQZFEmEJLlZF9ukU00RhQZ/xEw/G6uwQnzQ=; b=OlXRncSMTz1CaOjJUW0hA0crfr0wIbg6g/i7Zq53IRCIcpMWtieQANjPgLArn54Es9 XrCS0wk6sEr4cizU+J/LMAM8NYfV7CrZjivG6PB7OQPvMwjuJr5nmUAhPCLN8E/Q2TRY PTMXq3M5pOKNcsZ43O0LO601ntVho9OxXVQVzdHznYRzo3MqaBmfk3b2KEPFLkoyT/OI VIqpWcebsxt7j+Q1figaYBuU9CUH+WoncG13Fo/NiFolmPVvUbUluEZWfvLXKGiuwBme W8VkB9VomI8siQoTLp3+XfNaiOAOFM0QU8jjltxy/drXFhBTbWUXluHE8czPZZbQ7+gU HKLA== X-Forwarded-Encrypted: i=1; AJvYcCWaHHYkRc61PV3wi/H+rXYekCJyZneLnCZcBWUW9ltuWZlncqGE2S1Gzz7Gn6Yhs296B7bgSWOCDYQPgUE=@vger.kernel.org X-Gm-Message-State: AOJu0Yz+Pc9Imy/gQfoHMuqPeSECJmimRZJB8qXzlSu60uvp1I/FdrII KdPAQYxEL8VzmxR0Dy+rAt2Fpt3WAqzNNTRqXo/GACSfSwX4sErNgskoTi9eDRfCZ0XY2BAZbzx KjjS4mL7j+nF6yuujmsms+An1bcqrsG5pez4Ea1Baovh4Rqcmh88V7KEveAdkEkke1PQ= X-Gm-Gg: ASbGnctvXHprG9WdTJXEUCAl1NoE+9EV4v5WKgvJBGX4dZEWvQvP/YVZbbfoTGgJqKt K5HXg3owYpCI211HTdKJCygqp0PEP2InavsZ+tW4+IVhq0tOPD4VXGb7DDOZE0bwx306y+hR3l1 Tyjb7rHcI90UWCsx8cG1yxlwtSbrC8P9nkl39Gh504cAluQnO/C7goOjz5Njwoxeyp8wgAxjI1/ WlSXC1OmSaZTrvdVL+kXMOUN2t9auxfi2fAnvlzSUiG4QbbYU7hRanIQok1eloLXknpHImXs9ma dW0SPe+ZOP74hHSnHU0GZ5eKSiPBNM9LK753TDqTSM9RqNcOlY7uDQl+Ho1ky75FtkyjZRgYH74 Ab42j6mxZQ/4nFvSRzYH9sDfCoshn+qBsX/VePjVpx1gb+QkVL+cOkYduYzqzzM6qRVaqnRaGxE 5uI/CVFC0HGskU X-Received: by 2002:a05:622a:8f:b0:4d0:ac40:fab8 with SMTP id d75a77b69052e-4ed15b4947emr9504421cf.7.1761685214656; Tue, 28 Oct 2025 14:00:14 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHy+ynRMizh5efdzduRYMgWEH8/HKBtFtnCd4b/KaFwqqay4ojtNyQT3m1WxgtDSScIZivIIg== X-Received: by 2002:a05:622a:8f:b0:4d0:ac40:fab8 with SMTP id d75a77b69052e-4ed15b4947emr9503721cf.7.1761685214025; Tue, 28 Oct 2025 14:00:14 -0700 (PDT) Received: from umbar.lan (2001-14ba-a0c3-3a00-264b-feff-fe8b-be8a.rev.dnainternet.fi. [2001:14ba:a0c3:3a00:264b:feff:fe8b:be8a]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-59301f861f5sm3283594e87.107.2025.10.28.14.00.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 28 Oct 2025 14:00:13 -0700 (PDT) From: Dmitry Baryshkov Date: Tue, 28 Oct 2025 23:00:05 +0200 Subject: [PATCH 6/7] arm64: dts: qcom: sc7180: add gpu_zap_shader label Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20251028-dt-zap-shader-v1-6-7eccb823b986@oss.qualcomm.com> References: <20251028-dt-zap-shader-v1-0-7eccb823b986@oss.qualcomm.com> In-Reply-To: <20251028-dt-zap-shader-v1-0-7eccb823b986@oss.qualcomm.com> To: Bjorn Andersson , Konrad Dybcio , Rob Herring , Krzysztof Kozlowski , Conor Dooley , cros-qcom-dts-watchers@chromium.org Cc: linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=3687; i=dmitry.baryshkov@oss.qualcomm.com; h=from:subject:message-id; bh=XZlVanBK07YsrrAgPlVUCFnWnH1kW6H3soUn83IKxhE=; b=owEBbQGS/pANAwAKAYs8ij4CKSjVAcsmYgBpAS7UDIYbGe3XDxCxNrS0zAq0+gWjg/uMGzAzs 718A9UAk0SJATMEAAEKAB0WIQRMcISVXLJjVvC4lX+LPIo+Aiko1QUCaQEu1AAKCRCLPIo+Aiko 1dNoCACg08F4nyNGtHTbnJoxhvSiUhjUDQ0LUe3n5iTPGjsYsXTNaeCOJ/E7hTnBAOHPV4vKWhS RBW1luOf3MdIBXy5wc3lHHRKtIcvtlvg//F4+2jy+dMCezDZeeG4UtXamw+kyxpRUNajTLQnMwm M8L2J6LIkT9B/sTeA5W7CFyeWnovb/Cd2mcq9CUPTYil63meHsFSbNEapS89kVMNbjW8Wmfsxtt O6Ofy4KUcbnLdvy5RJqbRhG4JQFQ87yMiLKpiOOhjvAOcYBxwmKgMAiV2azLGS1+EtCUVrdNwTO KJYHJ5KcyhFUtdSyMcZ5e7gLfWHYkyXJ2JyVbIidiLjjCqay X-Developer-Key: i=dmitry.baryshkov@oss.qualcomm.com; a=openpgp; fpr=8F88381DD5C873E4AE487DA5199BF1243632046A X-Authority-Analysis: v=2.4 cv=HvZ72kTS c=1 sm=1 tr=0 ts=69012edf cx=c_pps a=mPf7EqFMSY9/WdsSgAYMbA==:117 a=xqWC_Br6kY4A:10 a=IkcTkHD0fZMA:10 a=x6icFKpwvdMA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=EUspDBNiAAAA:8 a=bRHBWdnJZKEDweV1ddAA:9 a=QEXdDO2ut3YA:10 a=dawVfQjAaf238kedN5IG:22 X-Proofpoint-GUID: YMsNzv_215Mtz7poIE_y0PdUL3_An0Sk X-Proofpoint-ORIG-GUID: YMsNzv_215Mtz7poIE_y0PdUL3_An0Sk X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUxMDI4MDE3NiBTYWx0ZWRfXxMi6panMBqWC t84yiknppf+XAW7jZPRl/hIRZ1yBnIEjWLfWh9NvI0XiqNu3/1E6uD2qaSTMg6RyfT9e9uBhK7X ++8J8n4us5dtWmGKlN23WOpEnRaK7CsaXNyhnCwnlky92YfxQNExYDa4Sha38yRBiguoCXSppIf MkrX4nAA5HxkVOhr4gIzuryC08SJp9x1OP7r+/0ck6AcQM7gR8zD2ewzekPnIKR/p633LiZTI8d 6iuRoHBx6Q7qvcz9K46uIFxd08cwgPJiGEGQKEwxVp85/6/a9+YShYHzknk2EItpHC1NMsm8m73 R/m4SJgd4gC3fsDCKCBcLIehQOGwATZNevfEnyoumqTnUUz/VsIVDGVoq0oTXPxaegOWC+v3NS6 zZLVhbqJtwOatikp3pVL2Y56dg+TTg== X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1121,Hydra:6.1.9,FMLib:17.12.80.40 definitions=2025-10-28_08,2025-10-22_01,2025-03-28_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 clxscore=1015 priorityscore=1501 malwarescore=0 adultscore=0 impostorscore=0 lowpriorityscore=0 phishscore=0 bulkscore=0 spamscore=0 suspectscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2510240001 definitions=main-2510280176 Patching existing DT nodes based on full path is error prone and generally not recommended. Add a generic zap-shader subnode to the GPU node on SC7180, delete it on trogdor and IDP, two platforms which don't use ZAP and patch it with the firmware-name on all other platforms by using the label. Signed-off-by: Dmitry Baryshkov Reviewed-by: David Heidelberg Reviewed-by: Konrad Dybcio --- arch/arm64/boot/dts/qcom/sc7180-acer-aspire1.dts | 9 ++++----- arch/arm64/boot/dts/qcom/sc7180-el2.dtso | 6 ++---- arch/arm64/boot/dts/qcom/sc7180-idp.dts | 1 + arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi | 1 + arch/arm64/boot/dts/qcom/sc7180.dtsi | 4 ++++ 5 files changed, 12 insertions(+), 9 deletions(-) diff --git a/arch/arm64/boot/dts/qcom/sc7180-acer-aspire1.dts b/arch/arm64/= boot/dts/qcom/sc7180-acer-aspire1.dts index ad342d8b7508c543984f166300bea04b6d7de88f..1514da636269826ce3e87d8c23a= ad0e37430f57d 100644 --- a/arch/arm64/boot/dts/qcom/sc7180-acer-aspire1.dts +++ b/arch/arm64/boot/dts/qcom/sc7180-acer-aspire1.dts @@ -31,7 +31,7 @@ chosen { }; =20 reserved-memory { - zap_mem: zap-shader@80840000 { + gpu_mem: zap-shader@80840000 { reg =3D <0x0 0x80840000 0 0x2000>; no-map; }; @@ -426,11 +426,10 @@ panel_in_edp: endpoint { =20 &gpu { status =3D "okay"; +}; =20 - zap-shader { - memory-region =3D <&zap_mem>; - firmware-name =3D "qcom/sc7180/acer/aspire1/qcdxkmsuc7180.mbn"; - }; +&gpu_zap_shader { + firmware-name =3D "qcom/sc7180/acer/aspire1/qcdxkmsuc7180.mbn"; }; =20 &mdss { diff --git a/arch/arm64/boot/dts/qcom/sc7180-el2.dtso b/arch/arm64/boot/dts= /qcom/sc7180-el2.dtso index 49a98676ca4db270ecb55e8f801d0800ef9e4def..6e8da59597b657cf15c68c3a12a= b56213979950b 100644 --- a/arch/arm64/boot/dts/qcom/sc7180-el2.dtso +++ b/arch/arm64/boot/dts/qcom/sc7180-el2.dtso @@ -8,10 +8,8 @@ /plugin/; =20 /* We can't and don't need to use zap shader in EL2 as linux can zap the g= pu on it's own. */ -&gpu { - zap-shader { - status =3D "disabled"; - }; +&gpu_zap_shader { + status =3D "disabled"; }; =20 /* Venus can be used in EL2 if booted similarly to ChromeOS devices. */ diff --git a/arch/arm64/boot/dts/qcom/sc7180-idp.dts b/arch/arm64/boot/dts/= qcom/sc7180-idp.dts index 19cf419cf531f353f17b83b89ec57dac697d5134..0bce3eefca2e9b14310390f4961= 6873689894ae3 100644 --- a/arch/arm64/boot/dts/qcom/sc7180-idp.dts +++ b/arch/arm64/boot/dts/qcom/sc7180-idp.dts @@ -39,6 +39,7 @@ chosen { * */ =20 +/delete-node/ &gpu_zap_shader; /delete-node/ &hyp_mem; /delete-node/ &xbl_mem; /delete-node/ &aop_mem; diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi b/arch/arm64/boot= /dts/qcom/sc7180-trogdor.dtsi index 74ab321d3333cf8fdca45c7cde2fcd9d34b264b2..b398f69917f0e1eb7f2b1b0a6cb= 582ecb0c7c5c9 100644 --- a/arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi +++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi @@ -41,6 +41,7 @@ charger-crit { * required by the board dts. */ =20 +/delete-node/ &gpu_zap_shader; /delete-node/ &hyp_mem; /delete-node/ &ipa_fw_mem; /delete-node/ &xbl_mem; diff --git a/arch/arm64/boot/dts/qcom/sc7180.dtsi b/arch/arm64/boot/dts/qco= m/sc7180.dtsi index a47182994c564e036dba25c772454320dc41cc7c..45b9864e3304b2c0331a27109f7= 918c327cee5c2 100644 --- a/arch/arm64/boot/dts/qcom/sc7180.dtsi +++ b/arch/arm64/boot/dts/qcom/sc7180.dtsi @@ -2185,6 +2185,10 @@ gpu: gpu@5000000 { interconnects =3D <&gem_noc MASTER_GFX3D 0 &mc_virt SLAVE_EBI1 0>; interconnect-names =3D "gfx-mem"; =20 + gpu_zap_shader: zap-shader { + memory-region =3D <&gpu_mem>; + }; + gpu_opp_table: opp-table { compatible =3D "operating-points-v2"; =20 --=20 2.47.3 From nobody Mon Feb 9 10:51:47 2026 Received: from mx0b-0031df01.pphosted.com (mx0b-0031df01.pphosted.com [205.220.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 38B86350D42 for ; Tue, 28 Oct 2025 21:00:22 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=205.220.180.131 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1761685225; cv=none; b=cEOjXVVUb1oxAQJpeg2lBYNZk8rFmsibNJJR9aBJRrkzlbeYSPsf9kLg5al9e8jLQe3d4ZVrwZNLr4JpyFaywVnZyO6ozKVY7iw8or9UXw5LVD90DYV3GvnCNoMmXFkeJMTMZ2g9EVjl4+WSps7pzODmnTH9z/beWPYi2mD6SRQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1761685225; c=relaxed/simple; bh=iTqj4rbfKgBgi+AUvAxT5DauIF+8OfMFLFnMVyLwlUI=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=A63qCjHgwcmHvAQuCJm+ImU3MYwhdcr5rvntwmpCaGmRC2uf31eeP7nbDeV3XP2XJrb1XImnqbBOsahV0nsm0BlWTEbluArT+CyYGHM3JPRWuywNCTW5L8F2j6ZoZbutqhx7QXF1ABIon/EouGSwIiw2ruzNa5oAUn0bLDe4hHU= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oss.qualcomm.com; spf=pass smtp.mailfrom=oss.qualcomm.com; dkim=pass (2048-bit key) header.d=qualcomm.com header.i=@qualcomm.com header.b=BX46BH7i; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b=HFfZqsBx; arc=none smtp.client-ip=205.220.180.131 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oss.qualcomm.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=oss.qualcomm.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=qualcomm.com header.i=@qualcomm.com header.b="BX46BH7i"; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="HFfZqsBx" Received: from pps.filterd (m0279872.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 59SJlR7f2552905 for ; Tue, 28 Oct 2025 21:00:22 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qualcomm.com; h= cc:content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s=qcppdkim1; bh= vorg18B2XkV+FIbgQ30llF26mFhbuUqKJLMRiD9B5mw=; b=BX46BH7imTciEf2J zW24/ntj66lPfsTcKIO8APuIgjE8KY6e9/1QPqcLgA6DYcWqA2HZU3Jk5FVSi3K2 oL3B0FNOvWG8NzPhT6ORhnEKoTxPMwPB4LlzYtf5tdLYqkyj8ELl0Rn5TjpxiVzd raVCZ8MLPpXEceLzhQPc2+Py1PEnaSOTV/swahbvRUXj3c3fSS3++kR2maa4w4/t 5VnY5YODMp0tQhCNWqZ2l5YiDEaDocXSKZ0NGxgFZn0350E2AZsfxHH6RpYH1esk SAx6LH+lsiIkg2+hSESRuW5pTEqMYWwbAWNn0YGeFgH1t+PkWJYKCU6sm3iszGsN MJMG1Q== Received: from mail-qt1-f199.google.com (mail-qt1-f199.google.com [209.85.160.199]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4a34a2g5bv-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Tue, 28 Oct 2025 21:00:21 +0000 (GMT) Received: by mail-qt1-f199.google.com with SMTP id d75a77b69052e-4e8b33c1d8eso161482231cf.2 for ; Tue, 28 Oct 2025 14:00:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1761685221; x=1762290021; 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=vorg18B2XkV+FIbgQ30llF26mFhbuUqKJLMRiD9B5mw=; b=HFfZqsBxTewhYcf1L1cme4iCLRGFoaMIkLGgnOIAPNtRNnvq3m4ZFSn4e3PutGMNAc 9mghVwQvfPUrX2I41iHeUkjzjRw1RlhsFtkmytYAIofjKy6RDcu5xRY6q1nmvv2wpcUY ol1blxO9UwZrDZWTDKFSEaLcJ4BZBKM44TAj4RRs7OpLEYWe8YcsRDLsEKRNxBtn7FFF 33WR6h5jd5hPbG/znWNBuE76h903riNxIAkzxi4D0jXJJSHy5E+Yn4d5r0CuQx0uromv IeCbUHtf/hPimMi97b/VF1Cqe+aw96Ahpc/TlpGFuH87EFZAMhMSR9nbYjXeT4kLM+UT DhCQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1761685221; x=1762290021; 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=vorg18B2XkV+FIbgQ30llF26mFhbuUqKJLMRiD9B5mw=; b=Z5JQxfAQC2RFeyVT4nWm+jlbbOCH1HZXF7HMScYJFxGGfvSbecOjZa6KHWqCsbRmYo +GSSu9MnjoNMh3SEOiLkWPT8KSUjoCPhTr/HU1B9ii6ZIW3Zn4/2NllxMet5FA7xlPNU r1LbcvsDrCVoiFca7RDtnBT7PagmMyxZvFCWOa1xE/Hl/zZ/Toe0hhdb4plN9OmsRnVn NpWGxejQK/rhjPJEkIX7O587d1sT9HbrPRx2xpwp4pkq3Vy6/OMcXlaK307DDFhRqw7R K53d/lAf/1CDdJFzXUvpcl5DRp9/nE+WrXyuUCDS3sA878dDKoLjraU/VUjPKCOaxVnx gr7g== X-Forwarded-Encrypted: i=1; AJvYcCXeRxzMYIj13QUHe5hZB5EAvw6G4dCgj3aG+xzxIWLfQjXGb9EFUBmpQMmf26FfqZ1gYae5QsUUNLhRKm8=@vger.kernel.org X-Gm-Message-State: AOJu0YwXPXHM2Q0S0hrsiz5fulbiSH//BSccIrynHb7VZT73gFuI1Vs5 YvcuekwwrMmdbkpmBgfGtIKYlp/6/OTQoKHcoeL8wV8sIb3hCMnB0/dpnAH76r65RwUTXuo2Jcd nDZlLCJ/yXtcWSWikQ1jW2/u2VRCmP52gaxJy268lFnc0yAPZ8E4/9Ll67hnyyu8IEtY= X-Gm-Gg: ASbGncsb99lKGjeIg5TN+rpJFdaaEnsP/AH/vXqRO7+/QjlIIpj+UHf/6KhomeBTTgV DYU3UYJdxQ4+miatn9+GeDPwQsDwpobcYSVC6tDEmZ+4kQ4qVywDTOQgMVpMaGhU2Jehk4Stc8L 943W4MVvaQHAOHaUFSc3xexwYG237kQoX2T0ZMZ+0SVR5CngFUdQuZHmMB+ahnlqN64B47oXE7Q dKwhFbGM/+0pbrsMHdSHwRGPf4ntYXuOv5c/ej6O89HFhXHC0AeOTwrQd3UeFBHMj3fcGJX9oyW TIM30vqjzb8fF2U3F9yCDUTI/GtBQTyFjAEuFybsV4Ghgy0wIiamhXax/VGLu4iWSNko4DujY6x pBFAPVttRHVt4f2NCCo4lCl1cHpAOOpt29BDeAgggo+6XAy9GAGmDDCgLN3jPyAvaVJtTufecdK v2Zg9mIcAsztxn X-Received: by 2002:a05:622a:1b20:b0:4e8:b107:aad9 with SMTP id d75a77b69052e-4ed15bda5bemr8975331cf.20.1761685217678; Tue, 28 Oct 2025 14:00:17 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFnUF9//FtOSU7LqGrJrVJ8zqWq03xoOf7Pt1/gAkOPIjfYtmsuwfLjxE78/4Mq4uZXYjnXoA== X-Received: by 2002:a05:622a:1b20:b0:4e8:b107:aad9 with SMTP id d75a77b69052e-4ed15bda5bemr8973301cf.20.1761685215401; Tue, 28 Oct 2025 14:00:15 -0700 (PDT) Received: from umbar.lan (2001-14ba-a0c3-3a00-264b-feff-fe8b-be8a.rev.dnainternet.fi. [2001:14ba:a0c3:3a00:264b:feff:fe8b:be8a]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-59301f861f5sm3283594e87.107.2025.10.28.14.00.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 28 Oct 2025 14:00:14 -0700 (PDT) From: Dmitry Baryshkov Date: Tue, 28 Oct 2025 23:00:06 +0200 Subject: [PATCH 7/7] arm64: dts: qcom: add gpu_zap_shader label Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20251028-dt-zap-shader-v1-7-7eccb823b986@oss.qualcomm.com> References: <20251028-dt-zap-shader-v1-0-7eccb823b986@oss.qualcomm.com> In-Reply-To: <20251028-dt-zap-shader-v1-0-7eccb823b986@oss.qualcomm.com> To: Bjorn Andersson , Konrad Dybcio , Rob Herring , Krzysztof Kozlowski , Conor Dooley , cros-qcom-dts-watchers@chromium.org Cc: linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=40384; i=dmitry.baryshkov@oss.qualcomm.com; h=from:subject:message-id; bh=iTqj4rbfKgBgi+AUvAxT5DauIF+8OfMFLFnMVyLwlUI=; b=owEBbQGS/pANAwAKAYs8ij4CKSjVAcsmYgBpAS7U60E5fWVIg49w8v4wOMsx5/fYrDoc10EEj LyUERRaBriJATMEAAEKAB0WIQRMcISVXLJjVvC4lX+LPIo+Aiko1QUCaQEu1AAKCRCLPIo+Aiko 1c++B/40MjOW/zo7S5As66QFDDgwOq6eZ6MkxnJvF87/FtxTl7LoAXvosAbNWYZca7b2nGbhcjT 75V6GF8OzJ6K5LV9hOe/U2KafnZkq5C2e5tzXmzrwSzK3ARFO9mmcHXmrFW9WsaJTn+1p1kTx34 tol7HO9CMWseLAVSJGVm7V4CTOTGPfupXGsw9RFg0IJZiUKbOWV/b0imQ4CN7dJgm+Suxb+ge68 NxsBe9it2GnwFpR0NzoiadShjSutPYh9lpf3HwW65mLCfDV916wkPij00XEwgNkohATjLrAXMF2 drGT56r6J9Q5SuaLPxnomaybZykvj9XZS6cydqAvV3b6qU9F X-Developer-Key: i=dmitry.baryshkov@oss.qualcomm.com; a=openpgp; fpr=8F88381DD5C873E4AE487DA5199BF1243632046A X-Proofpoint-GUID: --0kQjRTFJVy0MWxZrOJ-5LFCGv3xcpj X-Proofpoint-ORIG-GUID: --0kQjRTFJVy0MWxZrOJ-5LFCGv3xcpj X-Authority-Analysis: v=2.4 cv=PcvyRyhd c=1 sm=1 tr=0 ts=69012ee5 cx=c_pps a=WeENfcodrlLV9YRTxbY/uA==:117 a=xqWC_Br6kY4A:10 a=IkcTkHD0fZMA:10 a=x6icFKpwvdMA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=EUspDBNiAAAA:8 a=_TrE6IQmKm8WOfCTE7gA:9 a=QEXdDO2ut3YA:10 a=kacYvNCVWA4VmyqE58fU:22 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUxMDI4MDE3NiBTYWx0ZWRfX+Cny3Nkf9D/k EQvvy6i2mr4eBTT7Qw7lvUFIwn8TWhWuSSEj0OI8Jle7nHvn3uilQBfqSi6KDDXaWs/ObhIZs6X e20ymzVeRanWBswaQTz45ayFaHF8WVJ16mhcjH/Qkc+5Hf5FaF/9lAOQR7lC5G6lhRO7DNKJtYZ pCnvyNrU2++FH7VQGiIlHZ/aQLb7YIA6GzS5ItyKIBQaeqb3RaTZNxwsxIlO1cMqradrzp4a11Z ScAAq8VYJUKH+QxDR61IdBMwh6OqkwhONgidrVa0MUn1/yMZzAHuVyXYmSgnxtM04jyI8+BnoAd cTc8BZd5bROGn8MbmKEr9hd/s0cfAVe+BgSJeytCnGRGH5t5Y3t04fzbRpX0ix8Dpl3452mR4kv lwTLVdk+sH3Zj1mVi5fpvJi22PaEyA== X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1121,Hydra:6.1.9,FMLib:17.12.80.40 definitions=2025-10-28_08,2025-10-22_01,2025-03-28_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 phishscore=0 clxscore=1015 spamscore=0 adultscore=0 priorityscore=1501 lowpriorityscore=0 malwarescore=0 suspectscore=0 impostorscore=0 bulkscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2510240001 definitions=main-2510280176 Patching existing DT nodes based on full path is error prone and generally not recommended. Follow the pattern introduced in the last platforms, add gpu_zap_shader label to the ZAP node and use it in the board files. Signed-off-by: Dmitry Baryshkov Reviewed-by: David Heidelberg Reviewed-by: Konrad Dybcio --- arch/arm64/boot/dts/qcom/apq8096-db820c.dts | 6 +++--- arch/arm64/boot/dts/qcom/msm8996-oneplus3.dts | 6 +++--- arch/arm64/boot/dts/qcom/msm8996-oneplus3t.dts | 6 +++--- arch/arm64/boot/dts/qcom/msm8996-xiaomi-gemini.dts | 6 ++---- arch/arm64/boot/dts/qcom/msm8996.dtsi | 2 +- arch/arm64/boot/dts/qcom/msm8996pro-xiaomi-natrium.dts | 6 ++---- arch/arm64/boot/dts/qcom/msm8996pro-xiaomi-scorpio.dts | 6 ++---- arch/arm64/boot/dts/qcom/qcm2290.dtsi | 2 +- arch/arm64/boot/dts/qcom/qrb2210-rb1.dts | 6 +++--- arch/arm64/boot/dts/qcom/qrb4210-rb2.dts | 6 +++--- arch/arm64/boot/dts/qcom/qrb5165-rb5.dts | 6 +++--- arch/arm64/boot/dts/qcom/sa8295p-adp.dts | 6 +++--- arch/arm64/boot/dts/qcom/sc8180x-lenovo-flex-5g.dts | 6 +++--- arch/arm64/boot/dts/qcom/sc8180x-primus.dts | 6 +++--- arch/arm64/boot/dts/qcom/sc8180x.dtsi | 2 +- arch/arm64/boot/dts/qcom/sc8280xp-crd.dts | 6 +++--- arch/arm64/boot/dts/qcom/sc8280xp-el2.dtso | 6 ++---- arch/arm64/boot/dts/qcom/sc8280xp-huawei-gaokun3.dts | 6 +++--- arch/arm64/boot/dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dts | 6 +++--- arch/arm64/boot/dts/qcom/sc8280xp-microsoft-arcata.dts | 6 +++--- arch/arm64/boot/dts/qcom/sc8280xp-microsoft-blackrock.dts | 6 +++--- arch/arm64/boot/dts/qcom/sc8280xp.dtsi | 2 +- arch/arm64/boot/dts/qcom/sdm670-google-sargo.dts | 6 +++--- arch/arm64/boot/dts/qcom/sdm670.dtsi | 2 +- arch/arm64/boot/dts/qcom/sdm845-db845c.dts | 7 ++++--- arch/arm64/boot/dts/qcom/sdm845-lg-judyln.dts | 6 ++---- arch/arm64/boot/dts/qcom/sdm845-lg-judyp.dts | 6 ++---- arch/arm64/boot/dts/qcom/sdm845-mtp.dts | 6 +++--- arch/arm64/boot/dts/qcom/sdm845-oneplus-common.dtsi | 6 +++--- arch/arm64/boot/dts/qcom/sdm845-samsung-starqltechn.dts | 6 +++--- arch/arm64/boot/dts/qcom/sdm845-shift-axolotl.dts | 6 +++--- arch/arm64/boot/dts/qcom/sdm845-sony-xperia-tama.dtsi | 6 +++--- arch/arm64/boot/dts/qcom/sdm845-xiaomi-beryllium-common.dtsi | 6 +++--- arch/arm64/boot/dts/qcom/sdm845-xiaomi-polaris.dts | 6 +++--- arch/arm64/boot/dts/qcom/sdm845.dtsi | 2 +- arch/arm64/boot/dts/qcom/sdm850-huawei-matebook-e-2019.dts | 6 +++--- arch/arm64/boot/dts/qcom/sdm850-lenovo-yoga-c630.dts | 8 ++++---- arch/arm64/boot/dts/qcom/sm6115-fxtec-pro1x.dts | 6 +++--- arch/arm64/boot/dts/qcom/sm6115.dtsi | 2 +- arch/arm64/boot/dts/qcom/sm6115p-lenovo-j606f.dts | 6 +++--- arch/arm64/boot/dts/qcom/sm8150.dtsi | 2 +- arch/arm64/boot/dts/qcom/sm8250-mtp.dts | 6 +++--- arch/arm64/boot/dts/qcom/sm8250-xiaomi-elish-common.dtsi | 6 +++--- arch/arm64/boot/dts/qcom/sm8250-xiaomi-pipa.dts | 6 +++--- arch/arm64/boot/dts/qcom/sm8250.dtsi | 2 +- arch/arm64/boot/dts/qcom/sm8350-hdk.dts | 6 +++--- arch/arm64/boot/dts/qcom/sm8350.dtsi | 2 +- arch/arm64/boot/dts/qcom/sm8450-hdk.dts | 6 +++--- arch/arm64/boot/dts/qcom/sm8450.dtsi | 2 +- arch/arm64/boot/dts/qcom/sm8550-hdk.dts | 6 +++--- arch/arm64/boot/dts/qcom/sm8550-mtp.dts | 6 +++--- arch/arm64/boot/dts/qcom/sm8550-qrd.dts | 6 +++--- arch/arm64/boot/dts/qcom/sm8550.dtsi | 2 +- arch/arm64/boot/dts/qcom/sm8650-hdk.dts | 6 +++--- arch/arm64/boot/dts/qcom/sm8650-qrd.dts | 6 +++--- arch/arm64/boot/dts/qcom/sm8650.dtsi | 2 +- arch/arm64/boot/dts/qcom/x1e001de-devkit.dts | 6 +++--- arch/arm64/boot/dts/qcom/x1e78100-lenovo-thinkpad-t14s.dtsi | 6 +++--- arch/arm64/boot/dts/qcom/x1e80100-asus-vivobook-s15.dts | 6 +++--- arch/arm64/boot/dts/qcom/x1e80100-dell-xps13-9345.dts | 6 +++--- arch/arm64/boot/dts/qcom/x1e80100-hp-elitebook-ultra-g1q.dts | 6 ++---- arch/arm64/boot/dts/qcom/x1e80100-lenovo-yoga-slim7x.dts | 6 +++--- arch/arm64/boot/dts/qcom/x1e80100-microsoft-romulus.dtsi | 8 ++++---- arch/arm64/boot/dts/qcom/x1e80100-qcp.dts | 6 +++--- 64 files changed, 162 insertions(+), 175 deletions(-) diff --git a/arch/arm64/boot/dts/qcom/apq8096-db820c.dts b/arch/arm64/boot/= dts/qcom/apq8096-db820c.dts index 99658b0bca8461cc3903da9c8c86c898bbf61948..9fa70ff6887b78caf1826f653a5= caccd9653269c 100644 --- a/arch/arm64/boot/dts/qcom/apq8096-db820c.dts +++ b/arch/arm64/boot/dts/qcom/apq8096-db820c.dts @@ -201,10 +201,10 @@ &camss { =20 &gpu { status =3D "okay"; +}; =20 - zap-shader { - firmware-name =3D "qcom/apq8096/a530_zap.mbn"; - }; +&gpu_zap_shader { + firmware-name =3D "qcom/apq8096/a530_zap.mbn"; }; =20 &hsusb_phy1 { diff --git a/arch/arm64/boot/dts/qcom/msm8996-oneplus3.dts b/arch/arm64/boo= t/dts/qcom/msm8996-oneplus3.dts index 220eeb31fdc70b89b3e237d1f6643c465bda5238..0bb9e3d8f7144a853bbde8dd6ae= cf7b6f63c9cd3 100644 --- a/arch/arm64/boot/dts/qcom/msm8996-oneplus3.dts +++ b/arch/arm64/boot/dts/qcom/msm8996-oneplus3.dts @@ -27,10 +27,10 @@ &battery { =20 &gpu { status =3D "okay"; +}; =20 - zap-shader { - firmware-name =3D "qcom/msm8996/oneplus3/a530_zap.mbn"; - }; +&gpu_zap_shader { + firmware-name =3D "qcom/msm8996/oneplus3/a530_zap.mbn"; }; =20 &mss_pil { diff --git a/arch/arm64/boot/dts/qcom/msm8996-oneplus3t.dts b/arch/arm64/bo= ot/dts/qcom/msm8996-oneplus3t.dts index f772618e80c702cb8995965dffbf5992a9f66490..1d7b27c5aff60cfa5fb19d2285d= 4b8ef96185195 100644 --- a/arch/arm64/boot/dts/qcom/msm8996-oneplus3t.dts +++ b/arch/arm64/boot/dts/qcom/msm8996-oneplus3t.dts @@ -28,10 +28,10 @@ &battery { =20 &gpu { status =3D "okay"; +}; =20 - zap-shader { - firmware-name =3D "qcom/msm8996/oneplus3t/a530_zap.mbn"; - }; +&gpu_zap_shader { + firmware-name =3D "qcom/msm8996/oneplus3t/a530_zap.mbn"; }; =20 &mss_pil { diff --git a/arch/arm64/boot/dts/qcom/msm8996-xiaomi-gemini.dts b/arch/arm6= 4/boot/dts/qcom/msm8996-xiaomi-gemini.dts index bd3f39e1b98fb6360950b646fd05c6b7036dd0d5..3c6a40212a8dce5310d43bbcc5f= 7b83e7c48a27f 100644 --- a/arch/arm64/boot/dts/qcom/msm8996-xiaomi-gemini.dts +++ b/arch/arm64/boot/dts/qcom/msm8996-xiaomi-gemini.dts @@ -91,10 +91,8 @@ synaptics@20 { =20 }; =20 -&gpu { - zap-shader { - firmware-name =3D "qcom/msm8996/gemini/a530_zap.mbn"; - }; +&gpu_zap_shader { + firmware-name =3D "qcom/msm8996/gemini/a530_zap.mbn"; }; =20 &mdss_dsi0 { diff --git a/arch/arm64/boot/dts/qcom/msm8996.dtsi b/arch/arm64/boot/dts/qc= om/msm8996.dtsi index c75b522f6eba66afeb71be5d81624183641bde71..b341dec271930776795a75cdbc4= 81d1f10f0ac2b 100644 --- a/arch/arm64/boot/dts/qcom/msm8996.dtsi +++ b/arch/arm64/boot/dts/qcom/msm8996.dtsi @@ -1333,7 +1333,7 @@ opp-133000000 { }; }; =20 - zap-shader { + gpu_zap_shader: zap-shader { memory-region =3D <&gpu_mem>; }; }; diff --git a/arch/arm64/boot/dts/qcom/msm8996pro-xiaomi-natrium.dts b/arch/= arm64/boot/dts/qcom/msm8996pro-xiaomi-natrium.dts index 443599a5a5dd573a1ac2a83f64c5016c36d27020..f8ab03f106a1b736d2912409b07= e2bcb98e33953 100644 --- a/arch/arm64/boot/dts/qcom/msm8996pro-xiaomi-natrium.dts +++ b/arch/arm64/boot/dts/qcom/msm8996pro-xiaomi-natrium.dts @@ -39,10 +39,8 @@ touchscreen@20 { }; }; =20 -&gpu { - zap-shader { - firmware-name =3D "qcom/msm8996/natrium/a530_zap.mbn"; - }; +&gpu_zap_shader { + firmware-name =3D "qcom/msm8996/natrium/a530_zap.mbn"; }; =20 &mdss_dsi0 { diff --git a/arch/arm64/boot/dts/qcom/msm8996pro-xiaomi-scorpio.dts b/arch/= arm64/boot/dts/qcom/msm8996pro-xiaomi-scorpio.dts index 33d84ac541e1c52028ffa4d86d602e0dc876988f..1cc33c3123a4e0da9fe6beb982b= 38379eb6844ff 100644 --- a/arch/arm64/boot/dts/qcom/msm8996pro-xiaomi-scorpio.dts +++ b/arch/arm64/boot/dts/qcom/msm8996pro-xiaomi-scorpio.dts @@ -91,10 +91,8 @@ touchscreen: atmel-mxt-ts@4a { }; }; =20 -&gpu { - zap-shader { - firmware-name =3D "qcom/msm8996/scorpio/a530_zap.mbn"; - }; +&gpu_zap_shader { + firmware-name =3D "qcom/msm8996/scorpio/a530_zap.mbn"; }; =20 &mdp_smmu { diff --git a/arch/arm64/boot/dts/qcom/qcm2290.dtsi b/arch/arm64/boot/dts/qc= om/qcm2290.dtsi index c6544ffa6f328e901048b3e6bfd516bf11af3901..b909306b3f126f8479cb1a4cd03= 25b0af1f38787 100644 --- a/arch/arm64/boot/dts/qcom/qcm2290.dtsi +++ b/arch/arm64/boot/dts/qcom/qcm2290.dtsi @@ -1625,7 +1625,7 @@ gpu: gpu@5900000 { =20 status =3D "disabled"; =20 - zap-shader { + gpu_zap_shader: zap-shader { memory-region =3D <&pil_gpu_mem>; }; =20 diff --git a/arch/arm64/boot/dts/qcom/qrb2210-rb1.dts b/arch/arm64/boot/dts= /qcom/qrb2210-rb1.dts index 43af25d17aa8314354b1ecb8617510cdd6c857a3..5cbbdae497d8a29521dece6925c= e1f2022a8f9ba 100644 --- a/arch/arm64/boot/dts/qcom/qrb2210-rb1.dts +++ b/arch/arm64/boot/dts/qcom/qrb2210-rb1.dts @@ -261,10 +261,10 @@ &gpi_dma0 { =20 &gpu { status =3D "okay"; +}; =20 - zap-shader { - firmware-name =3D "qcom/qcm2290/a702_zap.mbn"; - }; +&gpu_zap_shader { + firmware-name =3D "qcom/qcm2290/a702_zap.mbn"; }; =20 &i2c2_gpio { diff --git a/arch/arm64/boot/dts/qcom/qrb4210-rb2.dts b/arch/arm64/boot/dts= /qcom/qrb4210-rb2.dts index bdf2d66e40c62596b8b024de833835a0750df35d..0cd36c54632fa32353e679193f2= 5a12c6e5c4a49 100644 --- a/arch/arm64/boot/dts/qcom/qrb4210-rb2.dts +++ b/arch/arm64/boot/dts/qcom/qrb4210-rb2.dts @@ -245,10 +245,10 @@ &gpi_dma0 { =20 &gpu { status =3D "okay"; +}; =20 - zap-shader { - firmware-name =3D "qcom/qrb4210/a610_zap.mbn"; - }; +&gpu_zap_shader { + firmware-name =3D "qcom/qrb4210/a610_zap.mbn"; }; =20 &i2c2_gpio { diff --git a/arch/arm64/boot/dts/qcom/qrb5165-rb5.dts b/arch/arm64/boot/dts= /qcom/qrb5165-rb5.dts index 964e33b6e74aee9582d8eba32f976c6998d36c68..71b42e76f03d626ef8357ac66ef= 6c850344a479d 100644 --- a/arch/arm64/boot/dts/qcom/qrb5165-rb5.dts +++ b/arch/arm64/boot/dts/qcom/qrb5165-rb5.dts @@ -594,10 +594,10 @@ &gmu { =20 &gpu { status =3D "okay"; +}; =20 - zap-shader { - firmware-name =3D "qcom/sm8250/a650_zap.mbn"; - }; +&gpu_zap_shader { + firmware-name =3D "qcom/sm8250/a650_zap.mbn"; }; =20 /* LS-I2C0 */ diff --git a/arch/arm64/boot/dts/qcom/sa8295p-adp.dts b/arch/arm64/boot/dts= /qcom/sa8295p-adp.dts index 524d44cbae740577e010f156308a715962db1a36..d28d691624279161ab367930816= 6b1acac2527ea 100644 --- a/arch/arm64/boot/dts/qcom/sa8295p-adp.dts +++ b/arch/arm64/boot/dts/qcom/sa8295p-adp.dts @@ -338,10 +338,10 @@ &gmu { =20 &gpu { status =3D "okay"; +}; =20 - zap-shader { - firmware-name =3D "qcom/sa8295p/a690_zap.mbn"; - }; +&gpu_zap_shader { + firmware-name =3D "qcom/sa8295p/a690_zap.mbn"; }; =20 &gpu_smmu { diff --git a/arch/arm64/boot/dts/qcom/sc8180x-lenovo-flex-5g.dts b/arch/arm= 64/boot/dts/qcom/sc8180x-lenovo-flex-5g.dts index 625a155a584ae4ca14c6f373ef21b773ea7311cb..d86a31ddede29d4ebdad8f1f55b= ded2343bc14ed 100644 --- a/arch/arm64/boot/dts/qcom/sc8180x-lenovo-flex-5g.dts +++ b/arch/arm64/boot/dts/qcom/sc8180x-lenovo-flex-5g.dts @@ -350,10 +350,10 @@ vreg_l16e_3p0: ldo16 { =20 &gpu { status =3D "okay"; +}; =20 - zap-shader { - firmware-name =3D "qcom/sc8180x/LENOVO/82AK/qcdxkmsuc8180.mbn"; - }; +&gpu_zap_shader { + firmware-name =3D "qcom/sc8180x/LENOVO/82AK/qcdxkmsuc8180.mbn"; }; =20 &i2c1 { diff --git a/arch/arm64/boot/dts/qcom/sc8180x-primus.dts b/arch/arm64/boot/= dts/qcom/sc8180x-primus.dts index 069953dcad378448800d45e14931efe1fe1a69fc..aff398390eba77c0891cb654f5f= 8d4938fbff81b 100644 --- a/arch/arm64/boot/dts/qcom/sc8180x-primus.dts +++ b/arch/arm64/boot/dts/qcom/sc8180x-primus.dts @@ -444,10 +444,10 @@ vreg_l16e_3p0: ldo16 { =20 &gpu { status =3D "okay"; +}; =20 - zap-shader { - firmware-name =3D "qcom/sc8180x/qcdxkmsuc8180.mbn"; - }; +&gpu_zap_shader { + firmware-name =3D "qcom/sc8180x/qcdxkmsuc8180.mbn"; }; =20 &i2c1 { diff --git a/arch/arm64/boot/dts/qcom/sc8180x.dtsi b/arch/arm64/boot/dts/qc= om/sc8180x.dtsi index 42ab76d52ae21c39d5855e20e11f9cb2319f3afa..8319d892c6e490a1a1c35f5558d= c8c6d4e71034f 100644 --- a/arch/arm64/boot/dts/qcom/sc8180x.dtsi +++ b/arch/arm64/boot/dts/qcom/sc8180x.dtsi @@ -2279,7 +2279,7 @@ gpu: gpu@2c00000 { =20 status =3D "disabled"; =20 - zap-shader { + gpu_zap_shader: zap-shader { memory-region =3D <&gpu_mem>; }; =20 diff --git a/arch/arm64/boot/dts/qcom/sc8280xp-crd.dts b/arch/arm64/boot/dt= s/qcom/sc8280xp-crd.dts index 858f71737d93fd8591ba42eb363748ac51699d63..c53e00cae465a6e7f4db4d60e28= a0badefb1d912 100644 --- a/arch/arm64/boot/dts/qcom/sc8280xp-crd.dts +++ b/arch/arm64/boot/dts/qcom/sc8280xp-crd.dts @@ -504,10 +504,10 @@ &gpi_dma2 { =20 &gpu { status =3D "okay"; +}; =20 - zap-shader { - firmware-name =3D "qcom/sc8280xp/qcdxkmsuc8280.mbn"; - }; +&gpu_zap_shader { + firmware-name =3D "qcom/sc8280xp/qcdxkmsuc8280.mbn"; }; =20 &mdss0 { diff --git a/arch/arm64/boot/dts/qcom/sc8280xp-el2.dtso b/arch/arm64/boot/d= ts/qcom/sc8280xp-el2.dtso index 25d1fa4bc2055e67db0508aa09c8a8bd7fa01687..cff3735a12dde8eccc45f7fa516= 6fe163ae5e95f 100644 --- a/arch/arm64/boot/dts/qcom/sc8280xp-el2.dtso +++ b/arch/arm64/boot/dts/qcom/sc8280xp-el2.dtso @@ -8,10 +8,8 @@ /plugin/; =20 /* We can't and don't need to use zap shader in EL2 as linux can zap the g= pu on it's own. */ -&gpu { - zap-shader { - status =3D "disabled"; - }; +&gpu_zap_shader { + status =3D "disabled"; }; =20 /* diff --git a/arch/arm64/boot/dts/qcom/sc8280xp-huawei-gaokun3.dts b/arch/ar= m64/boot/dts/qcom/sc8280xp-huawei-gaokun3.dts index 69d0d6c12e58653f8cb56cb7d383ad9d64699d18..9819454abe131b6e719ddcb9e84= 874e5e3e97d63 100644 --- a/arch/arm64/boot/dts/qcom/sc8280xp-huawei-gaokun3.dts +++ b/arch/arm64/boot/dts/qcom/sc8280xp-huawei-gaokun3.dts @@ -595,10 +595,10 @@ &gpi_dma2 { =20 &gpu { status =3D "okay"; +}; =20 - zap-shader { - firmware-name =3D "qcom/sc8280xp/HUAWEI/gaokun3/qcdxkmsuc8280.mbn"; - }; +&gpu_zap_shader { + firmware-name =3D "qcom/sc8280xp/HUAWEI/gaokun3/qcdxkmsuc8280.mbn"; }; =20 &i2c4 { diff --git a/arch/arm64/boot/dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dts b/a= rch/arm64/boot/dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dts index 87bb42d9cc327a1d1811f15605a369dc8760557d..fe9b3ebd64593cfbad9f298abfa= caf25f5037476 100644 --- a/arch/arm64/boot/dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dts +++ b/arch/arm64/boot/dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dts @@ -717,10 +717,10 @@ &gpi_dma2 { =20 &gpu { status =3D "okay"; +}; =20 - zap-shader { - firmware-name =3D "qcom/sc8280xp/LENOVO/21BX/qcdxkmsuc8280.mbn"; - }; +&gpu_zap_shader { + firmware-name =3D "qcom/sc8280xp/LENOVO/21BX/qcdxkmsuc8280.mbn"; }; =20 &mdss0 { diff --git a/arch/arm64/boot/dts/qcom/sc8280xp-microsoft-arcata.dts b/arch/= arm64/boot/dts/qcom/sc8280xp-microsoft-arcata.dts index ea50e370f69837ec9412efc17e2a41034b0736fd..f2b4470d4407fb5b6a3dbac8bc9= 72c010c31bd06 100644 --- a/arch/arm64/boot/dts/qcom/sc8280xp-microsoft-arcata.dts +++ b/arch/arm64/boot/dts/qcom/sc8280xp-microsoft-arcata.dts @@ -457,10 +457,10 @@ &gpi_dma2 { =20 &gpu { status =3D "okay"; +}; =20 - zap-shader { - firmware-name =3D "qcom/sc8280xp/MICROSOFT/SurfacePro9/qcdxkmsuc8280.mbn= "; - }; +&gpu_zap_shader { + firmware-name =3D "qcom/sc8280xp/MICROSOFT/SurfacePro9/qcdxkmsuc8280.mbn"; }; =20 &mdss0 { diff --git a/arch/arm64/boot/dts/qcom/sc8280xp-microsoft-blackrock.dts b/ar= ch/arm64/boot/dts/qcom/sc8280xp-microsoft-blackrock.dts index 48b60f6186fc1d69178902f2cc3bee324144202c..00bbeeef6f14dd89de506e33742= f8f73435ac021 100644 --- a/arch/arm64/boot/dts/qcom/sc8280xp-microsoft-blackrock.dts +++ b/arch/arm64/boot/dts/qcom/sc8280xp-microsoft-blackrock.dts @@ -574,10 +574,10 @@ &gpi_dma2 { =20 &gpu { status =3D "okay"; +}; =20 - zap-shader { - firmware-name =3D "qcom/sc8280xp/microsoft/blackrock/qcdxkmsuc8280.mbn"; - }; +&gpu_zap_shader { + firmware-name =3D "qcom/sc8280xp/microsoft/blackrock/qcdxkmsuc8280.mbn"; }; =20 &mdss0 { diff --git a/arch/arm64/boot/dts/qcom/sc8280xp.dtsi b/arch/arm64/boot/dts/q= com/sc8280xp.dtsi index b7044b9d656e4991e737f7008a7cf8f0619dd115..5334adebf278248b68b92c1e8e7= 54f680155dbb3 100644 --- a/arch/arm64/boot/dts/qcom/sc8280xp.dtsi +++ b/arch/arm64/boot/dts/qcom/sc8280xp.dtsi @@ -3371,7 +3371,7 @@ gpu: gpu@3d00000 { =20 status =3D "disabled"; =20 - zap-shader { + gpu_zap_shader: zap-shader { memory-region =3D <&pil_gpu_mem>; }; =20 diff --git a/arch/arm64/boot/dts/qcom/sdm670-google-sargo.dts b/arch/arm64/= boot/dts/qcom/sdm670-google-sargo.dts index 760f21f19ca472d620ab1a0703de6e0d69237b55..ed55646ca419d79aa2408c5b86f= 9c43364a6c6ce 100644 --- a/arch/arm64/boot/dts/qcom/sdm670-google-sargo.dts +++ b/arch/arm64/boot/dts/qcom/sdm670-google-sargo.dts @@ -404,10 +404,10 @@ &gpi_dma1 { =20 &gpu { status =3D "okay"; +}; =20 - zap-shader { - firmware-name =3D "qcom/sdm670/sargo/a615_zap.mbn"; - }; +&gpu_zap_shader { + firmware-name =3D "qcom/sdm670/sargo/a615_zap.mbn"; }; =20 &i2c9 { diff --git a/arch/arm64/boot/dts/qcom/sdm670.dtsi b/arch/arm64/boot/dts/qco= m/sdm670.dtsi index 57a3ffedc432b08aa7d7918c9bd0f9714dbb3951..b8a8dcbdfbe33e72cb259d6a401= 1fc9b3d6144a8 100644 --- a/arch/arm64/boot/dts/qcom/sdm670.dtsi +++ b/arch/arm64/boot/dts/qcom/sdm670.dtsi @@ -1382,7 +1382,7 @@ gpu: gpu@5000000 { =20 status =3D "disabled"; =20 - zap-shader { + gpu_zap_shader: zap-shader { memory-region =3D <&gpu_mem>; }; =20 diff --git a/arch/arm64/boot/dts/qcom/sdm845-db845c.dts b/arch/arm64/boot/d= ts/qcom/sdm845-db845c.dts index 662722adf20b7d1b6a44a28ba3bbf6b3e373cd0d..ce23f87e0316b6bfb50b387f483= 2cc4c35178071 100644 --- a/arch/arm64/boot/dts/qcom/sdm845-db845c.dts +++ b/arch/arm64/boot/dts/qcom/sdm845-db845c.dts @@ -455,9 +455,10 @@ &gpi_dma1 { =20 &gpu { status =3D "okay"; - zap-shader { - firmware-name =3D "qcom/sdm845/a630_zap.mbn"; - }; +}; + +&gpu_zap_shader { + firmware-name =3D "qcom/sdm845/a630_zap.mbn"; }; =20 &i2c10 { diff --git a/arch/arm64/boot/dts/qcom/sdm845-lg-judyln.dts b/arch/arm64/boo= t/dts/qcom/sdm845-lg-judyln.dts index a12723310c8b630a4961de671ea8b60f1f8b512b..09bfcef42402911a3f0081819de= 23398e35ec973 100644 --- a/arch/arm64/boot/dts/qcom/sdm845-lg-judyln.dts +++ b/arch/arm64/boot/dts/qcom/sdm845-lg-judyln.dts @@ -47,10 +47,8 @@ &cdsp_pas { firmware-name =3D "qcom/sdm845/judyln/cdsp.mbn"; }; =20 -&gpu { - zap-shader { - firmware-name =3D "qcom/sdm845/judyln/a630_zap.mbn"; - }; +&gpu_zap_shader { + firmware-name =3D "qcom/sdm845/judyln/a630_zap.mbn"; }; =20 &mss_pil { diff --git a/arch/arm64/boot/dts/qcom/sdm845-lg-judyp.dts b/arch/arm64/boot= /dts/qcom/sdm845-lg-judyp.dts index d17d4d4d56097a73f9f54c0b70bd1b19ac693e64..ffe1da2227f00fbb26a4bf1eb88= 223136d7851a9 100644 --- a/arch/arm64/boot/dts/qcom/sdm845-lg-judyp.dts +++ b/arch/arm64/boot/dts/qcom/sdm845-lg-judyp.dts @@ -33,10 +33,8 @@ &cdsp_pas { firmware-name =3D "qcom/sdm845/judyp/cdsp.mbn"; }; =20 -&gpu { - zap-shader { - firmware-name =3D "qcom/sdm845/judyp/a630_zap.mbn"; - }; +&gpu_zap_shader { + firmware-name =3D "qcom/sdm845/judyp/a630_zap.mbn"; }; =20 &mss_pil { diff --git a/arch/arm64/boot/dts/qcom/sdm845-mtp.dts b/arch/arm64/boot/dts/= qcom/sdm845-mtp.dts index 971bdb9c3693bfafab820a5242a82874340b6c4f..091568642faa78c2072cf8a1bc7= f6d4ac72eea15 100644 --- a/arch/arm64/boot/dts/qcom/sdm845-mtp.dts +++ b/arch/arm64/boot/dts/qcom/sdm845-mtp.dts @@ -416,10 +416,10 @@ &gcc { =20 &gpu { status =3D "okay"; +}; =20 - zap-shader { - firmware-name =3D "qcom/sdm845/a630_zap.mbn"; - }; +&gpu_zap_shader { + firmware-name =3D "qcom/sdm845/a630_zap.mbn"; }; =20 &i2c10 { diff --git a/arch/arm64/boot/dts/qcom/sdm845-oneplus-common.dtsi b/arch/arm= 64/boot/dts/qcom/sdm845-oneplus-common.dtsi index 3fe71adf1dbb0f05fc4aa0d0bf4d0c6bf14af6e4..fd7fdc1f0749380c2a163047383= 9005f17aba63b 100644 --- a/arch/arm64/boot/dts/qcom/sdm845-oneplus-common.dtsi +++ b/arch/arm64/boot/dts/qcom/sdm845-oneplus-common.dtsi @@ -339,10 +339,10 @@ &gcc { =20 &gpu { status =3D "okay"; +}; =20 - zap-shader { - firmware-name =3D "qcom/sdm845/oneplus6/a630_zap.mbn"; - }; +&gpu_zap_shader { + firmware-name =3D "qcom/sdm845/oneplus6/a630_zap.mbn"; }; =20 &i2c10 { diff --git a/arch/arm64/boot/dts/qcom/sdm845-samsung-starqltechn.dts b/arch= /arm64/boot/dts/qcom/sdm845-samsung-starqltechn.dts index 45e9dda007cec2500bf5b6990e7d8b1ba56a67c6..5d41a92cfebffe0f843dd387de4= 73f0942f9e5a8 100644 --- a/arch/arm64/boot/dts/qcom/sdm845-samsung-starqltechn.dts +++ b/arch/arm64/boot/dts/qcom/sdm845-samsung-starqltechn.dts @@ -251,10 +251,10 @@ vib_pwm: pwm { =20 &gpu { status =3D "okay"; +}; =20 - zap-shader { - firmware-name =3D "qcom/sdm845/starqltechn/a630_zap.mbn"; - }; +&gpu_zap_shader { + firmware-name =3D "qcom/sdm845/starqltechn/a630_zap.mbn"; }; =20 &mdss { diff --git a/arch/arm64/boot/dts/qcom/sdm845-shift-axolotl.dts b/arch/arm64= /boot/dts/qcom/sdm845-shift-axolotl.dts index 238471267e1feace68487aa25f97748704ebb18c..ddc2b3ca3bc576d0548e2ecd43d= d16196b81f38d 100644 --- a/arch/arm64/boot/dts/qcom/sdm845-shift-axolotl.dts +++ b/arch/arm64/boot/dts/qcom/sdm845-shift-axolotl.dts @@ -423,10 +423,10 @@ &gcc { =20 &gpu { status =3D "okay"; +}; =20 - zap-shader { - firmware-name =3D "qcom/sdm845/axolotl/a630_zap.mbn"; - }; +&gpu_zap_shader { + firmware-name =3D "qcom/sdm845/axolotl/a630_zap.mbn"; }; =20 &i2c5 { diff --git a/arch/arm64/boot/dts/qcom/sdm845-sony-xperia-tama.dtsi b/arch/a= rm64/boot/dts/qcom/sdm845-sony-xperia-tama.dtsi index f3ff0b3352bcf7c3eccf7ebe615cd2e40cee7847..7dc9349eedfd92199c949b091b6= a0ab1c5990318 100644 --- a/arch/arm64/boot/dts/qcom/sdm845-sony-xperia-tama.dtsi +++ b/arch/arm64/boot/dts/qcom/sdm845-sony-xperia-tama.dtsi @@ -426,10 +426,10 @@ &gpi_dma1 { =20 &gpu { status =3D "okay"; +}; =20 - zap-shader { - firmware-name =3D "qcom/sdm845/Sony/tama/a630_zap.mbn"; - }; +&gpu_zap_shader { + firmware-name =3D "qcom/sdm845/Sony/tama/a630_zap.mbn"; }; =20 &i2c5 { diff --git a/arch/arm64/boot/dts/qcom/sdm845-xiaomi-beryllium-common.dtsi b= /arch/arm64/boot/dts/qcom/sdm845-xiaomi-beryllium-common.dtsi index 5b30ace99579d014d762865377d5e9fdd5bab371..785006a15e9795db1605c3bb5a5= 861142d78458c 100644 --- a/arch/arm64/boot/dts/qcom/sdm845-xiaomi-beryllium-common.dtsi +++ b/arch/arm64/boot/dts/qcom/sdm845-xiaomi-beryllium-common.dtsi @@ -246,10 +246,10 @@ &gpi_dma1 { =20 &gpu { status =3D "okay"; +}; =20 - zap-shader { - firmware-name =3D "qcom/sdm845/beryllium/a630_zap.mbn"; - }; +&gpu_zap_shader { + firmware-name =3D "qcom/sdm845/beryllium/a630_zap.mbn"; }; =20 &ibb { diff --git a/arch/arm64/boot/dts/qcom/sdm845-xiaomi-polaris.dts b/arch/arm6= 4/boot/dts/qcom/sdm845-xiaomi-polaris.dts index 26f0900513169368ecfb65b01eedcaf1050e3f53..30e88ff010a39738c5c88ef2389= 9189f5c4dd01a 100644 --- a/arch/arm64/boot/dts/qcom/sdm845-xiaomi-polaris.dts +++ b/arch/arm64/boot/dts/qcom/sdm845-xiaomi-polaris.dts @@ -392,10 +392,10 @@ &gpi_dma1 { =20 &gpu { status =3D "okay"; +}; =20 - zap-shader { - firmware-name =3D "qcom/sdm845/polaris/a630_zap.mbn"; - }; +&gpu_zap_shader { + firmware-name =3D "qcom/sdm845/polaris/a630_zap.mbn"; }; =20 &ibb { diff --git a/arch/arm64/boot/dts/qcom/sdm845.dtsi b/arch/arm64/boot/dts/qco= m/sdm845.dtsi index 8c90f652afff25a0860ae993e713f94dc9b39f00..bf2f9c04adba7953fde99edea8d= be5f40daec06c 100644 --- a/arch/arm64/boot/dts/qcom/sdm845.dtsi +++ b/arch/arm64/boot/dts/qcom/sdm845.dtsi @@ -4902,7 +4902,7 @@ gpu: gpu@5000000 { =20 status =3D "disabled"; =20 - zap-shader { + gpu_zap_shader: zap-shader { memory-region =3D <&gpu_mem>; }; =20 diff --git a/arch/arm64/boot/dts/qcom/sdm850-huawei-matebook-e-2019.dts b/a= rch/arm64/boot/dts/qcom/sdm850-huawei-matebook-e-2019.dts index 57afb35770058b84c592db9f20e82ebb7c4f8374..0ef9ea38a424a520362665265a2= 5acf66d1c44b8 100644 --- a/arch/arm64/boot/dts/qcom/sdm850-huawei-matebook-e-2019.dts +++ b/arch/arm64/boot/dts/qcom/sdm850-huawei-matebook-e-2019.dts @@ -488,10 +488,10 @@ &gcc { =20 &gpu { status =3D "okay"; +}; =20 - zap-shader { - firmware-name =3D "qcom/sdm850/HUAWEI/AL09/qcdxkmsuc850.mbn"; - }; +&gpu_zap_shader { + firmware-name =3D "qcom/sdm850/HUAWEI/AL09/qcdxkmsuc850.mbn"; }; =20 &i2c5 { diff --git a/arch/arm64/boot/dts/qcom/sdm850-lenovo-yoga-c630.dts b/arch/ar= m64/boot/dts/qcom/sdm850-lenovo-yoga-c630.dts index 35121cbcd37b08029d3e1a12b99fca44f3e4846d..e41200839dbeca2867a3687ad71= e622b0b8e0123 100644 --- a/arch/arm64/boot/dts/qcom/sdm850-lenovo-yoga-c630.dts +++ b/arch/arm64/boot/dts/qcom/sdm850-lenovo-yoga-c630.dts @@ -356,10 +356,10 @@ &gcc { }; =20 &gpu { - status =3D "okay"; - zap-shader { - firmware-name =3D "qcom/sdm850/LENOVO/81JL/qcdxkmsuc850.mbn"; - }; + status =3D "okay";}; + +&gpu_zap_shader { + firmware-name =3D "qcom/sdm850/LENOVO/81JL/qcdxkmsuc850.mbn"; }; =20 &i2c1 { diff --git a/arch/arm64/boot/dts/qcom/sm6115-fxtec-pro1x.dts b/arch/arm64/b= oot/dts/qcom/sm6115-fxtec-pro1x.dts index ad347ccd19755b20db8e0de6852148c76010e697..466ad409e9240e5137794597d5a= f4714bbae7af9 100644 --- a/arch/arm64/boot/dts/qcom/sm6115-fxtec-pro1x.dts +++ b/arch/arm64/boot/dts/qcom/sm6115-fxtec-pro1x.dts @@ -121,10 +121,10 @@ &gpi_dma0 { =20 &gpu { status =3D "okay"; +}; =20 - zap-shader { - firmware-name =3D "qcom/sm6115/Fxtec/QX1050/a610_zap.mbn"; - }; +&gpu_zap_shader { + firmware-name =3D "qcom/sm6115/Fxtec/QX1050/a610_zap.mbn"; }; =20 &i2c1 { diff --git a/arch/arm64/boot/dts/qcom/sm6115.dtsi b/arch/arm64/boot/dts/qco= m/sm6115.dtsi index 91fc36b59abf96d008ddeb43f3e4b9f0cfd49901..5e2032c26ea388eadf4bf41535f= f4b2ebf8e472d 100644 --- a/arch/arm64/boot/dts/qcom/sm6115.dtsi +++ b/arch/arm64/boot/dts/qcom/sm6115.dtsi @@ -1745,7 +1745,7 @@ gpu: gpu@5900000 { =20 status =3D "disabled"; =20 - zap-shader { + gpu_zap_shader: zap-shader { memory-region =3D <&pil_gpu_mem>; }; =20 diff --git a/arch/arm64/boot/dts/qcom/sm6115p-lenovo-j606f.dts b/arch/arm64= /boot/dts/qcom/sm6115p-lenovo-j606f.dts index c17545111f49a8388d8d5802ea5c3ff3c8a6cb45..be1f550fd7b50b994427395b6d4= 9c63f0b8ff159 100644 --- a/arch/arm64/boot/dts/qcom/sm6115p-lenovo-j606f.dts +++ b/arch/arm64/boot/dts/qcom/sm6115p-lenovo-j606f.dts @@ -67,10 +67,10 @@ ramoops@ffc00000 { =20 &gpu { status =3D "okay"; +}; =20 - zap-shader { - firmware-name =3D "qcom/sm6115/LENOVO/J606F/a610_zap.mbn"; - }; +&gpu_zap_shader { + firmware-name =3D "qcom/sm6115/LENOVO/J606F/a610_zap.mbn"; }; =20 &mdss { diff --git a/arch/arm64/boot/dts/qcom/sm8150.dtsi b/arch/arm64/boot/dts/qco= m/sm8150.dtsi index 1ea2beb9e2eaccf0e39dd2baea853d0152e48477..e3ec99972a28c8b044ef23cc2d3= 9b3997b856071 100644 --- a/arch/arm64/boot/dts/qcom/sm8150.dtsi +++ b/arch/arm64/boot/dts/qcom/sm8150.dtsi @@ -2255,7 +2255,7 @@ gpu: gpu@2c00000 { =20 status =3D "disabled"; =20 - zap-shader { + gpu_zap_shader: zap-shader { memory-region =3D <&gpu_mem>; }; =20 diff --git a/arch/arm64/boot/dts/qcom/sm8250-mtp.dts b/arch/arm64/boot/dts/= qcom/sm8250-mtp.dts index 5c40d4e869d354870828629238d6e14364f438aa..51779b99176d06a5869e3147a40= aa101a990a99a 100644 --- a/arch/arm64/boot/dts/qcom/sm8250-mtp.dts +++ b/arch/arm64/boot/dts/qcom/sm8250-mtp.dts @@ -484,10 +484,10 @@ &gmu { =20 &gpu { status =3D "okay"; +}; =20 - zap-shader { - firmware-name =3D "qcom/sm8250/a650_zap.mbn"; - }; +&gpu_zap_shader { + firmware-name =3D "qcom/sm8250/a650_zap.mbn"; }; =20 &i2c1 { diff --git a/arch/arm64/boot/dts/qcom/sm8250-xiaomi-elish-common.dtsi b/arc= h/arm64/boot/dts/qcom/sm8250-xiaomi-elish-common.dtsi index 6c9bb993dc2a3d12b1c7972128e2a2f64fa8dfab..c017399297b9d567eca7fea2667= e6c2b398bdf9b 100644 --- a/arch/arm64/boot/dts/qcom/sm8250-xiaomi-elish-common.dtsi +++ b/arch/arm64/boot/dts/qcom/sm8250-xiaomi-elish-common.dtsi @@ -554,10 +554,10 @@ &gpi_dma2 { =20 &gpu { status =3D "okay"; +}; =20 - zap-shader { - firmware-name =3D "qcom/sm8250/xiaomi/elish/a650_zap.mbn"; - }; +&gpu_zap_shader { + firmware-name =3D "qcom/sm8250/xiaomi/elish/a650_zap.mbn"; }; =20 &i2c0 { diff --git a/arch/arm64/boot/dts/qcom/sm8250-xiaomi-pipa.dts b/arch/arm64/b= oot/dts/qcom/sm8250-xiaomi-pipa.dts index 12565ad87890fea1cc6c25cc161072d75b793c1d..078ba13f8762e037a8d4199a916= c713b7f185b3b 100644 --- a/arch/arm64/boot/dts/qcom/sm8250-xiaomi-pipa.dts +++ b/arch/arm64/boot/dts/qcom/sm8250-xiaomi-pipa.dts @@ -424,10 +424,10 @@ &gpi_dma2 { =20 &gpu { status =3D "okay"; +}; =20 - zap-shader { - firmware-name =3D "qcom/sm8250/xiaomi/pipa/a650_zap.mbn"; - }; +&gpu_zap_shader { + firmware-name =3D "qcom/sm8250/xiaomi/pipa/a650_zap.mbn"; }; =20 &i2c11 { diff --git a/arch/arm64/boot/dts/qcom/sm8250.dtsi b/arch/arm64/boot/dts/qco= m/sm8250.dtsi index d30b3bc2db9e1be2258179d9ae68e3ac14d6154a..c7dffa440074073b78e16070d74= 5108f2b3bab28 100644 --- a/arch/arm64/boot/dts/qcom/sm8250.dtsi +++ b/arch/arm64/boot/dts/qcom/sm8250.dtsi @@ -2944,7 +2944,7 @@ gpu: gpu@3d00000 { =20 status =3D "disabled"; =20 - zap-shader { + gpu_zap_shader: zap-shader { memory-region =3D <&gpu_mem>; }; =20 diff --git a/arch/arm64/boot/dts/qcom/sm8350-hdk.dts b/arch/arm64/boot/dts/= qcom/sm8350-hdk.dts index 24a8c91e9f70f40247fde6eb63aa5ce58e258139..5f975d00946585bca20fa2efe82= 3cbb333aae5a0 100644 --- a/arch/arm64/boot/dts/qcom/sm8350-hdk.dts +++ b/arch/arm64/boot/dts/qcom/sm8350-hdk.dts @@ -403,10 +403,10 @@ &gpi_dma1 { =20 &gpu { status =3D "okay"; +}; =20 - zap-shader { - firmware-name =3D "qcom/sm8350/a660_zap.mbn"; - }; +&gpu_zap_shader { + firmware-name =3D "qcom/sm8350/a660_zap.mbn"; }; =20 &i2c13 { diff --git a/arch/arm64/boot/dts/qcom/sm8350.dtsi b/arch/arm64/boot/dts/qco= m/sm8350.dtsi index fc4ce9d4977e811c993291a3b5c8ed477b69c75e..5c8fe213f5e4ecbb8a152fd2750= 6c3ba1f281df5 100644 --- a/arch/arm64/boot/dts/qcom/sm8350.dtsi +++ b/arch/arm64/boot/dts/qcom/sm8350.dtsi @@ -2051,7 +2051,7 @@ gpu: gpu@3d00000 { =20 status =3D "disabled"; =20 - zap-shader { + gpu_zap_shader: zap-shader { memory-region =3D <&pil_gpu_mem>; }; =20 diff --git a/arch/arm64/boot/dts/qcom/sm8450-hdk.dts b/arch/arm64/boot/dts/= qcom/sm8450-hdk.dts index 0c6aa7ddf43263f30595b3f0733ec3e126e38608..268ae0cd642a74d3bae837ac6c1= 89642cacf4be8 100644 --- a/arch/arm64/boot/dts/qcom/sm8450-hdk.dts +++ b/arch/arm64/boot/dts/qcom/sm8450-hdk.dts @@ -643,10 +643,10 @@ vreg_l7e_2p8: ldo7 { =20 &gpu { status =3D "okay"; +}; =20 - zap-shader { - firmware-name =3D "qcom/sm8450/a730_zap.mbn"; - }; +&gpu_zap_shader { + firmware-name =3D "qcom/sm8450/a730_zap.mbn"; }; =20 &i2c9 { diff --git a/arch/arm64/boot/dts/qcom/sm8450.dtsi b/arch/arm64/boot/dts/qco= m/sm8450.dtsi index 2ae56c39f2e6d8a11a2ef0f77bffcf05a6fd637e..920a2d1c04d0c5a89d72e7d7cff= f24e10befb5d9 100644 --- a/arch/arm64/boot/dts/qcom/sm8450.dtsi +++ b/arch/arm64/boot/dts/qcom/sm8450.dtsi @@ -2459,7 +2459,7 @@ gpu: gpu@3d00000 { =20 status =3D "disabled"; =20 - zap-shader { + gpu_zap_shader: zap-shader { memory-region =3D <&gpu_micro_code_mem>; }; =20 diff --git a/arch/arm64/boot/dts/qcom/sm8550-hdk.dts b/arch/arm64/boot/dts/= qcom/sm8550-hdk.dts index b5d7f0cd443a18b167c94e450b5b9412897b2ba2..599850c48494b1daae9508068a1= 53f24fe3bfa91 100644 --- a/arch/arm64/boot/dts/qcom/sm8550-hdk.dts +++ b/arch/arm64/boot/dts/qcom/sm8550-hdk.dts @@ -955,10 +955,10 @@ &gpi_dma1 { =20 &gpu { status =3D "okay"; +}; =20 - zap-shader { - firmware-name =3D "qcom/sm8550/a740_zap.mbn"; - }; +&gpu_zap_shader { + firmware-name =3D "qcom/sm8550/a740_zap.mbn"; }; =20 &lpass_tlmm { diff --git a/arch/arm64/boot/dts/qcom/sm8550-mtp.dts b/arch/arm64/boot/dts/= qcom/sm8550-mtp.dts index 38f2928f23cc3c1905ceea182270ce882d61eed7..f430038bd402c76aef0b4bb069c= 5e62f8abba969 100644 --- a/arch/arm64/boot/dts/qcom/sm8550-mtp.dts +++ b/arch/arm64/boot/dts/qcom/sm8550-mtp.dts @@ -642,10 +642,10 @@ vreg_l7n_2p96: ldo7 { =20 &gpu { status =3D "okay"; +}; =20 - zap-shader { - firmware-name =3D "qcom/sm8550/a740_zap.mbn"; - }; +&gpu_zap_shader { + firmware-name =3D "qcom/sm8550/a740_zap.mbn"; }; =20 &i2c_master_hub_0 { diff --git a/arch/arm64/boot/dts/qcom/sm8550-qrd.dts b/arch/arm64/boot/dts/= qcom/sm8550-qrd.dts index 9af2a4fd02ea5bdc0ea14b246d79b34d49e7e2d3..05c98fe2c25be4066b81920364c= 702c357498cd3 100644 --- a/arch/arm64/boot/dts/qcom/sm8550-qrd.dts +++ b/arch/arm64/boot/dts/qcom/sm8550-qrd.dts @@ -835,10 +835,10 @@ &gpi_dma1 { =20 &gpu { status =3D "okay"; +}; =20 - zap-shader { - firmware-name =3D "qcom/sm8550/a740_zap.mbn"; - }; +&gpu_zap_shader { + firmware-name =3D "qcom/sm8550/a740_zap.mbn"; }; =20 &lpass_tlmm { diff --git a/arch/arm64/boot/dts/qcom/sm8550.dtsi b/arch/arm64/boot/dts/qco= m/sm8550.dtsi index aa3167d10a41265ae8c9f178f7505dca89834596..02160f8d08df834e8f2e13b68e6= 543d990a06acf 100644 --- a/arch/arm64/boot/dts/qcom/sm8550.dtsi +++ b/arch/arm64/boot/dts/qcom/sm8550.dtsi @@ -2491,7 +2491,7 @@ gpu: gpu@3d00000 { =20 status =3D "disabled"; =20 - zap-shader { + gpu_zap_shader: zap-shader { memory-region =3D <&gpu_micro_code_mem>; }; =20 diff --git a/arch/arm64/boot/dts/qcom/sm8650-hdk.dts b/arch/arm64/boot/dts/= qcom/sm8650-hdk.dts index 87d7190dc991b11f5d1162aabb693dcadd198c51..5bf1af3308ceb647f031deb9f87= 55c830aa90c37 100644 --- a/arch/arm64/boot/dts/qcom/sm8650-hdk.dts +++ b/arch/arm64/boot/dts/qcom/sm8650-hdk.dts @@ -900,10 +900,10 @@ &iris { =20 &gpu { status =3D "okay"; +}; =20 - zap-shader { - firmware-name =3D "qcom/sm8650/gen70900_zap.mbn"; - }; +&gpu_zap_shader { + firmware-name =3D "qcom/sm8650/gen70900_zap.mbn"; }; =20 &lpass_tlmm { diff --git a/arch/arm64/boot/dts/qcom/sm8650-qrd.dts b/arch/arm64/boot/dts/= qcom/sm8650-qrd.dts index 9e790cf44804d00a056f92514630ef620e212343..b2feac61a89f22a6cac8f663f73= 64fff86c76301 100644 --- a/arch/arm64/boot/dts/qcom/sm8650-qrd.dts +++ b/arch/arm64/boot/dts/qcom/sm8650-qrd.dts @@ -830,10 +830,10 @@ &iris { =20 &gpu { status =3D "okay"; +}; =20 - zap-shader { - firmware-name =3D "qcom/sm8650/gen70900_zap.mbn"; - }; +&gpu_zap_shader { + firmware-name =3D "qcom/sm8650/gen70900_zap.mbn"; }; =20 &lpass_tlmm { diff --git a/arch/arm64/boot/dts/qcom/sm8650.dtsi b/arch/arm64/boot/dts/qco= m/sm8650.dtsi index 1a323f4ebdd35418d28af720d95e60544161e2e0..07ae74851621f2ec127735e6f1d= d92164ffb8d4b 100644 --- a/arch/arm64/boot/dts/qcom/sm8650.dtsi +++ b/arch/arm64/boot/dts/qcom/sm8650.dtsi @@ -4158,7 +4158,7 @@ gpu: gpu@3d00000 { =20 status =3D "disabled"; =20 - zap-shader { + gpu_zap_shader: zap-shader { memory-region =3D <&gpu_micro_code_mem>; }; =20 diff --git a/arch/arm64/boot/dts/qcom/x1e001de-devkit.dts b/arch/arm64/boot= /dts/qcom/x1e001de-devkit.dts index 701f35af7d5cd080de48cb70db3bb9bea3e46264..a9643cd746d500296848f4b0f92= 8a2905dcd49c0 100644 --- a/arch/arm64/boot/dts/qcom/x1e001de-devkit.dts +++ b/arch/arm64/boot/dts/qcom/x1e001de-devkit.dts @@ -763,10 +763,10 @@ vreg_l3j_0p8: ldo3 { =20 &gpu { status =3D "okay"; +}; =20 - zap-shader { - firmware-name =3D "qcom/x1e80100/Thundercomm/DEVKIT/qcdxkmsuc8380.mbn"; - }; +&gpu_zap_shader { + firmware-name =3D "qcom/x1e80100/Thundercomm/DEVKIT/qcdxkmsuc8380.mbn"; }; =20 &i2c1 { diff --git a/arch/arm64/boot/dts/qcom/x1e78100-lenovo-thinkpad-t14s.dtsi b/= arch/arm64/boot/dts/qcom/x1e78100-lenovo-thinkpad-t14s.dtsi index 169726984d3b010f5d4874c8d3d0bf5797f10dc9..80ece9db875a59d7b2ee3adb098= 74b5af6601c1e 100644 --- a/arch/arm64/boot/dts/qcom/x1e78100-lenovo-thinkpad-t14s.dtsi +++ b/arch/arm64/boot/dts/qcom/x1e78100-lenovo-thinkpad-t14s.dtsi @@ -722,10 +722,10 @@ vreg_l3j_0p8: ldo3 { =20 &gpu { status =3D "okay"; +}; =20 - zap-shader { - firmware-name =3D "qcom/x1e80100/LENOVO/21N1/qcdxkmsuc8380.mbn"; - }; +&gpu_zap_shader { + firmware-name =3D "qcom/x1e80100/LENOVO/21N1/qcdxkmsuc8380.mbn"; }; =20 &i2c0 { diff --git a/arch/arm64/boot/dts/qcom/x1e80100-asus-vivobook-s15.dts b/arch= /arm64/boot/dts/qcom/x1e80100-asus-vivobook-s15.dts index f2960953e608fb81be9b941115df6ba2c9913663..d4df21de0d95980620e5241cfdd= 7a31f016cd7fe 100644 --- a/arch/arm64/boot/dts/qcom/x1e80100-asus-vivobook-s15.dts +++ b/arch/arm64/boot/dts/qcom/x1e80100-asus-vivobook-s15.dts @@ -479,10 +479,10 @@ vreg_l3j_0p8: ldo3 { =20 &gpu { status =3D "okay"; +}; =20 - zap-shader { - firmware-name =3D "qcom/x1e80100/ASUSTeK/vivobook-s15/qcdxkmsuc8380.mbn"; - }; +&gpu_zap_shader { + firmware-name =3D "qcom/x1e80100/ASUSTeK/vivobook-s15/qcdxkmsuc8380.mbn"; }; =20 &i2c0 { diff --git a/arch/arm64/boot/dts/qcom/x1e80100-dell-xps13-9345.dts b/arch/a= rm64/boot/dts/qcom/x1e80100-dell-xps13-9345.dts index c1f49cba61fc40c764122f365f2e4b418579a73b..2f533e56c8c84101973f557c4df= 2abd21af8832a 100644 --- a/arch/arm64/boot/dts/qcom/x1e80100-dell-xps13-9345.dts +++ b/arch/arm64/boot/dts/qcom/x1e80100-dell-xps13-9345.dts @@ -676,10 +676,10 @@ vreg_l3j_0p8: ldo3 { =20 &gpu { status =3D "okay"; +}; =20 - zap-shader { - firmware-name =3D "qcom/x1e80100/dell/xps13-9345/qcdxkmsuc8380.mbn"; - }; +&gpu_zap_shader { + firmware-name =3D "qcom/x1e80100/dell/xps13-9345/qcdxkmsuc8380.mbn"; }; =20 &i2c0 { diff --git a/arch/arm64/boot/dts/qcom/x1e80100-hp-elitebook-ultra-g1q.dts b= /arch/arm64/boot/dts/qcom/x1e80100-hp-elitebook-ultra-g1q.dts index 4ea00d8236935fb14fa5119310365ad392d8d5e0..0b3b6cb23e1ab91c90ccb5ac779= d70981f3d6d90 100644 --- a/arch/arm64/boot/dts/qcom/x1e80100-hp-elitebook-ultra-g1q.dts +++ b/arch/arm64/boot/dts/qcom/x1e80100-hp-elitebook-ultra-g1q.dts @@ -9,10 +9,8 @@ / { compatible =3D "hp,elitebook-ultra-g1q", "qcom,x1e80100"; }; =20 -&gpu { - zap-shader { - firmware-name =3D "qcom/x1e80100/hp/elitebook-ultra-g1q/qcdxkmsuc8380.mb= n"; - }; +&gpu_zap_shader { + firmware-name =3D "qcom/x1e80100/hp/elitebook-ultra-g1q/qcdxkmsuc8380.mbn= "; }; =20 &remoteproc_adsp { diff --git a/arch/arm64/boot/dts/qcom/x1e80100-lenovo-yoga-slim7x.dts b/arc= h/arm64/boot/dts/qcom/x1e80100-lenovo-yoga-slim7x.dts index 56e4d13cca11165c30dcbed8a1e0a4d7f8fa5cc2..4c31d14a07bc67055b836725d47= 38bd31d611db1 100644 --- a/arch/arm64/boot/dts/qcom/x1e80100-lenovo-yoga-slim7x.dts +++ b/arch/arm64/boot/dts/qcom/x1e80100-lenovo-yoga-slim7x.dts @@ -799,10 +799,10 @@ vreg_l3j_0p8: ldo3 { =20 &gpu { status =3D "okay"; +}; =20 - zap-shader { - firmware-name =3D "qcom/x1e80100/LENOVO/83ED/qcdxkmsuc8380.mbn"; - }; +&gpu_zap_shader { + firmware-name =3D "qcom/x1e80100/LENOVO/83ED/qcdxkmsuc8380.mbn"; }; =20 &i2c0 { diff --git a/arch/arm64/boot/dts/qcom/x1e80100-microsoft-romulus.dtsi b/arc= h/arm64/boot/dts/qcom/x1e80100-microsoft-romulus.dtsi index 3b319f65dde1e0df9e53191acfa161ccb49dff7b..7e1e808ea983b6571bde306f575= a94c4d6fcff84 100644 --- a/arch/arm64/boot/dts/qcom/x1e80100-microsoft-romulus.dtsi +++ b/arch/arm64/boot/dts/qcom/x1e80100-microsoft-romulus.dtsi @@ -861,11 +861,11 @@ vreg_l3j: ldo3 { =20 &gpu { status =3D "okay"; +}; =20 - zap-shader { - memory-region =3D <&gpu_microcode_mem>; - firmware-name =3D "qcom/x1e80100/microsoft/qcdxkmsuc8380.mbn"; - }; +&gpu_zap_shader { + memory-region =3D <&gpu_microcode_mem>; + firmware-name =3D "qcom/x1e80100/microsoft/qcdxkmsuc8380.mbn"; }; =20 &i2c0 { diff --git a/arch/arm64/boot/dts/qcom/x1e80100-qcp.dts b/arch/arm64/boot/dt= s/qcom/x1e80100-qcp.dts index 5a121fc4494014f01be5d6e3ab95060581ec83ad..b742aabd9c049eb0f24cf96fb1a= f879acfc5d3b6 100644 --- a/arch/arm64/boot/dts/qcom/x1e80100-qcp.dts +++ b/arch/arm64/boot/dts/qcom/x1e80100-qcp.dts @@ -831,10 +831,10 @@ vreg_l3j_0p8: ldo3 { =20 &gpu { status =3D "okay"; +}; =20 - zap-shader { - firmware-name =3D "qcom/x1e80100/gen70500_zap.mbn"; - }; +&gpu_zap_shader { + firmware-name =3D "qcom/x1e80100/gen70500_zap.mbn"; }; =20 &i2c5 { --=20 2.47.3