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

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



drm-misc-next for 5.7:

UAPI Changes:

Cross-subsystem Changes:

Core Changes:
  - crtc: Drop get_crtc callback
  - dp: Add support for DP1.4 EDID corruption test
  - edid: Improve CEA detailed timings support
  - format-helper: Move to a GPL2/MIT dual license
  - mode: Drop drm_display_mode.private
  - vblank: Convert drm-driver vblank related code to CRTC equivalents and
    cleanup the core.
  - drm_global_mutex reworks

Driver Changes:
  - hibmc: Add gamma_set support and improve DPMS support
  - pl111: Support Integrator IM-PD1
  - sun4i: LVDS support for the A20, improvements to panel handling in DSI
  - virtio: job batching improvements, mem handling code rework
  - panel: Support for Rocktech RK101II01D-CT
  - bridge: Support for ADV7535, tc358768, improvements to ti-sn65dsi86

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

From: Maxime Ripard <maxime@cerno.tech>
Link: https://patchwork.freedesktop.org/patch/msgid/20200221100928.anipic2v7q5wswkb@gilmour.lan
parents 1b245ec5 d718e53a

Documentation/devicetree/bindings/display/allwinner,sun4i-a10-tcon.yaml

+6 −0
Original line number Diff line number Diff line
@@ -34,6 +34,12 @@ properties: 
      - const: allwinner,sun9i-a80-tcon-lcd

      - const: allwinner,sun9i-a80-tcon-tv



      - items:

        - enum:

          - allwinner,sun7i-a20-tcon0

          - allwinner,sun7i-a20-tcon1

        - const: allwinner,sun7i-a20-tcon



      - items:

        - enum:

            - allwinner,sun50i-a64-tcon-lcd

Documentation/devicetree/bindings/display/bridge/adi,adv7511.txt

+12 −11
Original line number Diff line number Diff line 
Analog Device ADV7511(W)/13/33 HDMI Encoders

Analog Device ADV7511(W)/13/33/35 HDMI Encoders

-----------------------------------------



The ADV7511, ADV7511W, ADV7513 and ADV7533 are HDMI audio and video transmitters

compatible with HDMI 1.4 and DVI 1.0. They support color space conversion,

S/PDIF, CEC and HDCP. ADV7533 supports the DSI interface for input pixels, while

the others support RGB interface.

The ADV7511, ADV7511W, ADV7513, ADV7533 and ADV7535 are HDMI audio and video

transmitters compatible with HDMI 1.4 and DVI 1.0. They support color space

conversion, S/PDIF, CEC and HDCP. ADV7533/5 supports the DSI interface for input

pixels, while the others support RGB interface.



Required properties:
@@ -13,6 +13,7 @@ Required properties: 
		"adi,adv7511w"

		"adi,adv7513"

		"adi,adv7533"

		"adi,adv7535"



- reg: I2C slave addresses

  The ADV7511 internal registers are split into four pages exposed through
@@ -52,14 +53,14 @@ The following input format properties are required except in "rgb 1x" and 
- bgvdd-supply: A 1.8V supply that powers up the BGVDD pin. This is

  needed only for ADV7511.



The following properties are required for ADV7533:

The following properties are required for ADV7533 and ADV7535:



- adi,dsi-lanes: Number of DSI data lanes connected to the DSI host. It should

  be one of 1, 2, 3 or 4.

- a2vdd-supply: 1.8V supply that powers up the A2VDD pin on the chip.

- v3p3-supply: A 3.3V supply that powers up the V3P3 pin on the chip.

- v1p2-supply: A supply that powers up the V1P2 pin on the chip. It can be

  either 1.2V or 1.8V.

  either 1.2V or 1.8V for ADV7533 but only 1.8V for ADV7535.



Optional properties:
@@ -71,9 +72,9 @@ Optional properties: 
- adi,embedded-sync: The input uses synchronization signals embedded in the

  data stream (similar to BT.656). Defaults to separate H/V synchronization

  signals.

- adi,disable-timing-generator: Only for ADV7533. Disables the internal timing

  generator. The chip will rely on the sync signals in the DSI data lanes,

  rather than generate its own timings for HDMI output.

- adi,disable-timing-generator: Only for ADV7533 and ADV7535. Disables the

  internal timing generator. The chip will rely on the sync signals in the

  DSI data lanes, rather than generate its own timings for HDMI output.

- clocks: from common clock binding: reference to the CEC clock.

- clock-names: from common clock binding: must be "cec".

- reg-names : Names of maps with programmable addresses.
@@ -85,7 +86,7 @@ Required nodes: 
The ADV7511 has two video ports. Their connections are modelled using the OF

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



- Video port 0 for the RGB, YUV or DSI input. In the case of ADV7533, the

- Video port 0 for the RGB, YUV or DSI input. In the case of ADV7533/5, the

  remote endpoint phandle should be a reference to a valid mipi_dsi_host device

  node.

- Video port 1 for the HDMI output

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

0 → 100644
+159 −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/toshiba,tc358768.yaml#

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



title: Toschiba TC358768/TC358778 Parallel RGB to MIPI DSI bridge



maintainers:

  - Peter Ujfalusi <peter.ujfalusi@ti.com>



description: |

  The TC358768/TC358778 is bridge device which converts RGB to DSI.



properties:

  compatible:

    enum:

      - toshiba,tc358768

      - toshiba,tc358778



  reg:

    maxItems: 1

    description: base I2C address of the device



  reset-gpios:

    maxItems: 1

    description: GPIO connected to active low RESX pin



  vddc-supply:

    description: Regulator for 1.2V internal core power.



  vddmipi-supply:

    description: Regulator for 1.2V for the MIPI.



  vddio-supply:

    description: Regulator for 1.8V - 3.3V IO power.



  clocks:

    maxItems: 1



  clock-names:

    const: refclk



  ports:

    type: object



    properties:

      "#address-cells":

        const: 1



      "#size-cells":

        const: 0



      port@0:

        type: object

        additionalProperties: false



        description: |

          Video port for RGB input



        properties:

          reg:

            const: 0



        patternProperties:

          endpoint:

            type: object

            additionalProperties: false



            properties:

              data-lines:

                enum: [ 16, 18, 24 ]



              remote-endpoint: true



        required:

          - reg



      port@1:

        type: object

        additionalProperties: false



        description: |

          Video port for DSI output (panel or connector).



        properties:

          reg:

            const: 1



        patternProperties:

          endpoint:

            type: object

            additionalProperties: false



            properties:

              remote-endpoint: true



        required:

          - reg



    required:

      - "#address-cells"

      - "#size-cells"

      - port@0

      - port@1



required:

  - compatible

  - reg

  - vddc-supply

  - vddmipi-supply

  - vddio-supply

  - ports



additionalProperties: false



examples:

  - |

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



    i2c1 {

      #address-cells = <1>;

      #size-cells = <0>;



      dsi_bridge: dsi-bridge@e {

        compatible = "toshiba,tc358768";

        reg = <0xe>;



        clocks = <&tc358768_refclk>;

        clock-names = "refclk";



        reset-gpios = <&pcf_display_board 0 GPIO_ACTIVE_LOW>;



        vddc-supply = <&v1_2d>;

        vddmipi-supply = <&v1_2d>;

        vddio-supply = <&v3_3d>;



        dsi_bridge_ports: ports {

          #address-cells = <1>;

          #size-cells = <0>;



          port@0 {

            reg = <0>;

            rgb_in: endpoint {

              remote-endpoint = <&dpi_out>;

              data-lines = <24>;

            };

          };



          port@1 {

            reg = <1>;

            dsi_out: endpoint {

              remote-endpoint = <&lcd_in>;

            };

          };

        };

      };

    };

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

+2 −0
Original line number Diff line number Diff line
@@ -201,6 +201,8 @@ properties: 
      - osddisplays,osd101t2045-53ts

        # QiaoDian XianShi Corporation 4"3 TFT LCD panel

      - qiaodian,qd43003c0-40

        # Rocktech Displays Ltd. RK101II01D-CT 10.1" TFT 1280x800

      - rocktech,rk101ii01d-ct

        # Rocktech Display Ltd. RK070ER9427 800(RGB)x480 TFT LCD panel

      - rocktech,rk070er9427

        # Samsung 12.2" (2560x1600 pixels) TFT LCD panel

drivers/dma-buf/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ config SYNC_FILE 
	default n

	select DMA_SHARED_BUFFER

	---help---

	  The Sync File Framework adds explicit syncronization via

	  The Sync File Framework adds explicit synchronization via

	  userspace. It enables send/receive 'struct dma_fence' objects to/from

	  userspace via Sync File fds for synchronization between drivers via

	  userspace components. It has been ported from Android.

CRA Git | Maintained and supported by SUSTech CRA and CCSE