Without the zap region defined the enabled GPU will, if able to find the
other firmware files, attempt to initialize itself without the zap
firmware loading, which causes the rb3gen2 to freeze or crash.
Add the zap-shader node and define the memory-region and firmware path
to avoid this problem.
Fixes: 04cf333afc75 ("arm64: dts: qcom: Add base qcs6490-rb3gen2 board dts")
Signed-off-by: Bjorn Andersson <[email protected]>
---
arch/arm64/boot/dts/qcom/qcs6490-rb3gen2.dts | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/arch/arm64/boot/dts/qcom/qcs6490-rb3gen2.dts b/arch/arm64/boot/dts/qcom/qcs6490-rb3gen2.dts
index 63ebe0774f1d..5b81b5e0b4ce 100644
--- a/arch/arm64/boot/dts/qcom/qcs6490-rb3gen2.dts
+++ b/arch/arm64/boot/dts/qcom/qcs6490-rb3gen2.dts
@@ -471,6 +471,13 @@ &gcc {
<GCC_WPSS_RSCP_CLK>;
};
+&gpu {
+ zap-shader {
+ memory-region = <&gpu_microcode_mem>;
+ firmware-name = "qcom/qcs6490/a660_zap.mbn";
+ };
+};
+
&qupv3_id_0 {
status = "okay";
};
---
base-commit: 727900b675b749c40ba1f6669c7ae5eb7eb8e837
change-id: 20240326-rb3gen2-gpu-4343c5dc7e40
Best regards,
--
Bjorn Andersson <[email protected]>
On Wed, 3 Apr 2024 at 06:33, Bjorn Andersson <[email protected]> wrote:
>
> Without the zap region defined the enabled GPU will, if able to find the
> other firmware files, attempt to initialize itself without the zap
> firmware loading, which causes the rb3gen2 to freeze or crash.
>
> Add the zap-shader node and define the memory-region and firmware path
> to avoid this problem.
>
> Fixes: 04cf333afc75 ("arm64: dts: qcom: Add base qcs6490-rb3gen2 board dts")
> Signed-off-by: Bjorn Andersson <[email protected]>
> ---
> arch/arm64/boot/dts/qcom/qcs6490-rb3gen2.dts | 7 +++++++
> 1 file changed, 7 insertions(+)
>
> diff --git a/arch/arm64/boot/dts/qcom/qcs6490-rb3gen2.dts b/arch/arm64/boot/dts/qcom/qcs6490-rb3gen2.dts
> index 63ebe0774f1d..5b81b5e0b4ce 100644
> --- a/arch/arm64/boot/dts/qcom/qcs6490-rb3gen2.dts
> +++ b/arch/arm64/boot/dts/qcom/qcs6490-rb3gen2.dts
> @@ -471,6 +471,13 @@ &gcc {
> <GCC_WPSS_RSCP_CLK>;
> };
>
> +&gpu {
Hmm, Is the GPU enabled by default? It should probably be fixed. I
think we usually do not enable the GPU by default on SoC.dtsi.
But now I understand, why it is marked with Fixes:
Reviewed-by: Dmitry Baryshkov <[email protected]>
> + zap-shader {
> + memory-region = <&gpu_microcode_mem>;
> + firmware-name = "qcom/qcs6490/a660_zap.mbn";
> + };
> +};
> +
> &qupv3_id_0 {
> status = "okay";
> };
>
> ---
> base-commit: 727900b675b749c40ba1f6669c7ae5eb7eb8e837
> change-id: 20240326-rb3gen2-gpu-4343c5dc7e40
>
> Best regards,
> --
> Bjorn Andersson <[email protected]>
>
>
--
With best wishes
Dmitry
On Tue, Apr 02, 2024 at 08:33:30PM GMT, Bjorn Andersson wrote:
> Without the zap region defined the enabled GPU will, if able to find the
> other firmware files, attempt to initialize itself without the zap
> firmware loading, which causes the rb3gen2 to freeze or crash.
>
> Add the zap-shader node and define the memory-region and firmware path
> to avoid this problem.
This statement is wrong, there is a zap-shader node already, but we're
lacking the firmware-name...
Regards,
Bjorn
>
> Fixes: 04cf333afc75 ("arm64: dts: qcom: Add base qcs6490-rb3gen2 board dts")
> Signed-off-by: Bjorn Andersson <[email protected]>
> ---
> arch/arm64/boot/dts/qcom/qcs6490-rb3gen2.dts | 7 +++++++
> 1 file changed, 7 insertions(+)
>
> diff --git a/arch/arm64/boot/dts/qcom/qcs6490-rb3gen2.dts b/arch/arm64/boot/dts/qcom/qcs6490-rb3gen2.dts
> index 63ebe0774f1d..5b81b5e0b4ce 100644
> --- a/arch/arm64/boot/dts/qcom/qcs6490-rb3gen2.dts
> +++ b/arch/arm64/boot/dts/qcom/qcs6490-rb3gen2.dts
> @@ -471,6 +471,13 @@ &gcc {
> <GCC_WPSS_RSCP_CLK>;
> };
>
> +&gpu {
> + zap-shader {
> + memory-region = <&gpu_microcode_mem>;
> + firmware-name = "qcom/qcs6490/a660_zap.mbn";
> + };
> +};
> +
> &qupv3_id_0 {
> status = "okay";
> };
>
> ---
> base-commit: 727900b675b749c40ba1f6669c7ae5eb7eb8e837
> change-id: 20240326-rb3gen2-gpu-4343c5dc7e40
>
> Best regards,
> --
> Bjorn Andersson <[email protected]>
>