Commit 18589d74 authored by Daniel Vetter's avatar Daniel Vetter
Browse files

Merge tag 'drm-misc-next-2020-12-17' of git://anongit.freedesktop.org/drm/drm-misc into drm-next 



drm-misc-next for v5.12:

UAPI Changes:
- Not necessarily one, but we document that userspace needs to force probe connectors.

Cross-subsystem Changes:
- Require FB_ATY_CT for aty on sparc64.
- video: Fix documentation, and a few compiler warnings.
- Add devicetree bindings for DP connectors.
- dma-buf: Update kernel-doc, and add might_lock for resv objects in begin/end_cpu_access.

Core Changes:
- ttm: Warn when releasing a pinned bo.
- ttm: Cleanup bo size handling.
- cma-helper: Remove prime infix, and implement mmap as GEM CMA functions.
- Split drm_prime_sg_to_page_addr_arrays into 2 functions.
- Add a new api to install irq using devm.
- Update panel kerneldoc to inline style.
- Add DP support to drm/bridge.
- Assorted small fixes to ttm, fb-helper, scheduler.
- Add atomic_commit_setup function callback.
- Automatically use the atomic gamma_set, instead of forcing drivers to declare the default atomic version.
- Allow using degamma for legacy gamma if gamma is not available.
- Clarify that primary/cursor planes are not tied to 1 crtc (depending on possible_crtcs).
- ttm: Cleanup the lru handler.

Driver Changes:
- Add pm support to ingenic.
- Assorted small fixes in radeon, via, rockchip, omap2fb, kmb, gma500, nouveau, virtio, hisilicon, ingenic, s6e63m0 panel, ast, udlfb.
- Add BOE NV110WTM-N61, ys57pss36bh5gq, Khadas TS050 panels.
- Stop using pages with drm_prime_sg_to_page_addr_arrays, and switch all callers to use ttm_sg_tt_init.
- Cleanup compiler and docbook warnings in a lot of fbdev devices.
- Use the drmm_vram_helper in hisilicon.
- Add support for BCM2711 DSI1 in vc4.
- Add support for 8-bit delta RGB panels to ingenic.
- Add documentation on how to test vkms.
- Convert vc4 to atomic helpers.
- Use degamma instead of gamma table in omap, to add support for CTM and color encoding/range properties.
- Rework omap DSI code, and merge all omapdrm modules now that the last omap panel is now a drm panel.
- More refactoring of omap dsi code.
- Enable 10/12 bpc outputs in vc4.

Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
From: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/78381a4f-45fd-aed4-174a-94ba051edd37@linux.intel.com
parents e71ba945 c545781e

Documentation/devicetree/bindings/display/brcm,bcm2835-dsi0.yaml

+1 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ properties: 


  compatible:

    enum:

      - brcm,bcm2711-dsi1

      - brcm,bcm2835-dsi0

      - brcm,bcm2835-dsi1

Documentation/devicetree/bindings/display/connector/dp-connector.yaml

0 → 100644
+56 −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/connector/dp-connector.yaml#

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



title: DisplayPort Connector



maintainers:

  - Tomi Valkeinen <tomi.valkeinen@ti.com>



properties:

  compatible:

    const: dp-connector



  label: true



  type:

    enum:

      - full-size

      - mini



  hpd-gpios:

    description: A GPIO line connected to HPD

    maxItems: 1



  dp-pwr-supply:

    description: Power supply for the DP_PWR pin

    maxItems: 1



  port:

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

    description: Connection to controller providing DP signals



required:

  - compatible

  - type

  - port



additionalProperties: false



examples:

  - |

    connector {

        compatible = "dp-connector";

        label = "dp0";

        type = "full-size";



        port {

            dp_connector_in: endpoint {

                remote-endpoint = <&dp_out>;

            };

        };

    };



...

Documentation/devicetree/bindings/display/panel/mantix,mlaf057we51-x.yaml

+1 −0
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ properties: 
  compatible:

    enum:

      - mantix,mlaf057we51-x

      - ys,ys57pss36bh5gq



  port: true

  reg:

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

+2 −0
Original line number Diff line number Diff line
@@ -35,6 +35,8 @@ properties: 
      - boe,tv080wum-nl0

        # Innolux P079ZCA 7.85" 768x1024 TFT LCD panel

      - innolux,p079zca

        # Khadas TS050 5" 1080x1920 LCD panel

      - khadas,ts050

        # Kingdisplay KD097D04 9.7" 1536x2048 TFT LCD panel

      - kingdisplay,kd097d04

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

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

+2 −0
Original line number Diff line number Diff line
@@ -76,6 +76,8 @@ properties: 
        # BOE OPTOELECTRONICS TECHNOLOGY 10.1" WXGA TFT LCD panel

      - boe,nv101wxmn51

        # BOE NV133FHM-N61 13.3" FHD (1920x1080) TFT LCD Panel

      - boe,nv110wtm-n61

        # BOE NV110WTM-N61 11.0" 2160x1440 TFT LCD Panel

      - boe,nv133fhm-n61

        # BOE NV133FHM-N62 13.3" FHD (1920x1080) TFT LCD Panel

      - boe,nv133fhm-n62