arm64: dts: qcom: sc8280xp: create common zap-shader node

In order to reduce duplication, mMove common GPU memory configuration
from individual board files to sc8280xp.dtsi.

Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com>
Reviewed-by: Konrad Dybcio <konrad.dybcio@oss.qualcomm.com>
Reviewed-by: David Heidelberg <david@ixit.cz>
Link: https://lore.kernel.org/r/20251028-dt-zap-shader-v1-4-7eccb823b986@oss.qualcomm.com
Signed-off-by: Bjorn Andersson <andersson@kernel.org>

diff --git a/arch/arm64/boot/dts/qcom/sa8295p-adp.dts b/arch/arm64/boot/dts/qcom/sa8295p-adp.dts
index 64e59299672cbf316b4eddb978e4583ff34c0299..524d44cbae740577e010f156308a715962db1a36 100644 (file)
--- a/arch/arm64/boot/dts/qcom/sa8295p-adp.dts
+++ b/arch/arm64/boot/dts/qcom/sa8295p-adp.dts
@@ -149,13 +149,6 @@
                enable-active-high;
                regulator-always-on;
        };
-
-       reserved-memory {
-               gpu_mem: gpu-mem@8bf00000 {
-                       reg = <0 0x8bf00000 0 0x2000>;
-                       no-map;
-               };
-       };
 };
 
 &apps_rsc {
@@ -347,7 +340,6 @@
        status = "okay";
 
        zap-shader {
-               memory-region = <&gpu_mem>;
                firmware-name = "qcom/sa8295p/a690_zap.mbn";
        };
 };

diff --git a/arch/arm64/boot/dts/qcom/sc8280xp-crd.dts b/arch/arm64/boot/dts/qcom/sc8280xp-crd.dts
index 490e970c54a24203ab297dfabed7e21c2be244e9..858f71737d93fd8591ba42eb363748ac51699d63 100644 (file)
--- a/arch/arm64/boot/dts/qcom/sc8280xp-crd.dts
+++ b/arch/arm64/boot/dts/qcom/sc8280xp-crd.dts
@@ -225,11 +225,6 @@
        };
 
        reserved-memory {
-               gpu_mem: gpu-mem@8bf00000 {
-                       reg = <0 0x8bf00000 0 0x2000>;
-                       no-map;
-               };
-
                linux,cma {
                        compatible = "shared-dma-pool";
                        size = <0x0 0x8000000>;
@@ -511,7 +506,6 @@
        status = "okay";
 
        zap-shader {
-               memory-region = <&gpu_mem>;
                firmware-name = "qcom/sc8280xp/qcdxkmsuc8280.mbn";
        };
 };

diff --git a/arch/arm64/boot/dts/qcom/sc8280xp-huawei-gaokun3.dts b/arch/arm64/boot/dts/qcom/sc8280xp-huawei-gaokun3.dts
index 0374251d33291fc5804c9be0dc649ccea1c1c0e0..69d0d6c12e58653f8cb56cb7d383ad9d64699d18 100644 (file)
--- a/arch/arm64/boot/dts/qcom/sc8280xp-huawei-gaokun3.dts
+++ b/arch/arm64/boot/dts/qcom/sc8280xp-huawei-gaokun3.dts
@@ -158,11 +158,6 @@
        };
 
        reserved-memory {
-               gpu_mem: gpu-mem@8bf00000 {
-                       reg = <0 0x8bf00000 0 0x2000>;
-                       no-map;
-               };
-
                linux,cma {
                        compatible = "shared-dma-pool";
                        size = <0x0 0x8000000>;
@@ -602,7 +597,6 @@
        status = "okay";
 
        zap-shader {
-               memory-region = <&gpu_mem>;
                firmware-name = "qcom/sc8280xp/HUAWEI/gaokun3/qcdxkmsuc8280.mbn";
        };
 };

diff --git a/arch/arm64/boot/dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dts b/arch/arm64/boot/dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dts
index 3b3f7137689a6fa292ffe4fec8c1d1f20ee525bc..197ac4f4f0b67c92cf530040beb91c909867ec89 100644 (file)
--- a/arch/arm64/boot/dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dts
+++ b/arch/arm64/boot/dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dts
@@ -280,11 +280,6 @@
        };
 
        reserved-memory {
-               gpu_mem: gpu-mem@8bf00000 {
-                       reg = <0 0x8bf00000 0 0x2000>;
-                       no-map;
-               };
-
                linux,cma {
                        compatible = "shared-dma-pool";
                        size = <0x0 0x8000000>;
@@ -724,7 +719,6 @@
        status = "okay";
 
        zap-shader {
-               memory-region = <&gpu_mem>;
                firmware-name = "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..ea50e370f69837ec9412efc17e2a41034b0736fd 100644 (file)
--- a/arch/arm64/boot/dts/qcom/sc8280xp-microsoft-arcata.dts
+++ b/arch/arm64/boot/dts/qcom/sc8280xp-microsoft-arcata.dts
@@ -186,11 +186,6 @@
        };
 
        reserved-memory {
-               gpu_mem: gpu-mem@8bf00000 {
-                       reg = <0 0x8bf00000 0 0x2000>;
-                       no-map;
-               };
-
                linux,cma {
                        compatible = "shared-dma-pool";
                        size = <0x0 0x8000000>;
@@ -464,7 +459,6 @@
        status = "okay";
 
        zap-shader {
-               memory-region = <&gpu_mem>;
                firmware-name = "qcom/sc8280xp/MICROSOFT/SurfacePro9/qcdxkmsuc8280.mbn";
        };
 };

diff --git a/arch/arm64/boot/dts/qcom/sc8280xp-microsoft-blackrock.dts b/arch/arm64/boot/dts/qcom/sc8280xp-microsoft-blackrock.dts
index a40dccd70dfda873fb963b71e39617a2025b86db..48b60f6186fc1d69178902f2cc3bee324144202c 100644 (file)
--- a/arch/arm64/boot/dts/qcom/sc8280xp-microsoft-blackrock.dts
+++ b/arch/arm64/boot/dts/qcom/sc8280xp-microsoft-blackrock.dts
@@ -227,11 +227,6 @@
        };
 
        reserved-memory {
-               gpu_mem: gpu-mem@8bf00000 {
-                       reg = <0 0x8bf00000 0 0x2000>;
-                       no-map;
-               };
-
                linux,cma {
                        compatible = "shared-dma-pool";
                        size = <0x0 0x8000000>;
@@ -581,7 +576,6 @@
        status = "okay";
 
        zap-shader {
-               memory-region = <&gpu_mem>;
                firmware-name = "qcom/sc8280xp/microsoft/blackrock/qcdxkmsuc8280.mbn";
        };
 };

diff --git a/arch/arm64/boot/dts/qcom/sc8280xp.dtsi b/arch/arm64/boot/dts/qcom/sc8280xp.dtsi
index 7b89d3d422ea62012daeb423e457a20e84eeb0b5..b7044b9d656e4991e737f7008a7cf8f0619dd115 100644 (file)
--- a/arch/arm64/boot/dts/qcom/sc8280xp.dtsi
+++ b/arch/arm64/boot/dts/qcom/sc8280xp.dtsi
@@ -691,6 +691,11 @@
                        no-map;
                };
 
+               pil_gpu_mem: gpu-mem@8bf00000 {
+                       reg = <0 0x8bf00000 0 0x2000>;
+                       no-map;
+               };
+
                pil_adsp_mem: adsp-region@86c00000 {
                        reg = <0 0x86c00000 0 0x2000000>;
                        no-map;
@@ -3366,6 +3371,10 @@
 
                        status = "disabled";
 
+                       zap-shader {
+                               memory-region = <&pil_gpu_mem>;
+                       };
+
                        gpu_opp_table: opp-table {
                                compatible = "operating-points-v2";