Commit 4145cb54 authored by Dave Airlie's avatar Dave Airlie
Browse files

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



drm-misc-next for v5.9:

UAPI Changes:

Cross-subsystem Changes:
- Convert panel-dsi-cm and ingenic bindings to YAML.
- Add lockdep annotations for dma-fence. \o/
- Describe why indefinite fences are a bad idea
- Update binding for rocktech jh057n00900.

Core Changes:
- Add vblank workers.
- Use spin_(un)lock_irq instead of the irqsave/restore variants in crtc code.
- Add managed vram helpers.
- Convert more logging to drm functions.
- Replace more http links with https in core and drivers.
- Cleanup to ttm iomem functions and implementation.
- Remove TTM CMA memtype as it doesn't work correctly.
- Remove TTM_MEMTYPE_FLAG_MAPPABLE for many drivers that have no
  unmappable memory resources.

Driver Changes:
- Add CRC support to nouveau, using the new vblank workers.
- Dithering and atomic state fix for nouveau.
- Fixes for Frida FRD350H54004 panel.
- Add support for OSD mode (sprite planes), IPU (scaling) and multiple
  panels/bridges to ingenic.
- Use managed vram helpers in ast.
- Assorted small fixes to ingenic, i810, mxsfb.
- Remove optional unused ttm dummy functions.

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

From: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/d6bf269e-ccb2-8a7b-fdae-226e9e3f8274@linux.intel.com
parents 3ffff3c6 acc0c39a

Documentation/devicetree/bindings/display/bridge/nwl-dsi.yaml

+5 −4
Original line number Diff line number Diff line
@@ -165,6 +165,7 @@ examples: 
 - |



   #include <dt-bindings/clock/imx8mq-clock.h>

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

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

   #include <dt-bindings/reset/imx8mq-reset.h>
@@ -191,12 +192,12 @@ examples: 
              phy-names = "dphy";



              panel@0 {

                      #address-cells = <1>;

                      #size-cells = <0>;

                      compatible = "rocktech,jh057n00900";

                      reg = <0>;

                      port@0 {

                           reg = <0>;

                      vcc-supply = <&reg_2v8_p>;

                      iovcc-supply = <&reg_1v8_p>;

                      reset-gpios = <&gpio3 13 GPIO_ACTIVE_LOW>;

                      port {

                           panel_in: endpoint {

                                     remote-endpoint = <&mipi_dsi_out>;

                           };

Documentation/devicetree/bindings/display/ingenic,ipu.yaml

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

%YAML 1.2

---

$id: http://devicetree.org/schemas/display/ingenic,ipu.yaml#

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



title: Ingenic SoCs Image Processing Unit (IPU) devicetree bindings



maintainers:

  - Paul Cercueil <paul@crapouillou.net>



properties:

  compatible:

    oneOf:

      - enum:

        - ingenic,jz4725b-ipu

        - ingenic,jz4760-ipu

      - items:

        - const: ingenic,jz4770-ipu

        - const: ingenic,jz4760-ipu



  reg:

    maxItems: 1



  interrupts:

    maxItems: 1



  clocks:

    maxItems: 1



  clock-names:

    const: ipu



patternProperties:

  "^ports?$":

    description: OF graph bindings (specified in bindings/graph.txt).



required:

  - compatible

  - reg

  - interrupts

  - clocks

  - clock-names



additionalProperties: false



examples:

  - |

    #include <dt-bindings/clock/jz4770-cgu.h>

    ipu@13080000 {

      compatible = "ingenic,jz4770-ipu", "ingenic,jz4760-ipu";

      reg = <0x13080000 0x800>;



      interrupt-parent = <&intc>;

      interrupts = <29>;



      clocks = <&cgu JZ4770_CLK_IPU>;

      clock-names = "ipu";



      port {

        ipu_ep: endpoint {

          remote-endpoint = <&lcdc_ep>;

        };

      };

    };

Documentation/devicetree/bindings/display/ingenic,lcd.txt

deleted100644 → 0
+0 −45
Original line number Diff line number Diff line 
Ingenic JZ47xx LCD driver



Required properties:

- compatible: one of:

  * ingenic,jz4740-lcd

  * ingenic,jz4725b-lcd

  * ingenic,jz4770-lcd

- reg: LCD registers location and length

- clocks: LCD pixclock and device clock specifiers.

	   The device clock is only required on the JZ4740.

- clock-names: "lcd_pclk" and "lcd"

- interrupts: Specifies the interrupt line the LCD controller is connected to.



Example:



panel {

	compatible = "sharp,ls020b1dd01d";



	backlight = <&backlight>;

	power-supply = <&vcc>;



	port {

		panel_input: endpoint {

			remote-endpoint = <&panel_output>;

		};

	};

};





lcd: lcd-controller@13050000 {

	compatible = "ingenic,jz4725b-lcd";

	reg = <0x13050000 0x1000>;



	interrupt-parent = <&intc>;

	interrupts = <31>;



	clocks = <&cgu JZ4725B_CLK_LCD>;

	clock-names = "lcd";



	port {

		panel_output: endpoint {

			remote-endpoint = <&panel_input>;

		};

	};

};

Documentation/devicetree/bindings/display/ingenic,lcd.yaml

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

%YAML 1.2

---

$id: http://devicetree.org/schemas/display/ingenic,lcd.yaml#

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



title: Ingenic SoCs LCD controller devicetree bindings



maintainers:

  - Paul Cercueil <paul@crapouillou.net>



properties:

  $nodename:

    pattern: "^lcd-controller@[0-9a-f]+$"



  compatible:

    enum:

      - ingenic,jz4740-lcd

      - ingenic,jz4725b-lcd

      - ingenic,jz4770-lcd

      - ingenic,jz4780-lcd



  reg:

    maxItems: 1



  interrupts:

    maxItems: 1



  clocks:

    items:

      - description: Pixel clock

      - description: Module clock

    minItems: 1



  clock-names:

    items:

      - const: lcd_pclk

      - const: lcd

    minItems: 1



  port:

    description: OF graph bindings (specified in bindings/graph.txt).



  ports:

    description: OF graph bindings (specified in bindings/graph.txt).

    type: object

    properties:

      port@0:

        type: object

        description: DPI output, to interface with TFT panels.



      port@8:

        type: object

        description: Link to the Image Processing Unit (IPU).

          (See ingenic,ipu.yaml).



    required:

      - port@0



required:

    - compatible

    - reg

    - interrupts

    - clocks

    - clock-names



if:

  properties:

    compatible:

      contains:

        enum:

          - ingenic,jz4740-lcd

          - ingenic,jz4780-lcd

then:

  properties:

    clocks:

      minItems: 2

    clock-names:

      minItems: 2

else:

  properties:

    clocks:

      maxItems: 1

    clock-names:

      maxItems: 1



additionalProperties: false



examples:

  - |

    #include <dt-bindings/clock/jz4740-cgu.h>

    lcd-controller@13050000 {

      compatible = "ingenic,jz4740-lcd";

      reg = <0x13050000 0x1000>;



      interrupt-parent = <&intc>;

      interrupts = <30>;



      clocks = <&cgu JZ4740_CLK_LCD_PCLK>, <&cgu JZ4740_CLK_LCD>;

      clock-names = "lcd_pclk", "lcd";



      port {

        endpoint {

          remote-endpoint = <&panel_input>;

        };

      };

    };



  - |

    #include <dt-bindings/clock/jz4725b-cgu.h>

    lcd-controller@13050000 {

      compatible = "ingenic,jz4725b-lcd";

      reg = <0x13050000 0x1000>;



      interrupt-parent = <&intc>;

      interrupts = <31>;



      clocks = <&cgu JZ4725B_CLK_LCD>;

      clock-names = "lcd_pclk";



      port {

        endpoint {

          remote-endpoint = <&panel_input>;

        };

      };

    };

Documentation/devicetree/bindings/display/panel/panel-dsi-cm.txt

deleted100644 → 0
+0 −29
Original line number Diff line number Diff line 
Generic MIPI DSI Command Mode Panel

===================================



Required properties:

- compatible: "panel-dsi-cm"



Optional properties:

- label: a symbolic name for the panel

- reset-gpios: panel reset gpio

- te-gpios: panel TE gpio



Required nodes:

- Video port for DSI input



Example

-------



lcd0: display {

	compatible = "tpo,taal", "panel-dsi-cm";

	label = "lcd0";



	reset-gpios = <&gpio4 6 GPIO_ACTIVE_HIGH>;



	port {

		lcd0_in: endpoint {

			remote-endpoint = <&dsi1_out_ep>;

		};

	};

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE