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

Commit 14d2bd53 authored Apr 05, 2019 by Dave Airlie

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



drm-misc-next for 5.2:

UAPI Changes:
-syncobj: Add TIMELINE_WAIT|QUERY|TRANSFER|TIMELINE_SIGNAL ioctls (Chunming)
-Clarify that 1.0 can be represented by drm_color_lut (Daniel)

Cross-subsystem Changes:
-dt-bindings: Add binding for rk3066 hdmi (Johan)
-dt-bindings: Add binding for Feiyang FY07024DI26A30-D panel (Jagan)
-dt-bindings: Add Rocktech vendor prefix and jh057n00900 panel bindings (Guido)
-MAINTAINERS: Add lima and ASPEED entries (Joel & Qiang)

Core Changes:
-memory: use dma_alloc_coherent when mem encryption is active (Christian)
-dma_buf: add support for a dma_fence chain (Christian)
-shmem_gem: fix off-by-one bug in new shmem gem helpers (Dan)

Driver Changes:
-rockchip: Add support for rk3066 hdmi (Johan)
-ASPEED: Add driver supporting ASPEED BMC display controller to drm (Joel)
-lima: Add driver supporting Arm Mali4xx gpus to drm (Qiang)
-vc4/v3d: Various cleanups and improved error handling (Eric)
-panel: Add support for Feiyang FY07024DI26A30-D MIPI-DSI panel (Jagan)
-panel: Add support for Rocktech jh057n00900 MIPI-DSI panel (Guido)

Cc: Johan Jonker <jbx6244@gmail.com>
Cc: Christian König <christian.koenig@amd.com>
Cc: Chunming Zhou <david1.zhou@amd.com>
Cc: Dan Carpenter <dan.carpenter@oracle.com>
Cc: Eric Anholt <eric@anholt.net>
Cc: Qiang Yu <yuq825@gmail.com>
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
Cc: Jagan Teki <jagan@amarulasolutions.com>
Cc: Guido Günther <agx@sigxcpu.org>
Cc: Joel Stanley <joel@jms.id.au>
[airlied: fixed XA limit build breakage, Rodrigo also submitted the same patch, but
I squashed it in the merge.]
Signed-off-by: Dave Airlie <airlied@redhat.com>

From: Sean Paul <sean@poorly.run>
Link: https://patchwork.freedesktop.org/patch/msgid/20190404201016.GA139524@art_vandelay

parents 5ebffda2 f15a3ea8

Documentation/devicetree/bindings/display/panel/feiyang,fy07024di26a30d.txt

0 → 100644

+20 −0

Original line number	Diff line number	Diff line
		Feiyang FY07024DI26A30-D 7" MIPI-DSI LCD Panel

		Required properties:
		- compatible: must be "feiyang,fy07024di26a30d"
		- reg: DSI virtual channel used by that screen
		- avdd-supply: analog regulator dc1 switch
		- dvdd-supply: 3v3 digital regulator
		- reset-gpios: a GPIO phandle for the reset pin

		Optional properties:
		- backlight: phandle for the backlight control.

		panel@0 {
		compatible = "feiyang,fy07024di26a30d";
		reg = <0>;
		avdd-supply = <&reg_dc1sw>;
		dvdd-supply = <&reg_dldo2>;
		reset-gpios = <&pio 3 24 GPIO_ACTIVE_HIGH>; /* LCD-RST: PD24 */
		backlight = <&backlight>;
		};

Documentation/devicetree/bindings/display/panel/innolux,p079zca.txt

+1 −1

Original line number	Diff line number	Diff line
		@@ -12,7 +12,7 @@ Optional properties:
		Example:

		&mipi_dsi {
		panel {
		panel@0 {
		compatible = "innolux,p079zca";
		reg = <0>;
		power-supply = <...>;

Documentation/devicetree/bindings/display/panel/innolux,p097pfg.txt

+1 −1

Original line number	Diff line number	Diff line
		@@ -13,7 +13,7 @@ Optional properties:
		Example:

		&mipi_dsi {
		panel {
		panel@0 {
		compatible = "innolux,p079zca";
		reg = <0>;
		avdd-supply = <...>;

Documentation/devicetree/bindings/display/panel/kingdisplay,kd097d04.txt

+1 −1

Original line number	Diff line number	Diff line
		@@ -12,7 +12,7 @@ Optional properties:
		Example:

		&mipi_dsi {
		panel {
		panel@0 {
		compatible = "kingdisplay,kd097d04";
		reg = <0>;
		power-supply = <...>;

Documentation/devicetree/bindings/display/panel/rocktech,jh057n00900.txt

0 → 100644

+18 −0

Original line number	Diff line number	Diff line
		Rocktech jh057n00900 5.5" 720x1440 TFT LCD panel

		Required properties:
		- compatible: should be "rocktech,jh057n00900"
		- reg: DSI virtual channel of the peripheral
		- reset-gpios: panel reset gpio
		- backlight: phandle of the backlight device attached to the panel

		Example:

		&mipi_dsi {
		panel@0 {
		compatible = "rocktech,jh057n00900";
		reg = <0>;
		backlight = <&backlight>;
		reset-gpios = <&gpio3 13 GPIO_ACTIVE_LOW>;
		};
		};