Commit 4e291f2f authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'drm-misc-next-2022-11-10-1' of git://anongit.freedesktop.org/drm/drm-misc into drm-next 



drm-misc-next for 6.2:

UAPI Changes:

Cross-subsystem Changes:

Core Changes:
- atomic-helper: Add begin_fb_access and end_fb_access hooks
- fb-helper: Rework to move fb emulation into helpers
- scheduler: rework entity flush, kill and fini
- ttm: Optimize pool allocations

Driver Changes:
- amdgpu: scheduler rework
- hdlcd: Switch to DRM-managed resources
- ingenic: Fix registration error path
- lcdif: FIFO threshold tuning
- meson: Fix return type of cvbs' mode_valid
- ofdrm: multiple fixes (kconfig, types, endianness)
- sun4i: A100 and D1 support
- panel:
  - New Panel: Jadard JD9365DA-H3

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

From: Maxime Ripard <maxime@cerno.tech>
Link: https://patchwork.freedesktop.org/patch/msgid/20221110083612.g63eaocoaa554soh@houat
parents 3076e09f 6b818c53

Documentation/devicetree/bindings/display/allwinner,sun6i-a31-mipi-dsi.yaml

+21 −9
Original line number Diff line number Diff line
@@ -12,9 +12,14 @@ maintainers: 


properties:

  compatible:

    enum:

    oneOf:

      - enum:

          - allwinner,sun6i-a31-mipi-dsi

          - allwinner,sun50i-a64-mipi-dsi

          - allwinner,sun50i-a100-mipi-dsi

      - items:

          - const: allwinner,sun20i-d1-mipi-dsi

          - const: allwinner,sun50i-a100-mipi-dsi



  reg:

    maxItems: 1
@@ -59,7 +64,6 @@ required: 
  - phys

  - phy-names

  - resets

  - vcc-dsi-supply

  - port



allOf:
@@ -68,7 +72,9 @@ allOf: 
      properties:

        compatible:

          contains:

            const: allwinner,sun6i-a31-mipi-dsi

            enum:

              - allwinner,sun6i-a31-mipi-dsi

              - allwinner,sun50i-a100-mipi-dsi



    then:

      properties:
@@ -78,16 +84,22 @@ allOf: 
      required:

        - clock-names



    else:

      properties:

        clocks:

          maxItems: 1



  - if:

      properties:

        compatible:

          contains:

            const: allwinner,sun50i-a64-mipi-dsi

            enum:

              - allwinner,sun6i-a31-mipi-dsi

              - allwinner,sun50i-a64-mipi-dsi



    then:

      properties:

        clocks:

          minItems: 1

      required:

        - vcc-dsi-supply



unevaluatedProperties: false

Documentation/devicetree/bindings/display/panel/jadard,jd9365da-h3.yaml

0 → 100644
+70 −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/jadard,jd9365da-h3.yaml#

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



title: Jadard JD9365DA-HE WXGA DSI panel



maintainers:

  - Jagan Teki <jagan@edgeble.ai>



allOf:

  - $ref: panel-common.yaml#



properties:

  compatible:

    items:

      - enum:

          - chongzhou,cz101b4001

      - const: jadard,jd9365da-h3



  reg: true



  vdd-supply:

    description: supply regulator for VDD, usually 3.3V



  vccio-supply:

    description: supply regulator for VCCIO, usually 1.8V



  reset-gpios: true



  backlight: true



  port: true



required:

  - compatible

  - reg

  - vdd-supply

  - vccio-supply

  - reset-gpios



additionalProperties: false



examples:

  - |

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

    #include <dt-bindings/pinctrl/rockchip.h>



    dsi {

        #address-cells = <1>;

        #size-cells = <0>;



        panel@0 {

            compatible = "chongzhou,cz101b4001", "jadard,jd9365da-h3";

            reg = <0>;

            vdd-supply = <&lcd_3v3>;

            vccio-supply = <&vcca_1v8>;

            reset-gpios = <&gpio1 RK_PC2 GPIO_ACTIVE_HIGH>;

            backlight = <&backlight>;



            port {

                mipi_in_panel: endpoint {

                    remote-endpoint = <&mipi_out_panel>;

                };

            };

        };

    };



...

Documentation/devicetree/bindings/vendor-prefixes.yaml

+4 −0
Original line number Diff line number Diff line
@@ -246,6 +246,8 @@ patternProperties: 
    description: ChipOne

  "^chipspark,.*":

    description: ChipSPARK

  "^chongzhou,.*":

    description: Shenzhen Chongzhou Electronic Technology Co., Ltd

  "^chrontel,.*":

    description: Chrontel, Inc.

  "^chrp,.*":
@@ -639,6 +641,8 @@ patternProperties: 
    description: ITian Corporation

  "^iwave,.*":

    description: iWave Systems Technologies Pvt. Ltd.

  "^jadard,.*":

    description: Jadard Technology Inc.

  "^jdi,.*":

    description: Japan Display Inc.

  "^jedec,.*":

Documentation/gpu/drm-kms-helpers.rst

+3 −0
Original line number Diff line number Diff line
@@ -116,6 +116,9 @@ fbdev Helper Functions Reference 
.. kernel-doc:: drivers/gpu/drm/drm_fb_helper.c

   :export:



.. kernel-doc:: drivers/gpu/drm/drm_fbdev_generic.c

   :export:



format Helper Functions Reference

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

MAINTAINERS

+7 −1
Original line number Diff line number Diff line
@@ -6503,6 +6503,12 @@ S: Orphan / Obsolete 
F:	drivers/gpu/drm/i810/

F:	include/uapi/drm/i810_drm.h









DRM DRIVER FOR JADARD JD9365DA-H3 MIPI-DSI LCD PANELS









M:	Jagan Teki <jagan@edgeble.ai>









S:	Maintained









F:	Documentation/devicetree/bindings/display/panel/jadard,jd9365da-h3.yaml









F:	drivers/gpu/drm/panel/panel-jadard-jd9365da-h3.c

















DRM DRIVER FOR LOGICVC DISPLAY CONTROLLER









M:	Paul Kocialkowski <paul.kocialkowski@bootlin.com>









S:	Supported








@@ -7113,7 +7119,7 @@ F:	drivers/gpu/drm/ttm/







F:	include/drm/ttm/

















DRM GPU SCHEDULER









M:	Andrey Grodzovsky <andrey.grodzovsky@amd.com>









M:	Luben Tuikov <luben.tuikov@amd.com>









L:	dri-devel@lists.freedesktop.org









S:	Maintained









T:	git git://anongit.freedesktop.org/drm/drm-misc