Commit aa628ebb authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'drm-misc-next-2024-10-09' of... 

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

 into drm-next

drm-misc-next for v6.13:

UAPI Changes:
- Add drm fdinfo support to panthor, and add sysfs knob to toggle.

Cross-subsystem Changes:
- Convert fbdev drivers to use backlight power constants.
- Some small dma-fence fixes.
- Some kernel-doc fixes.

Core Changes:
- Small drm client fixes.
- Document requirements that you need to file a bug before marking a test as flaky.
- Remove swapped and pinned bo's from TTM lru list.

Driver Changes:
- Assorted small fixes to panel/elida-kd35t133, nouveau, vc4, imx.
- Fix some bridges to drop cached edids on power off.
- Add Jenson BL-JT60050-01A, Samsung s6e3ha8 & AMS639RQ08 panels.
- Make 180° rotation work on ilitek-ili9881c, even for already-rotated
  panels.
-

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

# Conflicts:
#	drivers/gpu/drm/panthor/panthor_drv.c
From: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/8dc111ca-d20c-4e0d-856e-c12d208cbf2a@linux.intel.com
parents 54bc1d32 4c93ede2

Documentation/ABI/testing/sysfs-driver-panthor-profiling

0 → 100644
+10 −0
Original line number Diff line number Diff line 
What:		/sys/bus/platform/drivers/panthor/.../profiling

Date:		September 2024

KernelVersion:	6.11.0

Contact:	Adrian Larumbe <adrian.larumbe@collabora.com>

Description:

		Bitmask to enable drm fdinfo's job profiling measurements.

		Valid values are:

		0: Don't enable fdinfo job profiling sources.

		1: Enable GPU cycle measurements for running jobs.

		2: Enable GPU timestamp sampling for running jobs.

Documentation/devicetree/bindings/display/panel/panel-lvds.yaml

+2 −0
Original line number Diff line number Diff line
@@ -50,6 +50,8 @@ properties: 
          - hannstar,hsd101pww2

          # Hydis Technologies 7" WXGA (800x1280) TFT LCD LVDS panel

          - hydis,hv070wx2-1e0

          # Jenson Display BL-JT60050-01A 7" WSVGA (1024x600) color TFT LCD LVDS panel

          - jenson,bl-jt60050-01a

          - tbs,a711-panel



      - const: panel-lvds

Documentation/devicetree/bindings/display/panel/samsung,ams639rq08.yaml

0 → 100644
+80 −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/samsung,ams639rq08.yaml#

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



title: Samsung AMS639RQ08 EA8076-based 6.39" 1080x2340 MIPI-DSI Panel



maintainers:

  - Danila Tikhonov <danila@jiaxyga.com>

  - Jens Reidel <adrian@travitia.xyz>



description:

  The Samsung AMS639RQ08 is a 6.39 inch 1080x2340 MIPI-DSI CMD mode AMOLED panel.



allOf:

  - $ref: panel-common.yaml#



properties:

  compatible:

    const: samsung,ams639rq08



  reg:

    maxItems: 1



  vdd3p3-supply:

    description: 3.3V source voltage rail



  vddio-supply:

    description: I/O source voltage rail



  vsn-supply:

    description: Negative source voltage rail



  vsp-supply:

    description: Positive source voltage rail



  reset-gpios: true

  port: true



required:

  - compatible

  - reg

  - vdd3p3-supply

  - vddio-supply

  - vsn-supply

  - vsp-supply

  - reset-gpios

  - port



additionalProperties: false



examples:

  - |

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



    dsi {

        #address-cells = <1>;

        #size-cells = <0>;



        panel@0 {

            compatible = "samsung,ams639rq08";

            reg = <0>;



            vdd3p3-supply = <&vreg_l18a_2p8>;

            vddio-supply = <&vreg_l13a_1p8>;

            vsn-supply = <&vreg_ibb>;

            vsp-supply = <&vreg_lab>;



            reset-gpios = <&pm6150l_gpios 9 GPIO_ACTIVE_LOW>;



            port {

                panel_in: endpoint {

                    remote-endpoint = <&mdss_dsi0_out>;

                };

            };

        };

    };



...

Documentation/devicetree/bindings/display/panel/samsung,s6e3ha8.yaml

0 → 100644
+75 −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/samsung,s6e3ha8.yaml#

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



title: Samsung s6e3ha8 AMOLED DSI panel



description: The s6e3ha8 is a 1440x2960 DPI display panel from Samsung Mobile

  Displays (SMD).



maintainers:

  - Dzmitry Sankouski <dsankouski@gmail.com>



allOf:

  - $ref: panel-common.yaml#



properties:

  compatible:

    const: samsung,s6e3ha8



  reg:

    maxItems: 1



  reset-gpios: true



  port: true



  vdd3-supply:

    description: VDD regulator



  vci-supply:

    description: VCI regulator



  vddr-supply:

    description: VDDR regulator



required:

  - compatible

  - reset-gpios

  - vdd3-supply

  - vci-supply

  - vddr-supply



unevaluatedProperties: false



examples:

  - |

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



    dsi {

        #address-cells = <1>;

        #size-cells = <0>;



        panel@0 {

            compatible = "samsung,s6e3ha8";

            reg = <0>;

            vci-supply = <&s2dos05_ldo4>;

            vddr-supply = <&s2dos05_buck1>;

            vdd3-supply = <&s2dos05_ldo1>;

            te-gpios = <&tlmm 10 GPIO_ACTIVE_HIGH>;

            reset-gpios = <&tlmm 6 GPIO_ACTIVE_HIGH>;

            pinctrl-0 = <&sde_dsi_active &sde_te_active_sleep>;

            pinctrl-1 = <&sde_dsi_suspend &sde_te_active_sleep>;

            pinctrl-names = "default", "sleep";



            port {

                panel_in: endpoint {

                    remote-endpoint = <&mdss_dsi0_out>;

                };

            };

        };

    };



...

Documentation/devicetree/bindings/vendor-prefixes.yaml

+2 −0
Original line number Diff line number Diff line
@@ -752,6 +752,8 @@ patternProperties: 
    description: Japan Display Inc.

  "^jedec,.*":

    description: JEDEC Solid State Technology Association

  "^jenson,.*":

    description: Jenson Display Co. Ltd.

  "^jesurun,.*":

    description: Shenzhen Jesurun Electronics Business Dept.

  "^jethome,.*":