[RFC,3/3] arm64: dts: qcom: sdm845-cheza: delete zap-shader
diff mbox series

Message ID 20190509184415.11592-4-robdclark@gmail.com
State New
Headers show
Series
  • arm64: dts: qcom: add cheza support
Related show

Commit Message

Rob Clark May 9, 2019, 6:44 p.m. UTC
From: Rob Clark <robdclark@chromium.org>

This is unused on cheza.  Delete the node to get rid of the reserved-
memory section, and to avoid the driver from attempting to load a zap
shader that doesn't exist every time it powers up the GPU.

Signed-off-by: Rob Clark <robdclark@chromium.org>
---
 arch/arm64/boot/dts/qcom/sdm845-cheza.dtsi | 2 ++
 arch/arm64/boot/dts/qcom/sdm845.dtsi       | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

Comments

Doug Anderson May 15, 2019, 9:43 p.m. UTC | #1
Hi,

On Thu, May 9, 2019 at 12:08 PM Rob Clark <robdclark@gmail.com> wrote:

> From: Rob Clark <robdclark@chromium.org>
>
> This is unused on cheza.  Delete the node to get rid of the reserved-
> memory section, and to avoid the driver from attempting to load a zap
> shader that doesn't exist every time it powers up the GPU.
>
> Signed-off-by: Rob Clark <robdclark@chromium.org>
> ---
>  arch/arm64/boot/dts/qcom/sdm845-cheza.dtsi | 2 ++
>  arch/arm64/boot/dts/qcom/sdm845.dtsi       | 2 +-

nit: up to Bjorn / Andy, but personally I'd put cheza and non-cheza
changes in two patches.


>  2 files changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/arch/arm64/boot/dts/qcom/sdm845-cheza.dtsi b/arch/arm64/boot/dts/qcom/sdm845-cheza.dtsi
> index 8ccbe246dff4..28c28517b21a 100644
> --- a/arch/arm64/boot/dts/qcom/sdm845-cheza.dtsi
> +++ b/arch/arm64/boot/dts/qcom/sdm845-cheza.dtsi
> @@ -175,6 +175,8 @@
>  /delete-node/ &venus_mem;
>  /delete-node/ &cdsp_mem;
>  /delete-node/ &cdsp_pas;
> +/delete-node/ &zap_shader;

nit: I'd probably move the delete of the zap shader to a slightly
different place just because the rest of the lines here are deleting
reserved memory regions.

Other than nits this seems OK to me.  Not that I know anything about
the zap shader or why a zap shader wouldn't be appropriate for cheza.

-Doug

Patch
diff mbox series

diff --git a/arch/arm64/boot/dts/qcom/sdm845-cheza.dtsi b/arch/arm64/boot/dts/qcom/sdm845-cheza.dtsi
index 8ccbe246dff4..28c28517b21a 100644
--- a/arch/arm64/boot/dts/qcom/sdm845-cheza.dtsi
+++ b/arch/arm64/boot/dts/qcom/sdm845-cheza.dtsi
@@ -175,6 +175,8 @@ 
 /delete-node/ &venus_mem;
 /delete-node/ &cdsp_mem;
 /delete-node/ &cdsp_pas;
+/delete-node/ &zap_shader;
+/delete-node/ &gpu_mem;
 
 /* Increase the size from 120 MB to 128 MB */
 &mpss_region {
diff --git a/arch/arm64/boot/dts/qcom/sdm845.dtsi b/arch/arm64/boot/dts/qcom/sdm845.dtsi
index b2d9e46c3916..2ea74b58a613 100644
--- a/arch/arm64/boot/dts/qcom/sdm845.dtsi
+++ b/arch/arm64/boot/dts/qcom/sdm845.dtsi
@@ -1989,7 +1989,7 @@ 
 
 			qcom,gmu = <&gmu>;
 
-			zap-shader {
+			zap_shader: zap-shader {
 				memory-region = <&gpu_mem>;
 			};