Commit 71c46fc3 authored by Daniel Vetter's avatar Daniel Vetter
Browse files

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



drm-misc-next for v5.12:

UAPI Changes:
- Fix fourcc macro for amlogic video fbc.

Cross-subsystem Changes:
- Export pci_rebar_bytes_to_size.
- Add a PCI quirk to increase bar0 for RX 5600 XT Pulse to max possible size.
- Convert devicetree bindings to use the OF graph schema.
- Update s6e63m0 bindings.
- Make omapfb2 DSI_CM incompatible with drm/omap2 DSI-CM because of
  module conflicts.
- Add Zack Rusin as vmwgfx maintainer.
- Add CONFIG_DMABUF_DEBUG for validating dma-buf users don't loo kat struct page when importing or detaching.

Core Changes:
- Remove references to drm_device.pdev
- Fix regression in ttm_bo_move_to_lru_tail().
- Assorted docbook updates.
- Do not send dp-mst hotplug events on error when probing.
- Move some agp macros to agpsupport.c, so it's not always compiled.
- Move drm_need_swiotlb.h to drm_cache.c
- Only build drm_memory.o for legacy drivers, and move CONFIG_DRM_VM to legacy.
- Nuke drm_device.hose
- Warn when the ttm resource manager is non-empty when disabling.
- Assorted small fixes.

Driver Changes:
- Small assorted fixes in radeon, v3d, hisilicon, mipi-dbi, panfrost, hibmc, vc4, amdgpu, vkms, vmwgfx.
- Move hisilicon to use simple encode.
- Add writeback connector to vkms.
- Add support for BT2020 to DE3.
- Use gem prime mmap helpers in vc4, and move the mmap function upwards.
- Use managed drm device, and cleanup error paths and display registers in vmwgfx.
- Use correct bus_format and connector_type for innolux_n116bge.
- Fix a lot of warnings with W=1 (Lee Jones)

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/5c3ad775-48ce-33ee-e4c6-a5e1e540f845@linux.intel.com
parents 1777b185 c31eb10f

Documentation/devicetree/bindings/display/allwinner,sun4i-a10-display-backend.yaml

+5 −18
Original line number Diff line number Diff line
@@ -84,36 +84,23 @@ properties: 
    const: dma-mem



  ports:

    type: object

    description: |

      A ports node with endpoint definitions as defined in

      Documentation/devicetree/bindings/media/video-interfaces.txt.

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



    properties:

      "#address-cells":

        const: 1



      "#size-cells":

        const: 0



      port@0:

        type: object

        description: |

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

        description:

          Input endpoints of the controller.



      port@1:

        type: object

        description: |

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

        description:

          Output endpoints of the controller.



    required:

      - "#address-cells"

      - "#size-cells"

      - port@0

      - port@1



    additionalProperties: false



required:

  - compatible

  - reg

Documentation/devicetree/bindings/display/allwinner,sun4i-a10-display-frontend.yaml

+3 −16
Original line number Diff line number Diff line
@@ -57,35 +57,22 @@ properties: 
    maxItems: 1



  ports:

    type: object

    description: |

      A ports node with endpoint definitions as defined in

      Documentation/devicetree/bindings/media/video-interfaces.txt.

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



    properties:

      "#address-cells":

        const: 1



      "#size-cells":

        const: 0



      port@0:

        type: object

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

        description: |

          Input endpoints of the controller.



      port@1:

        type: object

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

        description: |

          Output endpoints of the controller.



    required:

      - "#address-cells"

      - "#size-cells"

      - port@1



    additionalProperties: false



required:

  - compatible

  - reg

Documentation/devicetree/bindings/display/allwinner,sun4i-a10-hdmi.yaml

+3 −16
Original line number Diff line number Diff line
@@ -76,37 +76,24 @@ properties: 
      - const: audio-tx



  ports:

    type: object

    description: |

      A ports node with endpoint definitions as defined in

      Documentation/devicetree/bindings/media/video-interfaces.txt.

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



    properties:

      "#address-cells":

        const: 1



      "#size-cells":

        const: 0



      port@0:

        type: object

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

        description: |

          Input endpoints of the controller.



      port@1:

        type: object

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

        description: |

          Output endpoints of the controller. Usually an HDMI

          connector.



    required:

      - "#address-cells"

      - "#size-cells"

      - port@0

      - port@1



    additionalProperties: false



required:

  - compatible

  - reg

Documentation/devicetree/bindings/display/allwinner,sun4i-a10-tcon.yaml

+6 −19
Original line number Diff line number Diff line
@@ -115,31 +115,24 @@ properties: 
          - const: lvds



  ports:

    type: object

    description: |

      A ports node with endpoint definitions as defined in

      Documentation/devicetree/bindings/media/video-interfaces.txt.

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



    properties:

      "#address-cells":

        const: 1



      "#size-cells":

        const: 0



      port@0:

        type: object

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

        description: |

          Input endpoints of the controller.



      port@1:

        type: object

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

        unevaluatedProperties: false

        description: |

          Output endpoints of the controller.



        patternProperties:

          "^endpoint(@[0-9])$":

            type: object

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

            unevaluatedProperties: false



            properties:

              allwinner,tcon-channel:
@@ -156,16 +149,10 @@ properties: 
                  property is not present, the endpoint number will be

                  used as the channel number.



            unevaluatedProperties: true



    required:

      - "#address-cells"

      - "#size-cells"

      - port@0

      - port@1



    additionalProperties: false



required:

  - compatible

  - reg

Documentation/devicetree/bindings/display/allwinner,sun4i-a10-tv-encoder.yaml

+2 −4
Original line number Diff line number Diff line
@@ -24,11 +24,9 @@ properties: 
    maxItems: 1



  port:

    type: object

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

    description:

      A port node with endpoint definitions as defined in

      Documentation/devicetree/bindings/media/video-interfaces.txt. The

      first port should be the input endpoint, usually coming from the

      The first port should be the input endpoint, usually coming from the

      associated TCON.



required: