Commit 7f7a942c authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'drm-next-20221025' of git://linuxtv.org/pinchartl/media into drm-next 



Xilinx ZynqMP DisplayPort bridge support

Signed-off-by: default avatarDave Airlie <airlied@redhat.com>

From: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Link: https://patchwork.freedesktop.org/patch/msgid/Y1cdU4HJoy0Pr2sQ@pendragon.ideasonboard.com
parents 0a20a3ea ddcb8fa6

Documentation/devicetree/bindings/display/xlnx/xlnx,zynqmp-dpsub.yaml

+67 −0
Original line number Diff line number Diff line
@@ -117,6 +117,45 @@ properties: 
      - const: dp-phy0

      - const: dp-phy1



  ports:

    $ref: /schemas/graph.yaml#/properties/ports

    description: |

      Connections to the programmable logic and the DisplayPort PHYs. Each port

      shall have a single endpoint.



    properties:

      port@0:

        $ref: /schemas/graph.yaml#/properties/port

        description: The live video input from the programmable logic



      port@1:

        $ref: /schemas/graph.yaml#/properties/port

        description: The live graphics input from the programmable logic



      port@2:

        $ref: /schemas/graph.yaml#/properties/port

        description: The live audio input from the programmable logic



      port@3:

        $ref: /schemas/graph.yaml#/properties/port

        description: The blended video output to the programmable logic



      port@4:

        $ref: /schemas/graph.yaml#/properties/port

        description: The mixed audio output to the programmable logic



      port@5:

        $ref: /schemas/graph.yaml#/properties/port

        description: The DisplayPort output



    required:

      - port@0

      - port@1

      - port@2

      - port@3

      - port@4

      - port@5



required:

  - compatible

  - reg
@@ -130,6 +169,7 @@ required: 
  - dma-names

  - phys

  - phy-names

  - ports



additionalProperties: false
@@ -164,6 +204,33 @@ examples: 
               <&psgtr 0 PHY_TYPE_DP 1 3>;



        phy-names = "dp-phy0", "dp-phy1";



        ports {

            #address-cells = <1>;

            #size-cells = <0>;



            port@0 {

                reg = <0>;

            };

            port@1 {

                reg = <1>;

            };

            port@2 {

                reg = <2>;

            };

            port@3 {

                reg = <3>;

            };

            port@4 {

                reg = <4>;

            };

            port@5 {

                reg = <5>;

                dpsub_dp_out: endpoint {

                    remote-endpoint = <&dp_connector>;

                };

            };

        };

    };



...

arch/arm64/boot/dts/xilinx/zynqmp-zcu106-revA.dts

+20 −0
Original line number Diff line number Diff line
@@ -150,6 +150,18 @@ 
		#clock-cells = <0>;

		clock-frequency = <114285000>;

	};



	dpcon {

		compatible = "dp-connector";

		label = "P11";

		type = "full-size";



		port {

			dpcon_in: endpoint {

				remote-endpoint = <&dpsub_dp_out>;

			};

		};

	};

};



&can1 {
@@ -1015,4 +1027,12 @@ 
	phy-names = "dp-phy0", "dp-phy1";

	phys = <&psgtr 1 PHY_TYPE_DP 0 3>,

	       <&psgtr 0 PHY_TYPE_DP 1 3>;



	ports {

		port@5 {

			dpsub_dp_out: endpoint {

				remote-endpoint = <&dpcon_in>;

			};

		};

	};

};

arch/arm64/boot/dts/xilinx/zynqmp.dtsi

+24 −0
Original line number Diff line number Diff line
@@ -930,6 +930,30 @@ 
			       <&zynqmp_dpdma ZYNQMP_DPDMA_VIDEO1>,

			       <&zynqmp_dpdma ZYNQMP_DPDMA_VIDEO2>,

			       <&zynqmp_dpdma ZYNQMP_DPDMA_GRAPHICS>;



			ports {

				#address-cells = <1>;

				#size-cells = <0>;



				port@0 {

					reg = <0>;

				};

				port@1 {

					reg = <1>;

				};

				port@2 {

					reg = <2>;

				};

				port@3 {

					reg = <3>;

				};

				port@4 {

					reg = <4>;

				};

				port@5 {

					reg = <5>;

				};

			};

		};

	};

};

drivers/gpu/drm/xlnx/Makefile

+1 −1
Original line number Diff line number Diff line 
zynqmp-dpsub-y := zynqmp_disp.o zynqmp_dpsub.o zynqmp_dp.o

zynqmp-dpsub-y := zynqmp_disp.o zynqmp_dpsub.o zynqmp_dp.o zynqmp_kms.o

obj-$(CONFIG_DRM_ZYNQMP_DPSUB) += zynqmp-dpsub.o

drivers/gpu/drm/xlnx/zynqmp_disp.c

+118 −528

File changed.

Preview size limit exceeded, changes collapsed.