Commit 5275a99e authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'drm-misc-next-2021-10-14' of git://anongit.freedesktop.org/drm/drm-misc into drm-next 



drm-misc-next for 5.16:

UAPI Changes:

Cross-subsystem Changes:

Core Changes:
  - fbdev: Fix double-free, Remove unused scrolling acceleration
  - locking: improve logging for contented locks without backoff
  - dma-buf: Add dma_resv_for_each_fence iterator, and conversion of
    users

Driver Changes:
  - nouveau: Various code style improvements
  - bridge: HPD improvements for lt9611uxc, eDP aux-bus support for
    ps8640, lvds-codec data-mapping selection support
  - panels: Vivax TPC-9150, Innolux G070Y2-T02, LOGIC Technologies
    LTTD800480070-L2RT, Sharp LS060T1SX01,

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

From: Maxime Ripard <maxime@cerno.tech>
Link: https://patchwork.freedesktop.org/patch/msgid/20211014120452.2wicnt6hobu3kbwb@gilmour
parents d9bd0541 b3ec8cdf

Documentation/devicetree/bindings/display/bridge/lvds-codec.yaml

+32 −1
Original line number Diff line number Diff line
@@ -49,11 +49,26 @@ properties: 


    properties:

      port@0:

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

        $ref: /schemas/graph.yaml#/$defs/port-base

        description: |

          For LVDS encoders, port 0 is the parallel input

          For LVDS decoders, port 0 is the LVDS input



        properties:

          endpoint:

            $ref: /schemas/media/video-interfaces.yaml#

            unevaluatedProperties: false



            properties:

              data-mapping:

                enum:

                  - jeida-18

                  - jeida-24

                  - vesa-24

                description: |

                  The color signals mapping order. See details in

                  Documentation/devicetree/bindings/display/panel/lvds.yaml



      port@1:

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

        description: |
@@ -71,6 +86,22 @@ properties: 


  power-supply: true



if:

  not:

    properties:

      compatible:

        contains:

          const: lvds-decoder

then:

  properties:

    ports:

      properties:

        port@0:

          properties:

            endpoint:

              properties:

                data-mapping: false



required:

  - compatible

  - ports

Documentation/devicetree/bindings/display/bridge/ps8640.yaml

+18 −1
Original line number Diff line number Diff line
@@ -40,6 +40,9 @@ properties: 
  vdd33-supply:

    description: Regulator for 3.3V digital core power.



  aux-bus:

    $ref: /schemas/display/dp-aux-bus.yaml#



  ports:

    $ref: /schemas/graph.yaml#/properties/ports
@@ -101,6 +104,20 @@ examples: 
                    };

                };

            };



            aux-bus {

                panel {

                    compatible = "boe,nv133fhm-n62";

                    power-supply = <&pp3300_dx_edp>;

                    backlight = <&backlight>;



                    port {

                        panel_in: endpoint {

                            remote-endpoint = <&ps8640_out>;

                        };

                    };

                };

            };

        };

    };

Documentation/devicetree/bindings/display/panel/panel-simple.yaml

+5 −0
Original line number Diff line number Diff line
@@ -166,6 +166,8 @@ properties: 
      - innolux,at070tn92

        # Innolux G070Y2-L01 7" WVGA (800x480) TFT LCD panel

      - innolux,g070y2-l01

        # Innolux G070Y2-T02 7" WVGA (800x480) TFT LCD TTL panel

      - innolux,g070y2-t02

        # Innolux Corporation 10.1" G101ICE-L01 WXGA (1280x800) LVDS panel

      - innolux,g101ice-l01

        # Innolux Corporation 12.1" WXGA (1280x800) TFT LCD panel
@@ -309,6 +311,8 @@ properties: 
      - urt,umsh-8596md-11t

      - urt,umsh-8596md-19t

      - urt,umsh-8596md-20t

        # Vivax TPC-9150 tablet 9.0" WSVGA TFT LCD panel

      - vivax,tpc9150-panel

        # VXT 800x480 color TFT LCD panel

      - vxt,vl050-8048nt-c01

        # Winstar Display Corporation 3.5" QVGA (320x240) TFT LCD panel
@@ -317,6 +321,7 @@ properties: 
      - yes-optoelectronics,ytc700tlag-05-201c



  backlight: true

  ddc-i2c-bus: true

  enable-gpios: true

  port: true

  power-supply: true

Documentation/devicetree/bindings/display/panel/sharp,ls060t1sx01.yaml

0 → 100644
+56 −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/sharp,ls060t1sx01.yaml#

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



title: Sharp Microelectronics 6.0" FullHD TFT LCD panel



maintainers:

  - Dmitry Baryskov <dmitry.baryshkov@linaro.org>



allOf:

  - $ref: panel-common.yaml#



properties:

  compatible:

    const: sharp,ls060t1sx01



  reg: true

  backlight: true

  reset-gpios: true

  port: true



  avdd-supply:

    description: handle of the regulator that provides the positive supply voltage

  avee-supply:

    description: handle of the regulator that provides the negative supply voltage

  vddi-supply:

    description: handle of the regulator that provides the I/O supply voltage

  vddh-supply:

    description: handle of the regulator that provides the analog supply voltage



required:

  - compatible

  - reg



additionalProperties: false



examples:

  - |

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



    dsi {

        #address-cells = <1>;

        #size-cells = <0>;



        panel@0 {

            compatible = "sharp,ls060t1sx01";

            reg = <0>;

            avdd-supply = <&pm8941_l22>;

            backlight = <&backlight>;

            reset-gpios = <&pm8916_gpios 25 GPIO_ACTIVE_LOW>;

        };

    };



...

Documentation/devicetree/bindings/vendor-prefixes.yaml

+2 −0
Original line number Diff line number Diff line
@@ -1264,6 +1264,8 @@ patternProperties: 
    description: Vitesse Semiconductor Corporation

  "^vivante,.*":

    description: Vivante Corporation

  "^vivax,.*":

    description: Vivax brand by M SAN Grupa d.o.o.

  "^vocore,.*":

    description: VoCore Studio

  "^voipac,.*":