Commit 915b6d03 authored by Dave Airlie's avatar Dave Airlie
Browse files

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



drm-misc-next for v6.7-rc1:

drm-misc-next-2023-10-19 + following:

UAPI Changes:

Cross-subsystem Changes:
- Convert fbdev drivers to use fbdev i/o mem helpers.

Core Changes:
- Use cross-references for macros in docs.
- Make drm_client_buffer_addb use addfb2.
- Add NV20 and NV30 YUV formats.
- Documentation updates for create_dumb ioctl.
- CI fixes.
- Allow variable number of run-queues in scheduler.

Driver Changes:
- Rename drm/ast constants.
- Make ili9882t its own driver.
- Assorted fixes in ivpu, vc4, bridge/synopsis, amdgpu.
- Add planar formats to rockchip.

Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
From: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/3d92fae8-9b1b-4165-9ca8-5fda11ee146b@linux.intel.com
parents 5258dfd4 b7043800

Documentation/devicetree/bindings/display/bridge/fsl,imx93-mipi-dsi.yaml

0 → 100644
+115 −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/fsl,imx93-mipi-dsi.yaml#

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



title: Freescale i.MX93 specific extensions to Synopsys Designware MIPI DSI



maintainers:

  - Liu Ying <victor.liu@nxp.com>



description: |

  There is a Synopsys Designware MIPI DSI Host Controller and a Synopsys

  Designware MIPI DPHY embedded in Freescale i.MX93 SoC.  Some configurations

  and extensions to them are controlled by i.MX93 media blk-ctrl.



allOf:

  - $ref: snps,dw-mipi-dsi.yaml#



properties:

  compatible:

    const: fsl,imx93-mipi-dsi



  clocks:

    items:

      - description: apb clock

      - description: pixel clock

      - description: PHY configuration clock

      - description: PHY reference clock



  clock-names:

    items:

      - const: pclk

      - const: pix

      - const: phy_cfg

      - const: phy_ref



  interrupts:

    maxItems: 1



  fsl,media-blk-ctrl:

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

    description:

      i.MX93 media blk-ctrl, as a syscon, controls pixel component bit map

      configurations from LCDIF display controller to the MIPI DSI host

      controller and MIPI DPHY PLL related configurations through PLL SoC

      interface.



  power-domains:

    maxItems: 1



required:

  - compatible

  - interrupts

  - fsl,media-blk-ctrl

  - power-domains



unevaluatedProperties: false



examples:

  - |

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

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

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

    #include <dt-bindings/power/fsl,imx93-power.h>



    dsi@4ae10000 {

        compatible = "fsl,imx93-mipi-dsi";

        reg = <0x4ae10000 0x10000>;

        interrupts = <GIC_SPI 177 IRQ_TYPE_LEVEL_HIGH>;

        clocks = <&clk IMX93_CLK_MIPI_DSI_GATE>,

                 <&clk IMX93_CLK_MEDIA_DISP_PIX>,

                 <&clk IMX93_CLK_MIPI_PHY_CFG>,

                 <&clk IMX93_CLK_24M>;

        clock-names = "pclk", "pix", "phy_cfg", "phy_ref";

        fsl,media-blk-ctrl = <&media_blk_ctrl>;

        power-domains = <&media_blk_ctrl IMX93_MEDIABLK_PD_MIPI_DSI>;

        #address-cells = <1>;

        #size-cells = <0>;



        panel@0 {

            compatible = "raydium,rm67191";

            reg = <0>;

            reset-gpios = <&adp5585gpio 6 GPIO_ACTIVE_LOW>;

            dsi-lanes = <4>;

            video-mode = <2>;



            port {

                panel_in: endpoint {

                    remote-endpoint = <&dsi_out>;

                };

            };

        };



        ports {

            #address-cells = <1>;

            #size-cells = <0>;



            port@0 {

                reg = <0>;



                dsi_to_lcdif: endpoint {

                    remote-endpoint = <&lcdif_to_dsi>;

                };

            };



            port@1 {

                reg = <1>;



                dsi_out: endpoint {

                    remote-endpoint = <&panel_in>;

                };

            };

        };

    };

Documentation/devicetree/bindings/display/panel/rocktech,jh057n00900.yaml

+2 −0
Original line number Diff line number Diff line
@@ -22,6 +22,8 @@ properties: 
    enum:

      # Anberic RG353V-V2 5.0" 640x480 TFT LCD panel

      - anbernic,rg353v-panel-v2

      # Powkiddy RGB30 3.0" 720x720 TFT LCD panel

      - powkiddy,rgb30-panel

      # Rocktech JH057N00900 5.5" 720x1440 TFT LCD panel

      - rocktech,jh057n00900

      # Xingbangda XBD599 5.99" 720x1440 TFT LCD panel

Documentation/devicetree/bindings/display/solomon,ssd-common.yaml

0 → 100644
+42 −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/solomon,ssd-common.yaml#

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



title: Common properties for Solomon OLED Display Controllers



maintainers:

  - Javier Martinez Canillas <javierm@redhat.com>



properties:

  reg:

    maxItems: 1



  reset-gpios:

    maxItems: 1



  # Only required for SPI

  dc-gpios:

    description:

      GPIO connected to the controller's D/C# (Data/Command) pin,

      that is needed for 4-wire SPI to tell the controller if the

      data sent is for a command register or the display data RAM

    maxItems: 1



  solomon,height:

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

    description:

      Height in pixel of the screen driven by the controller.

      The default value is controller-dependent.



  solomon,width:

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

    description:

      Width in pixel of the screen driven by the controller.

      The default value is controller-dependent.



allOf:

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



additionalProperties: true

Documentation/devicetree/bindings/display/solomon,ssd1307fb.yaml

+1 −27
Original line number Diff line number Diff line
@@ -27,38 +27,12 @@ properties: 
          - solomon,ssd1307

          - solomon,ssd1309



  reg:

    maxItems: 1



  pwms:

    maxItems: 1



  reset-gpios:

    maxItems: 1



  # Only required for SPI

  dc-gpios:

    description:

      GPIO connected to the controller's D/C# (Data/Command) pin,

      that is needed for 4-wire SPI to tell the controller if the

      data sent is for a command register or the display data RAM

    maxItems: 1



  vbat-supply:

    description: The supply for VBAT



  solomon,height:

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

    description:

      Height in pixel of the screen driven by the controller.

      The default value is controller-dependent.



  solomon,width:

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

    description:

      Width in pixel of the screen driven by the controller.

      The default value is controller-dependent.



  solomon,page-offset:

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

    default: 1
@@ -148,7 +122,7 @@ required: 
  - reg



allOf:

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

  - $ref: solomon,ssd-common.yaml#



  - if:

      properties:

Documentation/devicetree/bindings/display/solomon,ssd132x.yaml

0 → 100644
+89 −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/solomon,ssd132x.yaml#

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



title: Solomon SSD132x OLED Display Controllers



maintainers:

  - Javier Martinez Canillas <javierm@redhat.com>



properties:

  compatible:

    - enum:

        - solomon,ssd1322

        - solomon,ssd1325

        - solomon,ssd1327



required:

  - compatible

  - reg



allOf:

  - $ref: solomon,ssd-common.yaml#



  - if:

      properties:

        compatible:

          contains:

            const: solomon,ssd1322

    then:

      properties:

        width:

          default: 480

        height:

          default: 128



  - if:

      properties:

        compatible:

          contains:

            const: solomon,ssd1325

    then:

      properties:

        width:

          default: 128

        height:

          default: 80



  - if:

      properties:

        compatible:

          contains:

            const: solomon,ssd1327

    then:

      properties:

        width:

          default: 128

        height:

          default: 128



unevaluatedProperties: false



examples:

  - |

    i2c {

            #address-cells = <1>;

            #size-cells = <0>;



            oled@3c {

                    compatible = "solomon,ssd1327";

                    reg = <0x3c>;

                    reset-gpios = <&gpio2 7>;

            };



    };

  - |

    spi {

            #address-cells = <1>;

            #size-cells = <0>;



            oled@0 {

                    compatible = "solomon,ssd1327";

                    reg = <0x0>;

                    reset-gpios = <&gpio2 7>;

                    dc-gpios = <&gpio2 8>;

                    spi-max-frequency = <10000000>;

            };

    };