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

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



drm-misc-next for v6.9:

UAPI Changes:

virtio:
- add Venus capset defines

Cross-subsystem Changes:

Core Changes:

- fix drm_fixp2int_ceil()
- documentation fixes
- clean ups
- allow DRM_MM_DEBUG with DRM=m
- build fixes for debugfs support
- EDID cleanups
- sched: error-handling fixes
- ttm: add tests

Driver Changes:

bridge:
- ite-6505: fix DP link-training bug
- samsung-dsim: fix error checking in probe
- tc358767: fix regmap usage

efifb:
- use copy of global screen_info state

hisilicon:
- fix EDID includes

mgag200:
- improve ioremap usage
- convert to struct drm_edid

nouveau:
- disp: use kmemdup()
- fix EDID includes
- documentation fixes

panel:
- ltk050h3146w: error-handling fixes
- panel-edp: support delay between power-on and enable; use put_sync in
  unprepare; support Mediatek MT8173 Chromebooks, BOE NV116WHM-N49 V8.0,
  BOE NV122WUM-N41, CSO MNC207QS1-1 plus DT bindings
- panel-lvds: support EDT ETML0700Z9NDHA plus DT bindings
- panel-novatek: FRIDA FRD400B25025-A-CTK plus DT bindings

qaic:
- fixes to BO handling
- make use of DRM managed release
- fix order of remove operations

rockchip:
- analogix_dp: get encoder port from DT
- inno_hdmi: support HDMI for RK3128
- lvds: error-handling fixes

simplefb:
- fix logging

ssd130x:
- support SSD133x plus DT bindings

tegra:
- fix error handling

tilcdc:
- make use of DRM managed release

v3d:
- show memory stats in debugfs

vc4:
- fix error handling in plane prepare_fb
- fix framebuffer test in plane helpers

vesafb:
- use copy of global screen_info state

virtio:
- cleanups

vkms:
- fix OOB access when programming the LUT
- Kconfig improvements

vmwgfx:
- unmap surface before changing plane state
- fix memory leak in error handling
- documentation fixes

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

From: Thomas Zimmermann <tzimmermann@suse.de>
Link: https://patchwork.freedesktop.org/patch/msgid/20240111154902.GA8448@linux-uq9g
parents 54be6c6c 502756e2

Documentation/devicetree/bindings/display/panel/novatek,nt35510.yaml

+3 −1
Original line number Diff line number Diff line
@@ -15,7 +15,9 @@ allOf: 
properties:

  compatible:

    items:

      - const: hydis,hva40wv1

      - enum:

          - frida,frd400b25025

          - hydis,hva40wv1

      - const: novatek,nt35510

    description: This indicates the panel manufacturer of the panel

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

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

+2 −0
Original line number Diff line number Diff line
@@ -42,6 +42,8 @@ properties: 
          - auo,b101ew05

          # Chunghwa Picture Tubes Ltd. 7" WXGA (800x1280) TFT LCD LVDS panel

          - chunghwa,claa070wp03xg

          # EDT ETML0700Z9NDHA 7.0" WSVGA (1024x600) color TFT LCD LVDS panel

          - edt,etml0700z9ndha

          # HannStar Display Corp. HSD101PWW2 10.1" WXGA (1280x800) LVDS panel

          - hannstar,hsd101pww2

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

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

+10 −10
Original line number Diff line number Diff line
@@ -131,9 +131,9 @@ allOf: 
            const: sinowealth,sh1106

    then:

      properties:

        width:

        solomon,width:

          default: 132

        height:

        solomon,height:

          default: 64

        solomon,dclk-div:

          default: 1
@@ -149,9 +149,9 @@ allOf: 
              - solomon,ssd1305

    then:

      properties:

        width:

        solomon,width:

          default: 132

        height:

        solomon,height:

          default: 64

        solomon,dclk-div:

          default: 1
@@ -167,9 +167,9 @@ allOf: 
              - solomon,ssd1306

    then:

      properties:

        width:

        solomon,width:

          default: 128

        height:

        solomon,height:

          default: 64

        solomon,dclk-div:

          default: 1
@@ -185,9 +185,9 @@ allOf: 
              - solomon,ssd1307

    then:

      properties:

        width:

        solomon,width:

          default: 128

        height:

        solomon,height:

          default: 39

        solomon,dclk-div:

          default: 2
@@ -205,9 +205,9 @@ allOf: 
              - solomon,ssd1309

    then:

      properties:

        width:

        solomon,width:

          default: 128

        height:

        solomon,height:

          default: 64

        solomon,dclk-div:

          default: 1

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

+6 −6
Original line number Diff line number Diff line
@@ -30,9 +30,9 @@ allOf: 
            const: solomon,ssd1322

    then:

      properties:

        width:

        solomon,width:

          default: 480

        height:

        solomon,height:

          default: 128



  - if:
@@ -42,9 +42,9 @@ allOf: 
            const: solomon,ssd1325

    then:

      properties:

        width:

        solomon,width:

          default: 128

        height:

        solomon,height:

          default: 80



  - if:
@@ -54,9 +54,9 @@ allOf: 
            const: solomon,ssd1327

    then:

      properties:

        width:

        solomon,width:

          default: 128

        height:

        solomon,height:

          default: 128



unevaluatedProperties: false

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

0 → 100644
+45 −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,ssd133x.yaml#

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



title: Solomon SSD133x OLED Display Controllers



maintainers:

  - Javier Martinez Canillas <javierm@redhat.com>



allOf:

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



properties:

  compatible:

    enum:

      - solomon,ssd1331



  solomon,width:

    default: 96



  solomon,height:

    default: 64



required:

  - compatible

  - reg



unevaluatedProperties: false



examples:

  - |

    spi {

        #address-cells = <1>;

        #size-cells = <0>;



        oled@0 {

            compatible = "solomon,ssd1331";

            reg = <0x0>;

            reset-gpios = <&gpio2 7>;

            dc-gpios = <&gpio2 8>;

            spi-max-frequency = <10000000>;

        };

    };