Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0c5286a8 authored by Dave Airlie's avatar Dave Airlie
Browse files

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

drm-misc-next for 4.17:

Cross-subsystem Changes:
 dt-bindings: Add emtrion vendor prefix (Jan)

Core Changes:
 drm_print: More object size reductions (Joe)

Driver Changes:
 vc4: Fix alpha blending on bottom plane (Stefan)
 panel: Add Raydium RM68200 panel support (Phillipe)
 panel: Add AUO G104SN02 V2 panel support (Christoph)
 panel: Add KEO TX31D200VM0BAA panel support (Jagan)
 vga_switcheroo: Use device link to bookkeep HDA runtime pm (Lukas)
 rockchip: More CrOS kevin patches trickling in (various
 sun4i: Add A80 support (Chen-Yu)
 sun4i: Add YUV plane support (Maxime)
 meson: Multiple (mostly error-path) fixups (Christophe/Wei)

Cc: Stefan Schake <stschake@gmail.com>
Cc: Philippe CORNU <philippe.cornu@st.com>
Cc: jan.tuerk@emtrion.com
Cc: Christoph Fritz <chf.fritz@googlemail.com>
Cc: Jagan Teki <jagannadh.teki@gmail.com>
Cc: Lukas Wunner <lukas@wunner.de>
Cc: Joe Perches <joe@perches.com>
Cc: Chen-Yu Tsai <wens@csie.org>
Cc: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
Cc: Wei Yongjun <weiyongjun1@huawei.com>

* tag 'drm-misc-next-2018-03-21' of git://anongit.freedesktop.org/drm/drm-misc: (70 commits)
  drm/qxl: Replace drm_gem_object_reference/unreference() with _get/put()
  drm/meson: Fix potential NULL dereference in meson_drv_bind_master()
  drm/sun4i: backend: Support YUV planes
  drm/sun4i: backend: Check that we only have a single YUV plane
  drm/sun4i: Add driver support for A80 display pipeline
  drm/sun4i: Add compatible strings for the A80 display pipeline
  drm/sun4i: Add support for A80 TCONs
  drm/sun4i: Add DT binding for Detail Enhancement Unit in Allwinner A80 SoC
  drm/sun4i: Add compatible strings for A80 TCONs
  drm: Reduce object size of DRM_DEV_<LEVEL> uses
  drm/doc: Put all driver docs into a separate chapter
  drm: dma_bufs: Fixed checkpatch issues
  drm: remove drm_mode_object_{un/reference} aliases
  drm: Add PSR version 3 macro
  drm/vc4_validate: Remove VLA usage
  drm: Make drm_mode_vrefresh() a bit more accurate
  drm: Nuke the useless 'ret' variable from drm_mode_convert_umode()
  drm/i915: Use drm_color_lut_size()
  drm/i915: Remove the blob->data casts
  drm: Introduce drm_color_lut_size()
  ...
parents 78230c46 1c7095d2

Documentation/devicetree/bindings/display/panel/auo,g104sn02.txt

0 → 100644
+12 −0
Original line number Diff line number Diff line 
AU Optronics Corporation 10.4" (800x600) color TFT LCD panel



Required properties:

- compatible: should be "auo,g104sn02"

- power-supply: as specified in the base binding



Optional properties:

- backlight: as specified in the base binding

- enable-gpios: as specified in the base binding



This binding is compatible with the simple-panel binding, which is specified

in simple-panel.txt in this directory.

Documentation/devicetree/bindings/display/panel/display-timing.txt

+5 −0
Original line number Diff line number Diff line
@@ -80,6 +80,11 @@ The parameters are defined as: 
  |          |        v                            |          |       |

  +----------+-------------------------------------+----------+-------+



Note: In addition to being used as subnode(s) of display-timings, the timing

      subnode may also be used on its own. This is appropriate if only one mode

      need be conveyed. In this case, the node should be named 'panel-timing'.





Example:



	display-timings {

Documentation/devicetree/bindings/display/panel/koe,tx31d200vm0baa.txt

0 → 100644
+25 −0
Original line number Diff line number Diff line 
Kaohsiung Opto-Electronics. TX31D200VM0BAA 12.3" HSXGA LVDS panel



This binding is compatible with the simple-panel binding, which is specified

in simple-panel.txt in this directory.



Required properties:

- compatible: should be "koe,tx31d200vm0baa"



Optional properties:

- backlight: phandle of the backlight device attached to the panel



Optional nodes:

- Video port for LVDS panel input.



Example:

	panel {

		compatible = "koe,tx31d200vm0baa";

		backlight = <&backlight_lvds>;



		port {

			panel_in: endpoint {

				remote-endpoint = <&lvds0_out>;

			};

		};

	};

Documentation/devicetree/bindings/display/panel/orisetech,otm8009a.txt

+2 −0
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ Required properties: 


Optional properties:

  - reset-gpios: a GPIO spec for the reset pin (active low).

  - power-supply: phandle of the regulator that provides the supply voltage.



Example:

&dsi {
@@ -17,5 +18,6 @@ Example: 
		compatible = "orisetech,otm8009a";

		reg = <0>;

		reset-gpios = <&gpioh 7 GPIO_ACTIVE_LOW>;

		power-supply = <&v1v8>;

	};

};

Documentation/devicetree/bindings/display/panel/raydium,rm68200.txt

0 → 100644
+25 −0
Original line number Diff line number Diff line 
Raydium Semiconductor Corporation RM68200 5.5" 720p MIPI-DSI TFT LCD panel



The Raydium Semiconductor Corporation RM68200 is a 5.5" 720x1280 TFT LCD

panel connected using a MIPI-DSI video interface.



Required properties:

  - compatible: "raydium,rm68200"

  - reg: the virtual channel number of a DSI peripheral



Optional properties:

  - reset-gpios: a GPIO spec for the reset pin (active low).

  - power-supply: phandle of the regulator that provides the supply voltage.

  - backlight: phandle of the backlight device attached to the panel.



Example:

&dsi {

	...

	panel@0 {

		compatible = "raydium,rm68200";

		reg = <0>;

		reset-gpios = <&gpiof 15 GPIO_ACTIVE_LOW>;

		power-supply = <&v1v8>;

		backlight = <&pwm_backlight>;

	};

};