Commit c6265f5c authored by Dave Airlie's avatar Dave Airlie
Browse files

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



drm-misc-next for v6.4-rc1:

Cross-subsystem Changes:
- Add drm_bridge.h to drm_bridge maintainers.

Core Changes:
- Assorted fixes to TTM, tests, format-helper, accel.
- Assorted Makefile fixes to drivers and accel.
- Implement fbdev emulation for GEM DMA drivers, and convert a lot of
  drivers to use it.
- Use tgid instead of pid for tracking clients.

Driver Changes:
- Assorted fixes in rockchip, vmwgfx, nouveau, cirrus.
- Add imx25 driver.
- Add Elida KD50T048A, Sony TD4353, Novatek NT36523, STARRY 2081101QFH032011-53G panels.
- Add 4K mode support to rockchip.
- Convert cirrus to use regular atomic helpers, and more cirrus
  improvements.
- Add damage clipping to cirrus, virtio.

[airlied: add drm_bridge.h include to imx]
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>

From: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/f7b765c7-d49d-edb5-2a6a-4f7a7be16a59@linux.intel.com
parents 90031bc3 b24343ea

Documentation/devicetree/bindings/display/imx/fsl,imx-lcdc.yaml

+45 −1
Original line number Diff line number Diff line
@@ -21,6 +21,9 @@ properties: 
              - fsl,imx25-fb

              - fsl,imx27-fb

          - const: fsl,imx21-fb

      - items:

          - const: fsl,imx25-lcdc

          - const: fsl,imx21-lcdc



  clocks:

    maxItems: 3
@@ -31,6 +34,9 @@ properties: 
      - const: ahb

      - const: per



  port:

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



  display:

    $ref: /schemas/types.yaml#/definitions/phandle
@@ -59,17 +65,55 @@ properties: 
    description:

      LCDC Sharp Configuration Register value.



allOf:

  - if:

      properties:

        compatible:

          contains:

            enum:

              - fsl,imx1-lcdc

              - fsl,imx21-lcdc

    then:

      properties:

        display: false

        fsl,dmacr: false

        fsl,lpccr: false

        fsl,lscr1: false



      required:

        - port



    else:

      properties:

        port: false



      required:

        - display



required:

  - compatible

  - clocks

  - clock-names

  - display

  - interrupts

  - reg



additionalProperties: false



examples:

  - |

    lcdc@53fbc000 {

        compatible = "fsl,imx25-lcdc", "fsl,imx21-lcdc";

        reg = <0x53fbc000 0x4000>;

        interrupts = <39>;

        clocks = <&clks 103>, <&clks 66>, <&clks 49>;

        clock-names = "ipg", "ahb", "per";



        port {

            parallel_out: endpoint {

              remote-endpoint = <&panel_in>;

            };

        };

    };

  - |

    imxfb: fb@10021000 {

        compatible = "fsl,imx21-fb";

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

+2 −0
Original line number Diff line number Diff line
@@ -30,6 +30,8 @@ properties: 
      - boe,tv110c9m-ll3

        # INX HJ110IZ-01A 10.95" WUXGA TFT LCD panel

      - innolux,hj110iz-01a

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

      - starry,2081101qfh032011-53g



  reg:

    description: the virtual channel number of a DSI peripheral

Documentation/devicetree/bindings/display/panel/novatek,nt36523.yaml

0 → 100644
+85 −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/panel/novatek,nt36523.yaml#

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



title: Novatek NT36523 based DSI display Panels



maintainers:

  - Jianhua Lu <lujianhua000@gmail.com>



description: |

  The Novatek NT36523 is a generic DSI Panel IC used to drive dsi

  panels. Support video mode panels from China Star Optoelectronics

  Technology (CSOT) and BOE Technology.



allOf:

  - $ref: panel-common.yaml#



properties:

  compatible:

    items:

      - enum:

          - xiaomi,elish-boe-nt36523

          - xiaomi,elish-csot-nt36523

      - const: novatek,nt36523



  reset-gpios:

    maxItems: 1

    description: phandle of gpio for reset line - This should be 8mA



  vddio-supply:

    description: regulator that supplies the I/O voltage



  reg: true

  ports: true

  backlight: true



required:

  - compatible

  - reg

  - vddio-supply

  - reset-gpios

  - ports



unevaluatedProperties: false



examples:

  - |

    #include <dt-bindings/gpio/gpio.h>



    dsi {

        #address-cells = <1>;

        #size-cells = <0>;



        panel@0 {

            compatible = "xiaomi,elish-csot-nt36523", "novatek,nt36523";

            reg = <0>;



            vddio-supply = <&vreg_l14a_1p88>;

            reset-gpios = <&tlmm 75 GPIO_ACTIVE_LOW>;

            backlight = <&backlight>;



            ports {

                #address-cells = <1>;

                #size-cells = <0>;



                port@0 {

                    reg = <0>;

                    panel_in_0: endpoint {

                        remote-endpoint = <&dsi0_out>;

                    };

                };



                port@1{

                    reg = <1>;

                    panel_in_1: endpoint {

                        remote-endpoint = <&dsi1_out>;

                    };

                };

            };

        };

    };



...

Documentation/devicetree/bindings/display/panel/seiko,43wvf1g.yaml

+2 −0
Original line number Diff line number Diff line
@@ -25,6 +25,8 @@ properties: 
  avdd-supply:

    description: 5v analog regulator



  enable-gpios: true



required:

  - compatible

  - dvdd-supply

Documentation/devicetree/bindings/display/panel/sitronix,st7701.yaml

+1 −0
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ properties: 
    items:

      - enum:

          - densitron,dmt028vghmcmi-1a

          - elida,kd50t048a

          - techstar,ts8550b

      - const: sitronix,st7701