Commit 0bec6219 authored by Daniel Vetter's avatar Daniel Vetter
Browse files

Merge tag 'drm-misc-next-2019-03-21' of git://anongit.freedesktop.org/drm/drm-misc into drm-next 



drm-misc-next for 5.2:

UAPI Changes:
- Add Colorspace connector property (Uma)
- fourcc: Several new YUV formats from ARM (Brian & Ayan)
- fourcc: Fix merge conflicts between new formats above and Swati's that
  went in via topic/hdr-formats-2019-03-07 branch (Maarten)

Cross-subsystem Changes:
- Typed component support via topic/component-typed-2019-02-11 (Maxime/Daniel)

Core Changes:
- Improve component helper documentation (Daniel)
- Avoid calling drm_dev_unregister() twice on unplugged devices (Noralf)
- Add device managed (devm) drm_device init function (Noralf)
- Graduate TINYDRM_MODE to DRM_SIMPLE_MODE in core (Noralf)
- Move MIPI/DSI rate control params computation into core from i915 (David)
- Add support for shmem backed gem objects (Noralf)

Driver Changes:
- various: Use of_node_name_eq for node name comparisons (Rob Herring)
- sun4i: Add DSI burst mode support (Konstantin)
- panel: Add Ronbo RB070D30 MIPI/DSI panel support (Konstantin)
- virtio: A few prime improvements (Gerd)
- tinydrm: Remove tinydrm_device (Noralf)
- vc4: Add load tracker to driver to detect underflow in atomic check (Boris)
- vboxvideo: Move it out of staging \o/ (Hans)
- v3d: Add support for V3D v4.2 (Eric)

Cc: Konstantin Sudakov <k.sudakov@integrasources.com>
Cc: Rob Herring <robh@kernel.org>
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
Cc: Maxime Ripard <maxime.ripard@bootlin.com>
Cc: Uma Shankar <uma.shankar@intel.com>
Cc: Noralf Trønnes <noralf@tronnes.org>
Cc: Gerd Hoffmann <kraxel@redhat.com>
Cc: David Francis <David.Francis@amd.com>
Cc: Boris Brezillon <boris.brezillon@bootlin.com>
Cc: Eric Anholt <eric@anholt.net>
Cc: Hans de Goede <hdegoede@redhat.com>
Cc: Brian Starkey <brian.starkey@arm.com>
Cc: Ayan Kumar Halder <ayan.halder@arm.com>
Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>

From: Sean Paul <sean@poorly.run>
Link: https://patchwork.freedesktop.org/patch/msgid/20190321170805.GA50145@art_vandelay
parents 535f6f5d ff01e697

Documentation/devicetree/bindings/display/amlogic,meson-vpu.txt

+2 −3
Original line number Diff line number Diff line
@@ -60,15 +60,14 @@ Required properties: 
- reg: base address and size of he following memory-mapped regions :

	- vpu

	- hhi

	- dmc

- reg-names: should contain the names of the previous memory regions

- interrupts: should contain the VENC Vsync interrupt number

- amlogic,canvas: phandle to canvas provider node as described in the file

	../soc/amlogic/amlogic,canvas.txt



Optional properties:

- power-domains: Optional phandle to associated power domain as described in

	the file ../power/power_domain.txt

- amlogic,canvas: phandle to canvas provider node as described in the file

	../soc/amlogic/amlogic,canvas.txt



Required nodes:

Documentation/devicetree/bindings/display/panel/ronbo,rb070d30.yaml

0 → 100644
+51 −0
Original line number Diff line number Diff line 
# SPDX-License-Identifier: (GPL-2.0+ OR X11)

%YAML 1.2

---

$id: http://devicetree.org/schemas/display/panel/ronbo,rb070d30.yaml#

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



title: Ronbo RB070D30 DSI Display Panel



maintainers:

  - Maxime Ripard <maxime.ripard@bootlin.com>



properties:

  compatible:

    const: ronbo,rb070d30



  reg:

    description: MIPI-DSI virtual channel



  power-gpios:

    description: GPIO used for the power pin

    maxItems: 1



  reset-gpios:

    description: GPIO used for the reset pin

    maxItems: 1



  shlr-gpios:

    description: GPIO used for the shlr pin (horizontal flip)

    maxItems: 1



  updn-gpios:

    description: GPIO used for the updn pin (vertical flip)

    maxItems: 1



  vcc-lcd-supply:

    description: Power regulator



  backlight:

    description: Backlight used by the panel

    $ref: "/schemas/types.yaml#/definitions/phandle"



required:

  - compatible

  - power-gpios

  - reg

  - reset-gpios

  - shlr-gpios

  - updn-gpios

  - vcc-lcd-supply



additionalProperties: false

Documentation/devicetree/bindings/gpu/brcm,bcm-v3d.txt

+8 −3
Original line number Diff line number Diff line
@@ -6,15 +6,20 @@ For V3D 2.x, see brcm,bcm-vc4.txt. 
Required properties:

- compatible:	Should be "brcm,7268-v3d" or "brcm,7278-v3d"

- reg:		Physical base addresses and lengths of the register areas

- reg-names:	Names for the register areas.  The "hub", "bridge", and "core0"

- reg-names:	Names for the register areas.  The "hub" and "core0"

		  register areas are always required.  The "gca" register area

		  is required if the GCA cache controller is present.

		  is required if the GCA cache controller is present.  The

		  "bridge" register area is required if an external reset

		  controller is not present.

- interrupts:	The interrupt numbers.  The first interrupt is for the hub,

		  while the following interrupts are for the cores.

		  while the following interrupts are separate interrupt lines

		  for the cores (if they don't share the hub's interrupt).

		  See bindings/interrupt-controller/interrupts.txt



Optional properties:

- clocks:	The core clock the unit runs on

- resets:	The reset line for v3d, if not using a mapping of the bridge

		  See bindings/reset/reset.txt



v3d {

	compatible = "brcm,7268-v3d";

Documentation/devicetree/bindings/vendor-prefixes.txt

+1 −0
Original line number Diff line number Diff line
@@ -346,6 +346,7 @@ rikomagic Rikomagic Tech Corp. Ltd 
riscv	RISC-V Foundation

rockchip	Fuzhou Rockchip Electronics Co., Ltd

rohm	ROHM Semiconductor Co., Ltd

ronbo   Ronbo Electronics

roofull	Shenzhen Roofull Technology Co, Ltd

samsung	Samsung Semiconductor

samtec	Samtec/Softing company

Documentation/driver-api/component.rst

+2 −0
Original line number Diff line number Diff line 
.. _component:



======================================

Component Helper for Aggregate Drivers

======================================

CRA Git | Maintained and supported by SUSTech CRA and CCSE