Commit 3ffff3c6 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'drm-misc-next-2020-07-16' of git://anongit.freedesktop.org/drm/drm-misc into drm-next 



drm-misc-next for v5.9:

UAPI Changes:

Cross-subsystem Changes:
- Add ckoenig as dma-buf maintainer.
- Revert invalid fix for dma-fence-chain, and fix selftest.
- Add fixmes to amifb about APUS support.
- Use array3_size in fbcon_prepare_logo, and struct_size() in alloc_apertures.
- Fix leaks in neofb, fb/savage and omapfb.
- Other small fixes to fb code.
- Convert some dt bindings to schema for some panels, and fix simple-framebuffer dt example.

Core Changes:
- Add DRM_FORMAT_MOD_GENERIC_16_16_TILE as alias to DRM_FORMAT_MOD_SAMSUNG_16_16_TILE,
  as it can be used more generic.
- Add support for multiple DispID extension blocks in edid.
- Use https instead of http for some of the urls.
- Use drm_* macros for logging in mipi-dsi and fb-helper.
- Further cleanup ttm_mem_reg handling.
- Remove duplicated words in comments.

Driver Changes:
- Use __drm_atomic_helper_crtc_reset in all atomic drivers.
- Add Amlogic Video FBC support to meson and fourcc to core.
- Refactor hisilicon's hibmc_drv_vdac.
- Create a TXP CRTC for vc4.
- Rework cursor support in ast.
- Fix runtime PM in STM.
- Allow bigger cursors in vkms.
- Cleanup sg handling in radeon and amdgpu, and stop creating dummy
  gtt nodes with ttm fixed.
- Rework crtc handling in mgag200.
- Miscellaneous small fixes to meson, vgem, bridge/dw-hdmi,
  panel/auo,b116xw03, panel/LG LB070WV8, lima, bridge/sil_sii8620,
  virtio, tilcdc.

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

From: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/8b360d65-f228-9286-d247-3004156a5254@linux.intel.com
parents 1cc4af41 947fcfea

Documentation/devicetree/bindings/display/brcm,bcm2835-dpi.yaml

+0 −10
Original line number Diff line number Diff line
@@ -45,16 +45,6 @@ examples: 
  - |

    #include <dt-bindings/clock/bcm2835.h>



    panel: panel {

        compatible = "ontat,yx700wv03", "simple-panel";



        port {

            panel_in: endpoint {

                remote-endpoint = <&dpi_out>;

            };

        };

    };



    dpi: dpi@7e208000 {

        compatible = "brcm,bcm2835-dpi";

        reg = <0x7e208000 0x8c>;

Documentation/devicetree/bindings/display/bridge/renesas,lvds.txt

deleted100644 → 0
+0 −85
Original line number Diff line number Diff line 
Renesas R-Car LVDS Encoder

==========================



These DT bindings describe the LVDS encoder embedded in the Renesas R-Car

Gen2, R-Car Gen3 and RZ/G SoCs.



Required properties:



- compatible : Shall contain one of

  - "renesas,r8a7743-lvds" for R8A7743 (RZ/G1M) compatible LVDS encoders

  - "renesas,r8a7744-lvds" for R8A7744 (RZ/G1N) compatible LVDS encoders

  - "renesas,r8a774a1-lvds" for R8A774A1 (RZ/G2M) compatible LVDS encoders

  - "renesas,r8a774b1-lvds" for R8A774B1 (RZ/G2N) compatible LVDS encoders

  - "renesas,r8a774c0-lvds" for R8A774C0 (RZ/G2E) compatible LVDS encoders

  - "renesas,r8a7790-lvds" for R8A7790 (R-Car H2) compatible LVDS encoders

  - "renesas,r8a7791-lvds" for R8A7791 (R-Car M2-W) compatible LVDS encoders

  - "renesas,r8a7793-lvds" for R8A7793 (R-Car M2-N) compatible LVDS encoders

  - "renesas,r8a7795-lvds" for R8A7795 (R-Car H3) compatible LVDS encoders

  - "renesas,r8a7796-lvds" for R8A7796 (R-Car M3-W) compatible LVDS encoders

  - "renesas,r8a77965-lvds" for R8A77965 (R-Car M3-N) compatible LVDS encoders

  - "renesas,r8a77970-lvds" for R8A77970 (R-Car V3M) compatible LVDS encoders

  - "renesas,r8a77980-lvds" for R8A77980 (R-Car V3H) compatible LVDS encoders

  - "renesas,r8a77990-lvds" for R8A77990 (R-Car E3) compatible LVDS encoders

  - "renesas,r8a77995-lvds" for R8A77995 (R-Car D3) compatible LVDS encoders



- reg: Base address and length for the memory-mapped registers

- clocks: A list of phandles + clock-specifier pairs, one for each entry in

  the clock-names property.

- clock-names: Name of the clocks. This property is model-dependent.

  - The functional clock, which mandatory for all models, shall be listed

    first, and shall be named "fck".

  - On R8A77990, R8A77995 and R8A774C0, the LVDS encoder can use the EXTAL or

    DU_DOTCLKINx clocks. Those clocks are optional. When supplied they must be

    named "extal" and "dclkin.x" respectively, with "x" being the DU_DOTCLKIN

    numerical index.

  - When the clocks property only contains the functional clock, the

    clock-names property may be omitted.

- resets: A phandle + reset specifier for the module reset



Required nodes:



The LVDS encoder has two video ports. Their connections are modelled using the

OF graph bindings specified in Documentation/devicetree/bindings/graph.txt.



- Video port 0 corresponds to the parallel RGB input

- Video port 1 corresponds to the LVDS output



Each port shall have a single endpoint.



Optional properties:



- renesas,companion : phandle to the companion LVDS encoder. This property is

  mandatory for the first LVDS encoder on D3 and E3 SoCs, and shall point to

  the second encoder to be used as a companion in dual-link mode. It shall not

  be set for any other LVDS encoder.





Example:



	lvds0: lvds@feb90000 {

		compatible = "renesas,r8a77990-lvds";

		reg = <0 0xfeb90000 0 0x20>;

		clocks = <&cpg CPG_MOD 727>;

		power-domains = <&sysc R8A77990_PD_ALWAYS_ON>;

		resets = <&cpg 727>;



		renesas,companion = <&lvds1>;



		ports {

			#address-cells = <1>;

			#size-cells = <0>;



			port@0 {

				reg = <0>;

				lvds0_in: endpoint {

					remote-endpoint = <&du_out_lvds0>;

				};

			};

			port@1 {

				reg = <1>;

				lvds0_out: endpoint {

				};

			};

		};

	};

Documentation/devicetree/bindings/display/bridge/renesas,lvds.yaml

0 → 100644
+248 −0
Original line number Diff line number Diff line 
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)

%YAML 1.2

---

$id: http://devicetree.org/schemas/display/bridge/renesas,lvds.yaml#

$schema: http://devicetree.org/meta-schemas/core.yaml#



title: Renesas R-Car LVDS Encoder



maintainers:

  - Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>



description: |

  These DT bindings describe the LVDS encoder embedded in the Renesas R-Car

  Gen2, R-Car Gen3, RZ/G1 and RZ/G2 SoCs.



properties:

  compatible:

    enum:

      - renesas,r8a7743-lvds # for RZ/G1M compatible LVDS encoders

      - renesas,r8a7744-lvds # for RZ/G1N compatible LVDS encoders

      - renesas,r8a774a1-lvds # for RZ/G2M compatible LVDS encoders

      - renesas,r8a774b1-lvds # for RZ/G2N compatible LVDS encoders

      - renesas,r8a774c0-lvds # for RZ/G2E compatible LVDS encoders

      - renesas,r8a7790-lvds # for R-Car H2 compatible LVDS encoders

      - renesas,r8a7791-lvds # for R-Car M2-W compatible LVDS encoders

      - renesas,r8a7793-lvds # for R-Car M2-N compatible LVDS encoders

      - renesas,r8a7795-lvds # for R-Car H3 compatible LVDS encoders

      - renesas,r8a7796-lvds # for R-Car M3-W compatible LVDS encoders

      - renesas,r8a77965-lvds # for R-Car M3-N compatible LVDS encoders

      - renesas,r8a77970-lvds # for R-Car V3M compatible LVDS encoders

      - renesas,r8a77980-lvds # for R-Car V3H compatible LVDS encoders

      - renesas,r8a77990-lvds # for R-Car E3 compatible LVDS encoders

      - renesas,r8a77995-lvds # for R-Car D3 compatible LVDS encoders



  reg:

    maxItems: 1



  clocks:

    minItems: 1

    maxItems: 4



  clock-names:

    minItems: 1

    maxItems: 4



  resets:

    maxItems: 1



  ports:

    type: object

    description: |

      This device has two video ports. Their connections are modelled using the

      OF graph bindings specified in Documentation/devicetree/bindings/graph.txt.

      Each port shall have a single endpoint.



    properties:

      '#address-cells':

        const: 1



      '#size-cells':

        const: 0



      port@0:

        type: object

        description: Parallel RGB input port



      port@1:

        type: object

        description: LVDS output port



    required:

      - port@0

      - port@1



    additionalProperties: false



  power-domains:

    maxItems: 1



  renesas,companion:

    $ref: /schemas/types.yaml#/definitions/phandle

    description:

      phandle to the companion LVDS encoder. This property is mandatory

      for the first LVDS encoder on D3 and E3 SoCs, and shall point to

      the second encoder to be used as a companion in dual-link mode. It

      shall not be set for any other LVDS encoder.



required:

  - compatible

  - reg

  - clocks

  - power-domains

  - resets

  - ports



if:

  properties:

    compatible:

      enum:

        - renesas,r8a774c0-lvds

        - renesas,r8a77990-lvds

        - renesas,r8a77995-lvds

then:

  properties:

    clocks:

      minItems: 1

      maxItems: 4

      items:

        - description: Functional clock

        - description: EXTAL input clock

        - description: DU_DOTCLKIN0 input clock

        - description: DU_DOTCLKIN1 input clock



    clock-names:

      minItems: 1

      maxItems: 4

      items:

        - const: fck

        # The LVDS encoder can use the EXTAL or DU_DOTCLKINx clocks.

        # These clocks are optional.

        - enum:

          - extal

          - dclkin.0

          - dclkin.1

        - enum:

          - extal

          - dclkin.0

          - dclkin.1

        - enum:

          - extal

          - dclkin.0

          - dclkin.1



  required:

    - clock-names



else:

  properties:

    clocks:

      maxItems: 1

      items:

        - description: Functional clock



    clock-names:

      maxItems: 1

      items:

        - const: fck



    renesas,companion: false



additionalProperties: false



examples:

  - |

    #include <dt-bindings/clock/renesas-cpg-mssr.h>

    #include <dt-bindings/power/r8a7795-sysc.h>



    lvds@feb90000 {

        compatible = "renesas,r8a7795-lvds";

        reg = <0xfeb90000 0x14>;

        clocks = <&cpg CPG_MOD 727>;

        power-domains = <&sysc R8A7795_PD_ALWAYS_ON>;

        resets = <&cpg 727>;



        ports {

            #address-cells = <1>;

            #size-cells = <0>;



            port@0 {

                reg = <0>;

                lvds_in: endpoint {

                    remote-endpoint = <&du_out_lvds0>;

                };

            };

            port@1 {

                reg = <1>;

                lvds_out: endpoint {

                    remote-endpoint = <&panel_in>;

                };

            };

        };

    };



  - |

    #include <dt-bindings/clock/renesas-cpg-mssr.h>

    #include <dt-bindings/power/r8a77990-sysc.h>



    lvds0: lvds@feb90000 {

        compatible = "renesas,r8a77990-lvds";

        reg = <0xfeb90000 0x20>;

        clocks = <&cpg CPG_MOD 727>,

                 <&x13_clk>,

                 <&extal_clk>;

        clock-names = "fck", "dclkin.0", "extal";

        power-domains = <&sysc R8A77990_PD_ALWAYS_ON>;

        resets = <&cpg 727>;



        renesas,companion = <&lvds1>;



        ports {

            #address-cells = <1>;

            #size-cells = <0>;



            port@0 {

                reg = <0>;

                lvds0_in: endpoint {

                    remote-endpoint = <&du_out_lvds0>;

                };

            };

            port@1 {

                reg = <1>;

                lvds0_out: endpoint {

                    remote-endpoint = <&panel_in1>;

                };

            };

        };

    };



    lvds1: lvds@feb90100 {

        compatible = "renesas,r8a77990-lvds";

        reg = <0xfeb90100 0x20>;

        clocks = <&cpg CPG_MOD 727>,

                 <&x13_clk>,

                 <&extal_clk>;

        clock-names = "fck", "dclkin.0", "extal";

        power-domains = <&sysc R8A77990_PD_ALWAYS_ON>;

        resets = <&cpg 726>;



        ports {

            #address-cells = <1>;

            #size-cells = <0>;



            port@0 {

                reg = <0>;

                lvds1_in: endpoint {

                    remote-endpoint = <&du_out_lvds1>;

                };

            };

            port@1 {

                reg = <1>;

                lvds1_out: endpoint {

                    remote-endpoint = <&panel_in2>;

                };

            };

        };

    };



...

Documentation/devicetree/bindings/display/connector/analog-tv-connector.txt

deleted100644 → 0
+0 −31
Original line number Diff line number Diff line 
Analog TV Connector

===================



Required properties:

- compatible: "composite-video-connector" or "svideo-connector"



Optional properties:

- label: a symbolic name for the connector

- sdtv-standards: limit the supported TV standards on a connector to the given

                  ones. If not specified all TV standards are allowed.

                  Possible TV standards are defined in

                  include/dt-bindings/display/sdtv-standards.h.



Required nodes:

- Video port for TV input



Example

-------

#include <dt-bindings/display/sdtv-standards.h>



tv: connector {

	compatible = "composite-video-connector";

	label = "tv";

	sdtv-standards = <(SDTV_STD_PAL | SDTV_STD_NTSC)>;



	port {

		tv_connector_in: endpoint {

			remote-endpoint = <&venc_out>;

		};

	};

};

Documentation/devicetree/bindings/display/connector/analog-tv-connector.yaml

0 → 100644
+52 −0
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0-only

%YAML 1.2

---

$id: http://devicetree.org/schemas/display/connector/analog-tv-connector.yaml#

$schema: http://devicetree.org/meta-schemas/core.yaml#



title: Analog TV Connector



maintainers:

  - Laurent Pinchart <Laurent.pinchart@ideasonboard.com>



properties:

  compatible:

    enum:

      - composite-video-connector

      - svideo-connector



  label: true



  sdtv-standards:

    description:

      Limit the supported TV standards on a connector to the given ones. If

      not specified all TV standards are allowed. Possible TV standards are

      defined in include/dt-bindings/display/sdtv-standards.h.

    $ref: /schemas/types.yaml#/definitions/uint32



  port:

    description: Connection to controller providing analog TV signals



required:

  - compatible

  - port



additionalProperties: false



examples:

  - |

    #include <dt-bindings/display/sdtv-standards.h>



    connector {

        compatible = "composite-video-connector";

        label = "tv";

        sdtv-standards = <(SDTV_STD_PAL | SDTV_STD_NTSC)>;



        port {

            tv_connector_in: endpoint {

                remote-endpoint = <&venc_out>;

            };

        };

    };



...

CRA Git | Maintained and supported by SUSTech CRA and CCSE