Commit 90153b36 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'drm-misc-next-2024-04-25' of... 

Merge tag 'drm-misc-next-2024-04-25' of https://gitlab.freedesktop.org/drm/misc/kernel

 into drm-next

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

UAPI Changes:

Cross-subsystem Changes:
- Devicetree updates for rockchip (#sound-dai-cells)
- Add dt bindings for new panels.
- Change bridge/tc358775 dt bindings.

Core Changes:
- Fix SIZE_HINTS cursor property doc.
- Parse topology blocks for all DispID < 2.0.
- Implement support for tracking cleared free memory, use it in amdgpu.
- Drop seq_file.h from drm_print.h, and include debugfs.h explicitly
  where needed (drivers).

Driver Changes:
- Small fixes to rockchip, panthor, v3d, bridge chaining, xlx.
- Add Khadas TS050 V2, EDO RM69380 OLED, CSOT MNB601LS1-1 panels,
- Add SAM9X7 SoC's LVDS controller.
- More driver conversions to struct drm_edid.
- Support tc358765 in tc358775 bridge.

Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
From: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/1ab99848-8fb8-41a6-8967-c4ce6f3634fd@linux.intel.com
parents bbecb57e 9e2b84fb

Documentation/devicetree/bindings/display/bridge/microchip,sam9x75-lvds.yaml

0 → 100644
+55 −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/microchip,sam9x75-lvds.yaml#

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



title: Microchip SAM9X75 LVDS Controller



maintainers:

  - Dharma Balasubiramani <dharma.b@microchip.com>



description:

  The Low Voltage Differential Signaling Controller (LVDSC) manages data

  format conversion from the LCD Controller internal DPI bus to OpenLDI

  LVDS output signals. LVDSC functions include bit mapping, balanced mode

  management, and serializer.



properties:

  compatible:

    const: microchip,sam9x75-lvds



  reg:

    maxItems: 1



  interrupts:

    maxItems: 1



  clocks:

    items:

      - description: Peripheral Bus Clock



  clock-names:

    items:

      - const: pclk



required:

  - compatible

  - reg

  - interrupts

  - clocks

  - clock-names



additionalProperties: false



examples:

  - |

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

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

    lvds-controller@f8060000 {

      compatible = "microchip,sam9x75-lvds";

      reg = <0xf8060000 0x100>;

      interrupts = <56 IRQ_TYPE_LEVEL_HIGH 0>;

      clocks = <&pmc PMC_TYPE_PERIPHERAL 56>;

      clock-names = "pclk";

    };

Documentation/devicetree/bindings/display/bridge/toshiba,tc358775.yaml

+33 −6
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ maintainers: 
  - Vinay Simha BN <simhavcs@gmail.com>



description: |

  This binding supports DSI to LVDS bridge TC358775

  This binding supports DSI to LVDS bridges TC358765 and TC358775



  MIPI DSI-RX Data 4-lane, CLK 1-lane with data rates up to 800 Mbps/lane.

  Video frame size:
@@ -21,7 +21,9 @@ description: | 


properties:

  compatible:

    const: toshiba,tc358775

    enum:

      - toshiba,tc358765

      - toshiba,tc358775



  reg:

    maxItems: 1
@@ -46,11 +48,27 @@ properties: 


    properties:

      port@0:

        $ref: /schemas/graph.yaml#/properties/port

        $ref: /schemas/graph.yaml#/$defs/port-base

        unevaluatedProperties: false

        description: |

          DSI Input. The remote endpoint phandle should be a

          reference to a valid mipi_dsi_host device node.



        properties:

          endpoint:

            $ref: /schemas/media/video-interfaces.yaml#

            unevaluatedProperties: false



            properties:

              data-lanes:

                description: array of physical DSI data lane indexes.

                minItems: 1

                items:

                  - const: 1

                  - const: 2

                  - const: 3

                  - const: 4



      port@1:

        $ref: /schemas/graph.yaml#/properties/port

        description: |
@@ -70,10 +88,19 @@ required: 
  - reg

  - vdd-supply

  - vddio-supply

  - stby-gpios

  - reset-gpios

  - ports



allOf:

  - if:

      properties:

        compatible:

          contains:

            const: toshiba,tc358765

    then:

      properties:

        stby-gpios: false



additionalProperties: false



examples:
@@ -108,6 +135,7 @@ examples: 
                    reg = <0>;

                    d2l_in_test: endpoint {

                        remote-endpoint = <&dsi0_out>;

                        data-lanes = <1 2 3 4>;

                    };

                };
@@ -132,7 +160,6 @@ examples: 
                reg = <1>;

                dsi0_out: endpoint {

                    remote-endpoint = <&d2l_in_test>;

                    data-lanes = <0 1 2 3>;

                };

             };

         };
@@ -167,6 +194,7 @@ examples: 
                    reg = <0>;

                    d2l_in_dual: endpoint {

                        remote-endpoint = <&dsi0_out_dual>;

                        data-lanes = <1 2 3 4>;

                    };

                };
@@ -198,7 +226,6 @@ examples: 
                reg = <1>;

                dsi0_out_dual: endpoint {

                    remote-endpoint = <&d2l_in_dual>;

                    data-lanes = <0 1 2 3>;

                };

             };

         };

Documentation/devicetree/bindings/display/panel/panel-simple-dsi.yaml

+2 −0
Original line number Diff line number Diff line
@@ -36,6 +36,8 @@ properties: 
      - jdi,fhd-r63452

        # Khadas TS050 5" 1080x1920 LCD panel

      - khadas,ts050

        # Khadas TS050 V2 5" 1080x1920 LCD panel

      - khadas,ts050v2

        # Kingdisplay KD097D04 9.7" 1536x2048 TFT LCD panel

      - kingdisplay,kd097d04

        # LG ACX467AKM-7 4.95" 1080×1920 LCD Panel

Documentation/devicetree/bindings/display/panel/raydium,rm69380.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/panel/raydium,rm69380.yaml#

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



title: Raydium RM69380-based DSI display panels



maintainers:

  - David Wronek <david@mainlining.org>



description:

  The Raydium RM69380 is a generic DSI panel IC used to control

  OLED panels.



allOf:

  - $ref: panel-common-dual.yaml#



properties:

  compatible:

    items:

      - enum:

          - lenovo,j716f-edo-rm69380

      - const: raydium,rm69380

    description: This indicates the panel manufacturer of the panel

      that is in turn using the RM69380 panel driver. The compatible

      string determines how the RM69380 panel driver shall be configured

      to work with the indicated panel. The raydium,rm69380 compatible shall

      always be provided as a fallback.



  avdd-supply:

    description: Analog voltage rail



  vddio-supply:

    description: I/O voltage rail



  reset-gpios:

    maxItems: 1

    description: phandle of gpio for reset line - This should be active low



  reg: true



required:

  - compatible

  - reg

  - avdd-supply

  - vddio-supply

  - reset-gpios



unevaluatedProperties: false



examples:

  - |

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



    dsi {

        #address-cells = <1>;

        #size-cells = <0>;



        panel@0 {

            compatible = "lenovo,j716f-edo-rm69380", "raydium,rm69380";

            reg = <0>;



            avdd-supply = <&panel_avdd_regulator>;

            vddio-supply = <&vreg_l14a>;

            reset-gpios = <&tlmm 75 GPIO_ACTIVE_LOW>;



            ports {

                #address-cells = <1>;

                #size-cells = <0>;



                port@0 {

                    reg = <0>;

                    panel_in_0: endpoint {

                        remote-endpoint = <&mdss_dsi0_out>;

                    };

                };



                port@1 {

                    reg = <1>;

                    panel_in_1: endpoint {

                        remote-endpoint = <&mdss_dsi1_out>;

                    };

                };

            };

        };

    };



...

Documentation/devicetree/bindings/display/rockchip/rockchip,dw-hdmi.yaml

+5 −0
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ description: | 


allOf:

  - $ref: ../bridge/synopsys,dw-hdmi.yaml#

  - $ref: /schemas/sound/dai-common.yaml#



properties:

  compatible:
@@ -124,6 +125,9 @@ properties: 
    description:

      phandle to the GRF to mux vopl/vopb.



  "#sound-dai-cells":

    const: 0



required:

  - compatible

  - reg
@@ -153,6 +157,7 @@ examples: 
        ddc-i2c-bus = <&i2c5>;

        power-domains = <&power RK3288_PD_VIO>;

        rockchip,grf = <&grf>;

        #sound-dai-cells = <0>;



        ports {

            #address-cells = <1>;