[PATCH] arm64: dts: qcom: sdm845-cheza: delete zap-shader

[PATCH] arm64: dts: qcom: sdm845-cheza: delete zap-shader

[Rob Clark]

From: Rob Clark <robdclark@chromium.org>

This is unused on cheza.  Delete the node to get ride 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.

(This also avoids a massive amount of dmesg spam about missing zap fw.)

Signed-off-by: Rob Clark <robdclark@chromium.org>
Cc: Douglas Anderson <dianders@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(-)

diff --git a/arch/arm64/boot/dts/qcom/sdm845-cheza.dtsi b/arch/arm64/boot/dts/qcom/sdm845-cheza.dtsi
index 34881c0113cb..99a28d64ee62 100644
--- a/arch/arm64/boot/dts/qcom/sdm845-cheza.dtsi
+++ b/arch/arm64/boot/dts/qcom/sdm845-cheza.dtsi
@@ -165,6 +165,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 f406a4340b05..2287354fef86 100644
--- a/arch/arm64/boot/dts/qcom/sdm845.dtsi
+++ b/arch/arm64/boot/dts/qcom/sdm845.dtsi
@@ -2824,7 +2824,7 @@
 
 			qcom,gmu = <&gmu>;
 
-			zap-shader {
+			zap_shader: zap-shader {
 				memory-region = <&gpu_mem>;
 			};
 
-- 
2.21.0

Re: [PATCH] arm64: dts: qcom: sdm845-cheza: delete zap-shader

[Doug Anderson]

Hi,

On Fri, Oct 25, 2019 at 2:23 PM Rob Clark <robdclark@gmail.com> wrote:
>
> From: Rob Clark <robdclark@chromium.org>
>
> This is unused on cheza.  Delete the node to get ride 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.
>
> (This also avoids a massive amount of dmesg spam about missing zap fw.)

optional nit: maybe when this is applied Bjorn / Andy can put in the
actual error message to make this easier to find if anyone is seeing
this problem.  Specifically:

  msm ae00000.mdss: [drm:adreno_request_fw] *ERROR* failed to load
qcom/a630_zap.mdt: -2
  adreno 5000000.gpu: [drm:adreno_zap_shader_load] *ERROR* Unable to
load a630_zap.mdt


> Signed-off-by: Rob Clark <robdclark@chromium.org>
> Cc: Douglas Anderson <dianders@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(-)

I probably would have put it in two patches (one for sdm845.dtsi and
one for cheza) but that's more because I'm obsessive-compulsive than
for any real reason.  ;-)  In any case:

Fixes: 3fdeaee951aa ("arm64: dts: sdm845: Add zap shader region for GPU")
Reviewed-by: Douglas Anderson <dianders@chromium.org>
Tested-by: Douglas Anderson <dianders@chromium.org>

-Doug

Re: [PATCH] arm64: dts: qcom: sdm845-cheza: delete zap-shader

[Andy Gross]

On Fri, Oct 25, 2019 at 02:28:22PM -0700, Doug Anderson wrote:
> Hi,
> 
> On Fri, Oct 25, 2019 at 2:23 PM Rob Clark <robdclark@gmail.com> wrote:
> >
> > From: Rob Clark <robdclark@chromium.org>
> >
> > This is unused on cheza.  Delete the node to get ride 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.
> >
> > (This also avoids a massive amount of dmesg spam about missing zap fw.)
> 
> optional nit: maybe when this is applied Bjorn / Andy can put in the
> actual error message to make this easier to find if anyone is seeing
> this problem.  Specifically:
> 
>   msm ae00000.mdss: [drm:adreno_request_fw] *ERROR* failed to load
> qcom/a630_zap.mdt: -2
>   adreno 5000000.gpu: [drm:adreno_zap_shader_load] *ERROR* Unable to
> load a630_zap.mdt
> 
> 
> > Signed-off-by: Rob Clark <robdclark@chromium.org>
> > Cc: Douglas Anderson <dianders@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(-)
> 
> I probably would have put it in two patches (one for sdm845.dtsi and
> one for cheza) but that's more because I'm obsessive-compulsive than
> for any real reason.  ;-)  In any case:
> 
> Fixes: 3fdeaee951aa ("arm64: dts: sdm845: Add zap shader region for GPU")
> Reviewed-by: Douglas Anderson <dianders@chromium.org>
> Tested-by: Douglas Anderson <dianders@chromium.org>

Applied this patch and added in the dmesg error messages.

Andy