| Message ID | 20220430161529.605843-1-konrad.dybcio@somainline.org (mailing list archive) |
|---|---|
| State | Not Applicable |
| Headers | show |
| Series | [1/3] dt-bindings: display: msm: Add binding for MSM8996 DPU | expand |
On 30/04/2022 19:15, Konrad Dybcio wrote: > Add yaml binding for MSM8996 DPU. > > Signed-off-by: Konrad Dybcio <konrad.dybcio@somainline.org> > --- > .../bindings/display/msm/dpu-msm8996.yaml | 221 ++++++++++++++++++ > 1 file changed, 221 insertions(+) > create mode 100644 Documentation/devicetree/bindings/display/msm/dpu-msm8996.yaml > > diff --git a/Documentation/devicetree/bindings/display/msm/dpu-msm8996.yaml b/Documentation/devicetree/bindings/display/msm/dpu-msm8996.yaml > new file mode 100644 > index 000000000000..10b02423224d > --- /dev/null > +++ b/Documentation/devicetree/bindings/display/msm/dpu-msm8996.yaml > @@ -0,0 +1,221 @@ > +# SPDX-License-Identifier: GPL-2.0-only or BSD-2-Clause > +%YAML 1.2 > +--- > +$id: http://devicetree.org/schemas/display/msm/dpu-msm8996.yaml# > +$schema: http://devicetree.org/meta-schemas/core.yaml# > + > +title: Qualcomm Display DPU dt properties for MSM8996 target > + > +maintainers: > + - Konrad Dybcio <konrad.dybcio@somainline.org> > + > +description: | > + Device tree bindings for MSM Mobile Display Subsystem (MDSS) that > + encapsulates sub-blocks like DPU display controller, DSI interfaces, etc. > + Device tree bindings of MDSS and DPU are mentioned for MSM8996 target. > + > +properties: > + compatible: > + items: > + - const: qcom,msm8996-mdss With the unified MDSS driver there is no need to describe a separate mdss bindings. Let's skip this part for now. > + > + reg: > + maxItems: 1 > + > + reg-names: > + const: mdss > + > + power-domains: > + maxItems: 1 > + > + clocks: > + items: > + - description: Display AHB clock > + - description: Display core clock > + > + clock-names: > + items: > + - const: iface > + - const: core > + > + interrupts: > + maxItems: 1 > + > + interrupt-controller: true > + > + "#address-cells": true > + > + "#size-cells": true > + > + "#interrupt-cells": > + const: 1 > + > + iommus: > + items: > + - description: Phandle to mdp_smmu node with SID mask for Hard-Fail port0 > + > + ranges: true > + > +patternProperties: > + "^display-controller@[0-9a-f]+$": > + type: object > + description: Node containing the properties of DPU. > + > + properties: > + compatible: > + items: > + - const: qcom,msm8996-dpu Okay. So, this is the most interesting part. Unlike MSM8998, which is supported in the mdp5 driver, but was not used in the upstream DTS files, for the MSM8996 the MDP5 part is described, used and widely tested. And, unfortunately, the bindings use solely the generic "qcom,mdp5" compat. I would suggest the following plan: - Define a binding using both "qcom,msm8996-dpu" and "qcom,mdp5" strings. Make sure that it is fully backwards-compatible with older dts. - Update msm8996.dtsi to follow new binding. - Let's have a Kconfig flip switch selecting which driver to be used for 8996/8998. > + > + reg: > + items: > + - description: Address offset and size for mdp register set > + - description: Address offset and size for vbif register set > + - description: Address offset and size for non-realtime vbif register set > + > + reg-names: > + items: > + - const: mdp > + - const: vbif > + - const: vbif_nrt > + > + clocks: > + items: > + - description: Display ahb clock > + - description: Display axi clock > + - description: Display core clock > + - description: Display iommu clock > + - description: Display vsync clock > + > + clock-names: > + items: > + - const: iface > + - const: bus > + - const: core > + - const: iommu > + - const: vsync > + > + interrupts: > + maxItems: 1 > + > + power-domains: > + maxItems: 1 > + > + operating-points-v2: true > + ports: > + $ref: /schemas/graph.yaml#/properties/ports > + description: | > + Contains the list of output ports from DPU device. These ports > + connect to interfaces that are external to the DPU hardware, > + such as DSI, DP etc. Each output port contains an endpoint that > + describes how it is connected to an external interface. > + > + properties: > + port@0: > + $ref: /schemas/graph.yaml#/properties/port > + description: DPU_INTF3 (HDMI) > + > + port@1: > + $ref: /schemas/graph.yaml#/properties/port > + description: DPU_INTF1 (DSI0) > + > + required: > + - port@0 > + - port@1 > + > + required: > + - compatible > + - reg > + - reg-names > + - clocks > + - interrupts > + - power-domains > + - operating-points-v2 > + - ports > + > +required: > + - compatible > + - reg > + - reg-names > + - power-domains > + - clocks > + - interrupts > + - interrupt-controller > + - iommus > + - ranges > + > +additionalProperties: false > + > +examples: > + - | > + #include <dt-bindings/clock/qcom,mmcc-msm8996.h> > + #include <dt-bindings/interrupt-controller/arm-gic.h> > + #include <dt-bindings/power/qcom-rpmpd.h> > + > + mdss: display-subsystem@900000 { > + compatible = "qcom,msm8996-mdss"; > + reg = <0x00900000 0x1000>; > + reg-names = "mdss"; > + > + power-domains = <&mmcc MDSS_GDSC>; > + > + clocks = <&mmcc MDSS_AHB_CLK>, <&mmcc MDSS_MDP_CLK>; > + clock-names = "iface", "core"; > + > + assigned-clocks = <&mmcc MDSS_MDP_CLK>; > + assigned-clock-rates = <300000000>; This should not be necessary. > + > + interrupts = <GIC_SPI 83 IRQ_TYPE_LEVEL_HIGH>; > + interrupt-controller; > + #interrupt-cells = <1>; > + > + iommus = <&mdp_smmu 0>; > + > + #address-cells = <1>; > + #size-cells = <1>; > + ranges; > + > + display-controller@901000 { > + compatible = "qcom,msm8996-dpu"; > + reg = <0x00901000 0x90000>, > + <0x009b0000 0x1040>, > + <0x009b8000 0x1040>; > + reg-names = "mdp", "vbif", "vbif_nrt"; > + > + clocks = <&mmcc MDSS_AHB_CLK>, > + <&mmcc MDSS_AXI_CLK>, > + <&mmcc MDSS_MDP_CLK>, > + <&mmcc SMMU_MDP_AXI_CLK>, > + <&mmcc MDSS_VSYNC_CLK>; > + clock-names = "iface", "bus", "core", "iommu", "vsync"; > + > + assigned-clocks = <&mmcc MDSS_MDP_CLK>, > + <&mmcc MDSS_VSYNC_CLK>; > + assigned-clock-rates = <412500000>, <19200000>; MDP_CLK here should not be neccessary after Vinod Polimera's patches. > + > + operating-points-v2 = <&mdp_opp_table>; > + power-domains = <&rpmpd MSM8996_VDDMX>; > + > + interrupt-parent = <&mdss>; > + interrupts = <0 IRQ_TYPE_LEVEL_HIGH>; > + > + ports { > + #address-cells = <1>; > + #size-cells = <0>; > + > + port@0 { > + reg = <0>; > + dpu_intf3_out: endpoint { > + remote-endpoint = <&hdmi_in>; > + }; > + }; > + > + port@1 { > + reg = <1>; > + dpu_intf1_out: endpoint { > + remote-endpoint = <&dsi0_in>; > + }; > + }; > + }; > + }; > + }; > +...
On 30/04/2022 22:33, Dmitry Baryshkov wrote: > On 30/04/2022 19:15, Konrad Dybcio wrote: >> Add yaml binding for MSM8996 DPU. >> >> Signed-off-by: Konrad Dybcio <konrad.dybcio@somainline.org> >> --- >> .../bindings/display/msm/dpu-msm8996.yaml | 221 ++++++++++++++++++ >> 1 file changed, 221 insertions(+) >> create mode 100644 >> Documentation/devicetree/bindings/display/msm/dpu-msm8996.yaml >> >> diff --git >> a/Documentation/devicetree/bindings/display/msm/dpu-msm8996.yaml >> b/Documentation/devicetree/bindings/display/msm/dpu-msm8996.yaml >> new file mode 100644 >> index 000000000000..10b02423224d >> --- /dev/null >> +++ b/Documentation/devicetree/bindings/display/msm/dpu-msm8996.yaml >> @@ -0,0 +1,221 @@ >> +# SPDX-License-Identifier: GPL-2.0-only or BSD-2-Clause >> +%YAML 1.2 >> +--- >> +$id: http://devicetree.org/schemas/display/msm/dpu-msm8996.yaml# >> +$schema: http://devicetree.org/meta-schemas/core.yaml# >> + >> +title: Qualcomm Display DPU dt properties for MSM8996 target >> + >> +maintainers: >> + - Konrad Dybcio <konrad.dybcio@somainline.org> >> + >> +description: | >> + Device tree bindings for MSM Mobile Display Subsystem (MDSS) that >> + encapsulates sub-blocks like DPU display controller, DSI >> interfaces, etc. >> + Device tree bindings of MDSS and DPU are mentioned for MSM8996 target. >> + >> +properties: >> + compatible: >> + items: >> + - const: qcom,msm8996-mdss > > With the unified MDSS driver there is no need to describe a separate > mdss bindings. Let's skip this part for now. > >> + >> + reg: >> + maxItems: 1 >> + >> + reg-names: >> + const: mdss >> + >> + power-domains: >> + maxItems: 1 >> + >> + clocks: >> + items: >> + - description: Display AHB clock >> + - description: Display core clock >> + >> + clock-names: >> + items: >> + - const: iface >> + - const: core >> + >> + interrupts: >> + maxItems: 1 >> + >> + interrupt-controller: true >> + >> + "#address-cells": true >> + >> + "#size-cells": true >> + >> + "#interrupt-cells": >> + const: 1 >> + >> + iommus: >> + items: >> + - description: Phandle to mdp_smmu node with SID mask for >> Hard-Fail port0 >> + >> + ranges: true >> + >> +patternProperties: >> + "^display-controller@[0-9a-f]+$": >> + type: object >> + description: Node containing the properties of DPU. >> + >> + properties: >> + compatible: >> + items: >> + - const: qcom,msm8996-dpu > > Okay. So, this is the most interesting part. Unlike MSM8998, which is > supported in the mdp5 driver, but was not used in the upstream DTS > files, for the MSM8996 the MDP5 part is described, used and widely > tested. And, unfortunately, the bindings use solely the generic > "qcom,mdp5" compat. > > I would suggest the following plan: > - Define a binding using both "qcom,msm8996-dpu" and "qcom,mdp5" > strings. Make sure that it is fully backwards-compatible with older dts. > > - Update msm8996.dtsi to follow new binding. > > - Let's have a Kconfig flip switch selecting which driver to be used for > 8996/8998. Rob suggested a modparam here.
diff --git a/Documentation/devicetree/bindings/display/msm/dpu-msm8996.yaml b/Documentation/devicetree/bindings/display/msm/dpu-msm8996.yaml new file mode 100644 index 000000000000..10b02423224d --- /dev/null +++ b/Documentation/devicetree/bindings/display/msm/dpu-msm8996.yaml @@ -0,0 +1,221 @@ +# SPDX-License-Identifier: GPL-2.0-only or BSD-2-Clause +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/display/msm/dpu-msm8996.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Qualcomm Display DPU dt properties for MSM8996 target + +maintainers: + - Konrad Dybcio <konrad.dybcio@somainline.org> + +description: | + Device tree bindings for MSM Mobile Display Subsystem (MDSS) that + encapsulates sub-blocks like DPU display controller, DSI interfaces, etc. + Device tree bindings of MDSS and DPU are mentioned for MSM8996 target. + +properties: + compatible: + items: + - const: qcom,msm8996-mdss + + reg: + maxItems: 1 + + reg-names: + const: mdss + + power-domains: + maxItems: 1 + + clocks: + items: + - description: Display AHB clock + - description: Display core clock + + clock-names: + items: + - const: iface + - const: core + + interrupts: + maxItems: 1 + + interrupt-controller: true + + "#address-cells": true + + "#size-cells": true + + "#interrupt-cells": + const: 1 + + iommus: + items: + - description: Phandle to mdp_smmu node with SID mask for Hard-Fail port0 + + ranges: true + +patternProperties: + "^display-controller@[0-9a-f]+$": + type: object + description: Node containing the properties of DPU. + + properties: + compatible: + items: + - const: qcom,msm8996-dpu + + reg: + items: + - description: Address offset and size for mdp register set + - description: Address offset and size for vbif register set + - description: Address offset and size for non-realtime vbif register set + + reg-names: + items: + - const: mdp + - const: vbif + - const: vbif_nrt + + clocks: + items: + - description: Display ahb clock + - description: Display axi clock + - description: Display core clock + - description: Display iommu clock + - description: Display vsync clock + + clock-names: + items: + - const: iface + - const: bus + - const: core + - const: iommu + - const: vsync + + interrupts: + maxItems: 1 + + power-domains: + maxItems: 1 + + operating-points-v2: true + ports: + $ref: /schemas/graph.yaml#/properties/ports + description: | + Contains the list of output ports from DPU device. These ports + connect to interfaces that are external to the DPU hardware, + such as DSI, DP etc. Each output port contains an endpoint that + describes how it is connected to an external interface. + + properties: + port@0: + $ref: /schemas/graph.yaml#/properties/port + description: DPU_INTF3 (HDMI) + + port@1: + $ref: /schemas/graph.yaml#/properties/port + description: DPU_INTF1 (DSI0) + + required: + - port@0 + - port@1 + + required: + - compatible + - reg + - reg-names + - clocks + - interrupts + - power-domains + - operating-points-v2 + - ports + +required: + - compatible + - reg + - reg-names + - power-domains + - clocks + - interrupts + - interrupt-controller + - iommus + - ranges + +additionalProperties: false + +examples: + - | + #include <dt-bindings/clock/qcom,mmcc-msm8996.h> + #include <dt-bindings/interrupt-controller/arm-gic.h> + #include <dt-bindings/power/qcom-rpmpd.h> + + mdss: display-subsystem@900000 { + compatible = "qcom,msm8996-mdss"; + reg = <0x00900000 0x1000>; + reg-names = "mdss"; + + power-domains = <&mmcc MDSS_GDSC>; + + clocks = <&mmcc MDSS_AHB_CLK>, <&mmcc MDSS_MDP_CLK>; + clock-names = "iface", "core"; + + assigned-clocks = <&mmcc MDSS_MDP_CLK>; + assigned-clock-rates = <300000000>; + + interrupts = <GIC_SPI 83 IRQ_TYPE_LEVEL_HIGH>; + interrupt-controller; + #interrupt-cells = <1>; + + iommus = <&mdp_smmu 0>; + + #address-cells = <1>; + #size-cells = <1>; + ranges; + + display-controller@901000 { + compatible = "qcom,msm8996-dpu"; + reg = <0x00901000 0x90000>, + <0x009b0000 0x1040>, + <0x009b8000 0x1040>; + reg-names = "mdp", "vbif", "vbif_nrt"; + + clocks = <&mmcc MDSS_AHB_CLK>, + <&mmcc MDSS_AXI_CLK>, + <&mmcc MDSS_MDP_CLK>, + <&mmcc SMMU_MDP_AXI_CLK>, + <&mmcc MDSS_VSYNC_CLK>; + clock-names = "iface", "bus", "core", "iommu", "vsync"; + + assigned-clocks = <&mmcc MDSS_MDP_CLK>, + <&mmcc MDSS_VSYNC_CLK>; + assigned-clock-rates = <412500000>, <19200000>; + + operating-points-v2 = <&mdp_opp_table>; + power-domains = <&rpmpd MSM8996_VDDMX>; + + interrupt-parent = <&mdss>; + interrupts = <0 IRQ_TYPE_LEVEL_HIGH>; + + ports { + #address-cells = <1>; + #size-cells = <0>; + + port@0 { + reg = <0>; + dpu_intf3_out: endpoint { + remote-endpoint = <&hdmi_in>; + }; + }; + + port@1 { + reg = <1>; + dpu_intf1_out: endpoint { + remote-endpoint = <&dsi0_in>; + }; + }; + }; + }; + }; +...
Add yaml binding for MSM8996 DPU. Signed-off-by: Konrad Dybcio <konrad.dybcio@somainline.org> --- .../bindings/display/msm/dpu-msm8996.yaml | 221 ++++++++++++++++++ 1 file changed, 221 insertions(+) create mode 100644 Documentation/devicetree/bindings/display/msm/dpu-msm8996.yaml