Commit 68de345e authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'drm-misc-next-2023-01-24' of git://anongit.freedesktop.org/drm/drm-misc into drm-next 



drm-misc-next for v6.3:

UAPI Changes:

Cross-subsystem Changes:

Core Changes:

 * EDID: Improved mode parsing and refactoring

 * fbdev: Cleanups

 * format-helper: Add conversion from XRGB8888 to XBGR8888 and ABGR8888

Driver Changes:

 * accel/ivpu: Add driver for Intel VPU accelerator

 * bridge: Support i.MX93 LDB plus DT bindings

 * exynos: Fixes

 * panel: vtdr6130: Fixes; Support AUO A030JTN01 plus DT bindings

 * simpledrm: Support system-memory framebuffers plus DT bindings

 * ssd130x: Fix sparse warning

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

# -----BEGIN PGP SIGNATURE-----
#
# iQEzBAABCAAdFiEEchf7rIzpz2NEoWjlaA3BHVMLeiMFAmPQN9YACgkQaA3BHVML
# eiNmmQf/bTV3oaMo55i3tYxhMCWYDtPVk+GGglDAykW7Lid8pvy6mJqJoW6uvgQF
# c6CcoY+6yG2WvnVLhXyhPaACiG5weQSdu3S/DdZ2nuJCb50YCwWNNKcu3qYnLVlz
# 2NQ/s0HN+Xvvy76GJFNarKlxSNADPWCNJ8wExAdBkWr7q8NiDfsWuMGrQRQORrm3
# zEkSJPKtWNHa+vmsQOO9yebD0LFx97CoU40FrVXZTtF0FugGIXjiknQwekzuFxdY
# fGBiFKsI+Y3s51gAppbmRRJ0jGLj3KDF5S+5GM8FNbgJQF67Wxttl/YtY6lJGcsa
# l0vpRoCe1ilhNVvoikzAu7UewkPKKA==
# =GLLt
# -----END PGP SIGNATURE-----
# gpg: Signature made Wed 25 Jan 2023 05:56:06 AEST
# gpg:                using RSA key 7217FBAC8CE9CF6344A168E5680DC11D530B7A23
# gpg: Can't check signature: No public key
From: Thomas Zimmermann <tzimmermann@suse.de>
Link: https://patchwork.freedesktop.org/patch/msgid/Y9A5ceDknyQixM3R@linux-uq9g
parents 7dd1be30 51affef3

Documentation/devicetree/bindings/display/bridge/fsl,ldb.yaml

+15 −1
Original line number Diff line number Diff line
@@ -16,7 +16,9 @@ description: | 


properties:

  compatible:

    const: fsl,imx8mp-ldb

    enum:

      - fsl,imx8mp-ldb

      - fsl,imx93-ldb



  clocks:

    maxItems: 1
@@ -57,6 +59,18 @@ required: 
  - clocks

  - ports



allOf:

  - if:

      properties:

        compatible:

          contains:

            const: fsl,imx93-ldb

    then:

      properties:

        ports:

          properties:

            port@2: false



additionalProperties: false



examples:

Documentation/devicetree/bindings/display/panel/auo,a030jtn01.yaml

0 → 100644
+60 −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/panel/auo,a030jtn01.yaml#

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



title: AUO A030JTN01 3.0" (320x480 pixels) 24-bit TFT LCD panel



description: |

  Delta RGB 8-bit panel found in some Retrogame handhelds



maintainers:

  - Paul Cercueil <paul@crapouillou.net>

  - Christophe Branchereau <cbranchereau@gmail.com>



allOf:

  - $ref: panel-common.yaml#

  - $ref: /schemas/spi/spi-peripheral-props.yaml#



properties:

  compatible:

    const: auo,a030jtn01



  reg:

    maxItems: 1



required:

  - compatible

  - reg

  - power-supply

  - reset-gpios



unevaluatedProperties: false



examples:

  - |

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



    spi {

        #address-cells = <1>;

        #size-cells = <0>;



        panel@0 {

            compatible = "auo,a030jtn01";

            reg = <0>;



            spi-max-frequency = <10000000>;



            reset-gpios = <&gpe 4 GPIO_ACTIVE_LOW>;

            power-supply = <&lcd_power>;



            backlight = <&backlight>;



            port {

                panel_input: endpoint {

                    remote-endpoint = <&panel_output>;

                };

            };

        };

    };

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

+7 −0
Original line number Diff line number Diff line
@@ -63,6 +63,11 @@ properties: 
  reg:

    description: Location and size of the framebuffer memory



  memory-region:

    maxItems: 1

    description: Phandle to a node describing the memory to be used for the

      framebuffer. If present, overrides the "reg" property (if one exists).



  clocks:

    description: List of clocks used by the framebuffer.
@@ -94,6 +99,7 @@ properties: 
        * `x1r5g5b5` - 16-bit pixels, d[14:10]=r, d[9:5]=g, d[4:0]=b

        * `x2r10g10b10` - 32-bit pixels, d[29:20]=r, d[19:10]=g, d[9:0]=b

        * `x8r8g8b8` - 32-bit pixels, d[23:16]=r, d[15:8]=g, d[7:0]=b

        * `x8b8g8r8` - 32-bit pixels, d[23:16]=b, d[15:8]=g, d[7:0]=r

    enum:

      - a1r5g5b5

      - a2r10g10b10
@@ -105,6 +111,7 @@ properties: 
      - x1r5g5b5

      - x2r10g10b10

      - x8r8g8b8

      - x8b8g8r8



  display:

    $ref: /schemas/types.yaml#/definitions/phandle

Documentation/devicetree/bindings/reserved-memory/framebuffer.yaml

0 → 100644
+52 −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/reserved-memory/framebuffer.yaml#

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



title: /reserved-memory framebuffer node bindings



maintainers:

  - devicetree-spec@vger.kernel.org



allOf:

  - $ref: reserved-memory.yaml



properties:

  compatible:

    const: framebuffer

    description: >

      This indicates a region of memory meant to be used as a framebuffer for

      a set of display devices. It can be used by an operating system to keep

      the framebuffer from being overwritten and use it as the backing memory

      for a display device (such as simple-framebuffer).



unevaluatedProperties: false



examples:

  - |

    / {

        compatible = "foo";

        model = "foo";

        #address-cells = <1>;

        #size-cells = <1>;



        chosen {

            framebuffer {

                compatible = "simple-framebuffer";

                memory-region = <&fb>;

            };

        };



        reserved-memory {

            #address-cells = <1>;

            #size-cells = <1>;

            ranges;



            fb: framebuffer@80000000 {

                compatible = "framebuffer";

                reg = <0x80000000 0x007e9000>;

            };

        };

    };

...

MAINTAINERS

+12 −1
Original line number Diff line number Diff line
@@ -6894,6 +6894,15 @@ T: git https://git.kernel.org/pub/scm/linux/kernel/git/ogabbay/accel.git 
F:	Documentation/accel/

F:	drivers/accel/









DRM ACCEL DRIVERS FOR INTEL VPU









M:	Jacek Lawrynowicz <jacek.lawrynowicz@linux.intel.com>









M:	Stanislaw Gruszka <stanislaw.gruszka@linux.intel.com>









L:	dri-devel@lists.freedesktop.org









S:	Supported









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









F:	drivers/accel/ivpu/









F:	include/uapi/drm/ivpu_accel.h

















DRM DRIVERS FOR ALLWINNER A10









M:	Maxime Ripard <mripard@kernel.org>









M:	Chen-Yu Tsai <wens@csie.org>








@@ -6986,8 +6995,10 @@ F:	drivers/gpu/drm/gma500/







DRM DRIVERS FOR HISILICON









M:	Xinliang Liu <xinliang.liu@linaro.org>









M:	Tian Tao  <tiantao6@hisilicon.com>









R:	John Stultz <jstultz@google.com>









R:	Xinwei Kong <kong.kongxinwei@hisilicon.com>









R:	Sumit Semwal <sumit.semwal@linaro.org>









R:	Yongqin Liu <yongqin.liu@linaro.org>









R:	John Stultz <jstultz@google.com>









L:	dri-devel@lists.freedesktop.org









S:	Maintained









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