Commit 14346c08 authored by Dave Airlie's avatar Dave Airlie
Browse files

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



drm-misc-next for 5.11:

UAPI Changes:

Cross-subsystem Changes:

Core Changes:

 - Remove pgprot_decrypt() before calling io_remap_pfn_range()
 - Revert "drm/dp_mst: Retrieve extended DPCD caps for topology manager"
 - ttm: Add multihop infrastructure
 - doc: Update dma-buf

Driver Changes:

 - amdgpu: Use TTM multihop
 - kmb: select DRM_MIPI_DSI and depend on ARCH_KEEMBAY; Fix build warning;
   Fix typos
 - nouveau: Use TTM multihop; Fix out-of-bounds access
 - radeon: Use TTM multihop
 - ingenic: Search for scaling coefficients to to 102% of screen size

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

From: Thomas Zimmermann <tzimmermann@suse.de>
Link: https://patchwork.freedesktop.org/patch/msgid/20201112080115.GA7954@linux-uq9g
parents 512bce50 05481f07

Documentation/devicetree/bindings/display/bridge/intel,keembay-dsi.yaml

0 → 100644
+101 −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/intel,keembay-dsi.yaml#

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



title: Devicetree bindings for Intel Keem Bay mipi dsi controller



maintainers:

  - Anitha Chrisanthus <anitha.chrisanthus@intel.com>

  - Edmond J Dea <edmund.j.dea@intel.com>



properties:

  compatible:

    const: intel,keembay-dsi



  reg:

    items:

      - description: MIPI registers range



  reg-names:

    items:

      - const: mipi



  clocks:

    items:

      - description: MIPI DSI clock

      - description: MIPI DSI econfig clock

      - description: MIPI DSI config clock



  clock-names:

    items:

      - const: clk_mipi

      - const: clk_mipi_ecfg

      - const: clk_mipi_cfg



  ports:

    type: object



    properties:

      '#address-cells':

       const: 1



      '#size-cells':

       const: 0



      port@0:

        type: object

        description: MIPI DSI input port.



      port@1:

        type: object

        description: DSI output port.



    required:

      - port@0

      - port@1



    additionalProperties: false



required:

  - compatible

  - reg

  - reg-names

  - clocks

  - clock-names

  - ports



additionalProperties: false



examples:

  - |

    mipi-dsi@20900000 {

        compatible = "intel,keembay-dsi";

        reg = <0x20900000 0x4000>;

        reg-names = "mipi";

        clocks = <&scmi_clk 0x86>,

                 <&scmi_clk 0x88>,

                 <&scmi_clk 0x89>;

        clock-names = "clk_mipi", "clk_mipi_ecfg",

                      "clk_mipi_cfg";



        ports {

            #address-cells = <1>;

            #size-cells = <0>;



            port@0 {

                reg = <0>;

                dsi_in: endpoint {

                    remote-endpoint = <&disp_out>;

                };

            };



            port@1 {

                reg = <1>;

                dsi_out: endpoint {

                    remote-endpoint = <&adv7535_input>;

                };

            };

        };

    };

Documentation/devicetree/bindings/display/bridge/lontium,lt9611.yaml

+3 −2
Original line number Diff line number Diff line
@@ -4,18 +4,19 @@ 
$id: http://devicetree.org/schemas/display/bridge/lontium,lt9611.yaml#

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



title: Lontium LT9611 2 Port MIPI to HDMI Bridge

title: Lontium LT9611(UXC) 2 Port MIPI to HDMI Bridge



maintainers:

  - Vinod Koul <vkoul@kernel.org>



description: |

  The LT9611 is a bridge device which converts DSI to HDMI

  The LT9611 and LT9611UXC are bridge devices which convert DSI to HDMI



properties:

  compatible:

    enum:

      - lontium,lt9611

      - lontium,lt9611uxc



  reg:

    maxItems: 1

Documentation/devicetree/bindings/display/bridge/sii902x.txt

+4 −0
Original line number Diff line number Diff line
@@ -8,6 +8,8 @@ Optional properties: 
	- interrupts: describe the interrupt line used to inform the host

	  about hotplug events.

	- reset-gpios: OF device-tree gpio specification for RST_N pin.

	- iovcc-supply: I/O Supply Voltage (1.8V or 3.3V)

	- cvcc12-supply: Digital Core Supply Voltage (1.2V)



	HDMI audio properties:

	- #sound-dai-cells: <0> or <1>. <0> if only i2s or spdif pin
@@ -54,6 +56,8 @@ Example: 
		compatible = "sil,sii9022";

		reg = <0x39>;

		reset-gpios = <&pioA 1 0>;

		iovcc-supply = <&v3v3_hdmi>;

		cvcc12-supply = <&v1v2_hdmi>;



		#sound-dai-cells = <0>;

		sil,i2s-data-lanes = < 0 1 2 >;

Documentation/devicetree/bindings/display/intel,keembay-display.yaml

0 → 100644
+72 −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/intel,keembay-display.yaml#

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



title: Devicetree bindings for Intel Keem Bay display controller



maintainers:

  - Anitha Chrisanthus <anitha.chrisanthus@intel.com>

  - Edmond J Dea <edmund.j.dea@intel.com>



properties:

  compatible:

    const: intel,keembay-display



  reg:

    items:

      - description: LCD registers range



  reg-names:

    items:

      - const: lcd



  clocks:

    items:

      - description: LCD controller clock

      - description: pll0 clock



  clock-names:

    items:

      - const: clk_lcd

      - const: clk_pll0



  interrupts:

    maxItems: 1



  port:

    type: object

    description: Display output node to DSI.



required:

  - compatible

  - reg

  - reg-names

  - clocks

  - clock-names

  - interrupts

  - port



additionalProperties: false



examples:

  - |

    #include <dt-bindings/interrupt-controller/irq.h>

    #include <dt-bindings/interrupt-controller/arm-gic.h>



    display@20930000 {

        compatible = "intel,keembay-display";

        reg = <0x20930000 0x3000>;

        reg-names = "lcd";

        interrupts = <GIC_SPI 33 IRQ_TYPE_LEVEL_HIGH>;

        clocks = <&scmi_clk 0x83>,

                 <&scmi_clk 0x0>;

        clock-names = "clk_lcd", "clk_pll0";



        port {

            disp_out: endpoint {

                remote-endpoint = <&dsi_in>;

            };

        };

    };

Documentation/devicetree/bindings/display/intel,keembay-msscam.yaml

0 → 100644
+43 −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/intel,keembay-msscam.yaml#

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



title: Devicetree bindings for Intel Keem Bay MSSCAM



maintainers:

  - Anitha Chrisanthus <anitha.chrisanthus@intel.com>

  - Edmond J Dea <edmund.j.dea@intel.com>



description: |

   MSSCAM controls local clocks in the display subsystem namely LCD clocks and

   MIPI DSI clocks. It also configures the interconnect between LCD and

   MIPI DSI.



properties:

  compatible:

    items:

     - const: intel,keembay-msscam

     - const: syscon



  reg:

    maxItems: 1



  reg-io-width:

    const: 4



required:

  - compatible

  - reg

  - reg-io-width



additionalProperties: false



examples:

  - |

    msscam:msscam@20910000 {

        compatible = "intel,keembay-msscam", "syscon";

        reg = <0x20910000 0x30>;

        reg-io-width = <4>;

    };

CRA Git | Maintained and supported by SUSTech CRA and CCSE