On Tue 07 Jan 17:38 PST 2020, Rob Clark wrote:
> From: Rob Clark <robdclark@xxxxxxxxxxxx>
>
> We want to specify per-device firmware-name, so move the zap node into
> the .dts file for individual boards/devices. This lets us get rid of
> the /delete-node/ for cheza, which does not use zap.
>
> Signed-off-by: Rob Clark <robdclark@xxxxxxxxxxxx>
> ---
> arch/arm64/boot/dts/qcom/sdm845-cheza.dtsi | 1 -
> arch/arm64/boot/dts/qcom/sdm845-db845c.dts | 7 +++++++
> arch/arm64/boot/dts/qcom/sdm845-mtp.dts | 8 ++++++++
> arch/arm64/boot/dts/qcom/sdm845.dtsi | 6 +-----
> arch/arm64/boot/dts/qcom/sdm850-lenovo-yoga-c630.dts | 7 +++++++
> 5 files changed, 23 insertions(+), 6 deletions(-)
>
> diff --git a/arch/arm64/boot/dts/qcom/sdm845-cheza.dtsi b/arch/arm64/boot/dts/qcom/sdm845-cheza.dtsi
> index 9a4ff57fc877..2db79c1ecdac 100644
> --- a/arch/arm64/boot/dts/qcom/sdm845-cheza.dtsi
> +++ b/arch/arm64/boot/dts/qcom/sdm845-cheza.dtsi
> @@ -165,7 +165,6 @@ panel_in_edp: endpoint {
> /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 */
> diff --git a/arch/arm64/boot/dts/qcom/sdm845-db845c.dts b/arch/arm64/boot/dts/qcom/sdm845-db845c.dts
> index d100f46791a6..c472195e44fb 100644
> --- a/arch/arm64/boot/dts/qcom/sdm845-db845c.dts
> +++ b/arch/arm64/boot/dts/qcom/sdm845-db845c.dts
> @@ -352,6 +352,13 @@ &gcc {
> <GCC_QSPI_CNOC_PERIPH_AHB_CLK>;
> };
>
> +&gpu {
> + zap-shader {
> + memory-region = <&gpu_mem>;
> + firmware-name = "qcom/db845c/a630_zap.mbn";
We agreed upon qcom/sdm845/* for the test-signed 845 firmware :)
> + };
> +};
> +
> &pm8998_gpio {
> vol_up_pin_a: vol-up-active {
> pins = "gpio6";
> diff --git a/arch/arm64/boot/dts/qcom/sdm845-mtp.dts b/arch/arm64/boot/dts/qcom/sdm845-mtp.dts
> index c57548b7b250..876155fc0547 100644
> --- a/arch/arm64/boot/dts/qcom/sdm845-mtp.dts
> +++ b/arch/arm64/boot/dts/qcom/sdm845-mtp.dts
> @@ -360,6 +360,14 @@ &gcc {
> <GCC_LPASS_SWAY_CLK>;
> };
>
> +&gpu {
> + zap-shader {
> + memory-region = <&gpu_mem>;
> + // TODO presumably mtp can use same "test key" signed zap?
Drop this comment after s/db845c/sdm845/
> + firmware-name = "qcom/db845c/a630_zap.mbn";
Apart from that, I think this looks good!
Regards,
Bjorn
> + };
> +};
> +
> &i2c10 {
> status = "okay";
> clock-frequency = <400000>;
> diff --git a/arch/arm64/boot/dts/qcom/sdm845.dtsi b/arch/arm64/boot/dts/qcom/sdm845.dtsi
> index ddb1f23c936f..601c57cc9b6d 100644
> --- a/arch/arm64/boot/dts/qcom/sdm845.dtsi
> +++ b/arch/arm64/boot/dts/qcom/sdm845.dtsi
> @@ -2804,7 +2804,7 @@ dsi1_phy: dsi-phy@ae96400 {
> };
> };
>
> - gpu@5000000 {
> + gpu: gpu@5000000 {
> compatible = "qcom,adreno-630.2", "qcom,adreno";
> #stream-id-cells = <16>;
>
> @@ -2824,10 +2824,6 @@ gpu@5000000 {
>
> qcom,gmu = <&gmu>;
>
> - zap_shader: zap-shader {
> - memory-region = <&gpu_mem>;
> - };
> -
> gpu_opp_table: opp-table {
> compatible = "operating-points-v2";
>
> diff --git a/arch/arm64/boot/dts/qcom/sdm850-lenovo-yoga-c630.dts b/arch/arm64/boot/dts/qcom/sdm850-lenovo-yoga-c630.dts
> index 13dc619687f3..b255be3a4a0a 100644
> --- a/arch/arm64/boot/dts/qcom/sdm850-lenovo-yoga-c630.dts
> +++ b/arch/arm64/boot/dts/qcom/sdm850-lenovo-yoga-c630.dts
> @@ -245,6 +245,13 @@ &gcc {
> <GCC_QSPI_CNOC_PERIPH_AHB_CLK>;
> };
>
> +&gpu {
> + zap-shader {
> + memory-region = <&gpu_mem>;
> + firmware-name = "qcom/LENOVO/81JL/qcdxkmsuc850.mbn";
> + };
> +};
> +
> &i2c1 {
> status = "okay";
> clock-frequency = <400000>;
> --
> 2.24.1
>
_______________________________________________
dri-devel mailing list
dri-devel@xxxxxxxxxxxxxxxxxxxxx
https://lists.freedesktop.org/mailman/listinfo/dri-devel
