Commit 45365b65 authored by Dave Airlie's avatar Dave Airlie
Browse files

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



drm-misc-next for v6.5:

UAPI Changes:

Cross-subsystem Changes:

Core Changes:

Driver Changes:

 * bridge
   * imx: Fix module linking
   * tc358762: Support reset GPIO

 * meson
   * Add support for MIPI DSI displays; plus fixes and DT bindings

 * panel
   * Add Support for Rocktech RK043FN48H; plus DT bindings
   * Add support for Starry himax83102-j02; plus DT bindings
   * Add support for Starry ili9882t; plus DT bindings

 * virtio
   * Support sync-object UAPI

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

From: Thomas Zimmermann <tzimmermann@suse.de>
Link: https://patchwork.freedesktop.org/patch/msgid/20230607085644.GA12673@linux-uq9g
parents 7f4f4adb 13cdd12a

.mailmap

+1 −0
Original line number Diff line number Diff line
@@ -327,6 +327,7 @@ Mauro Carvalho Chehab <mchehab@kernel.org> <m.chehab@samsung.com> 
Mauro Carvalho Chehab <mchehab@kernel.org> <mchehab@s-opensource.com>

Maxim Mikityanskiy <maxtram95@gmail.com> <maximmi@mellanox.com>

Maxim Mikityanskiy <maxtram95@gmail.com> <maximmi@nvidia.com>

Maxime Ripard <mripard@kernel.org> <maxime@cerno.tech>

Maxime Ripard <mripard@kernel.org> <maxime.ripard@bootlin.com>

Maxime Ripard <mripard@kernel.org> <maxime.ripard@free-electrons.com>

Mayuresh Janorkar <mayur@ti.com>

Documentation/devicetree/bindings/display/amlogic,meson-g12a-dw-mipi-dsi.yaml

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

# Copyright 2020 BayLibre, SAS

%YAML 1.2

---

$id: http://devicetree.org/schemas/display/amlogic,meson-g12a-dw-mipi-dsi.yaml#

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



title: Amlogic specific extensions to the Synopsys Designware MIPI DSI Host Controller



maintainers:

  - Neil Armstrong <neil.armstrong@linaro.org>



description: |

  The Amlogic Meson Synopsys Designware Integration is composed of

  - A Synopsys DesignWare MIPI DSI Host Controller IP

  - A TOP control block controlling the Clocks & Resets of the IP



allOf:

  - $ref: dsi-controller.yaml#



properties:

  compatible:

    enum:

      - amlogic,meson-g12a-dw-mipi-dsi



  reg:

    maxItems: 1



  clocks:

    minItems: 3

    maxItems: 4



  clock-names:

    minItems: 3

    items:

      - const: pclk

      - const: bit

      - const: px

      - const: meas



  resets:

    maxItems: 1



  reset-names:

    items:

      - const: top



  phys:

    maxItems: 1



  phy-names:

    items:

      - const: dphy



  ports:

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



    properties:

      port@0:

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

        description: Input node to receive pixel data.



      port@1:

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

        description: DSI output node to panel.



    required:

      - port@0

      - port@1



required:

  - compatible

  - reg

  - clocks

  - clock-names

  - resets

  - reset-names

  - phys

  - phy-names

  - ports



unevaluatedProperties: false



examples:

  - |

    dsi@6000 {

          compatible = "amlogic,meson-g12a-dw-mipi-dsi";

          reg = <0x6000 0x400>;

          resets = <&reset_top>;

          reset-names = "top";

          clocks = <&clk_pclk>, <&bit_clk>, <&clk_px>;

          clock-names = "pclk", "bit", "px";

          phys = <&mipi_dphy>;

          phy-names = "dphy";



          ports {

              #address-cells = <1>;

              #size-cells = <0>;



              /* VPU VENC Input */

              mipi_dsi_venc_port: port@0 {

                  reg = <0>;



                  mipi_dsi_in: endpoint {

                       remote-endpoint = <&dpi_out>;

                  };

              };



              /* DSI Output */

              mipi_dsi_panel_port: port@1 {

                  reg = <1>;



                  mipi_out_panel: endpoint {

                      remote-endpoint = <&mipi_in_panel>;

                  };

              };

          };

    };

Documentation/devicetree/bindings/display/amlogic,meson-vpu.yaml

+5 −0
Original line number Diff line number Diff line
@@ -96,6 +96,11 @@ properties: 
    description:

      A port node pointing to the HDMI-TX port node.



  port@2:

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

    description:

      A port node pointing to the DPI port node (e.g. DSI or LVDS transceiver).



  "#address-cells":

    const: 1

Documentation/devicetree/bindings/display/bridge/toshiba,tc358762.yaml

+3 −0
Original line number Diff line number Diff line
@@ -21,6 +21,9 @@ properties: 
    maxItems: 1

    description: virtual channel number of a DSI peripheral



  reset-gpios:

    maxItems: 1



  vddc-supply:

    description: Regulator for 1.2V internal core power.

Documentation/devicetree/bindings/display/panel/boe,tv101wum-nl6.yaml

+4 −0
Original line number Diff line number Diff line
@@ -32,6 +32,10 @@ properties: 
      - innolux,hj110iz-01a

        # STARRY 2081101QFH032011-53G 10.1" WUXGA TFT LCD panel

      - starry,2081101qfh032011-53g

        # STARRY himax83102-j02 10.51" WUXGA TFT LCD panel

      - starry,himax83102-j02

        # STARRY ili9882t 10.51" WUXGA TFT LCD panel

      - starry,ili9882t



  reg:

    description: the virtual channel number of a DSI peripheral