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

Commit 141de1d4 authored by Dave Airlie's avatar Dave Airlie
Browse files

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



drm-misc-next for v5.3:

UAPI Changes:

Cross-subsystem Changes:
- Add devicetree bindings for new panels.
- Convert allwinner's DT bindings to a schema.
- Drop video/hdmi static functions from kernel docs.
- Discard old fence when reserving space in reservation_object_get_fences_rcu.

Core Changes:
- Add missing -ENOMEM handling in edid loading.
- Fix null pointer deref in scheduler.
- Header cleanups, making them self-contained.
- Remove drmP.h inclusion from core.
- Fix make htmldocs warning in scheduler and HDR metadata.
- Fix a few warnings in the uapi header and add a doc section for it.
- Small MST sideband error handling fix.
- Clarify userspace review requirements.
- Clarify implicit/explicit fencing in docs.
- Flush output polling on shutdown.

Driver Changes:
- Small cleanups to stm.
- Add new driver for ST-Ericsson MCDE
- Kconfig fix for meson HDMI.
- Add support for Armadeus ST0700 Adapt panel.
- Add KOE tx14d24vm1bpa panel.
- Update timings for st7701.
- Fix compile error in mcde.
- Big series of tc358767 fixes, and enabling support for IRQ and HPD handling.
- Assorted fixes to sii902x, and implementing HDMI audio support.
- Enable HDR metadata support on amdgpu.
- Assorted fixes to atmel-hlcdc, and add sam9x60 LCD controller support.

Signed-off-by: default avatarDave Airlie <airlied@redhat.com>

From: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/6c43ffa9-11ff-5354-d772-c20fd4d1e3d9@linux.intel.com
parents 91c1ead6 f5b07b04
Loading
Loading
Loading
Loading
+100 −0
Original line number Diff line number Diff line
# SPDX-License-Identifier: GPL-2.0
%YAML 1.2
---
$id: http://devicetree.org/schemas/display/allwinner,sun6i-a31-mipi-dsi.yaml#
$schema: http://devicetree.org/meta-schemas/core.yaml#

title: Allwinner A31 MIPI-DSI Controller Device Tree Bindings

maintainers:
  - Chen-Yu Tsai <wens@csie.org>
  - Maxime Ripard <maxime.ripard@bootlin.com>

properties:
  "#address-cells": true
  "#size-cells": true

  compatible:
    const: allwinner,sun6i-a31-mipi-dsi

  reg:
    maxItems: 1

  interrupts:
    maxItems: 1

  clocks:
    items:
      - description: Bus Clock
      - description: Module Clock

  clock-names:
    items:
      - const: bus
      - const: mod

  resets:
    maxItems: 1

  phys:
    maxItems: 1

  phy-names:
    const: dphy

  port:
    type: object
    description:
      A port node with endpoint definitions as defined in
      Documentation/devicetree/bindings/media/video-interfaces.txt. That
      port should be the input endpoint, usually coming from the
      associated TCON.

patternProperties:
  "^panel@[0-9]+$": true

required:
  - "#address-cells"
  - "#size-cells"
  - compatible
  - reg
  - interrupts
  - clocks
  - clock-names
  - phys
  - phy-names
  - resets
  - port

additionalProperties: false

examples:
  - |
    dsi0: dsi@1ca0000 {
        compatible = "allwinner,sun6i-a31-mipi-dsi";
        reg = <0x01ca0000 0x1000>;
        interrupts = <0 89 4>;
        clocks = <&ccu 23>, <&ccu 96>;
        clock-names = "bus", "mod";
        resets = <&ccu 4>;
        phys = <&dphy0>;
        phy-names = "dphy";
        #address-cells = <1>;
        #size-cells = <0>;

        panel@0 {
                compatible = "bananapi,lhr050h41", "ilitek,ili9881c";
                reg = <0>;
                power-gpios = <&pio 1 7 0>; /* PB07 */
                reset-gpios = <&r_pio 0 5 1>; /* PL05 */
                backlight = <&pwm_bl>;
        };

        port {
            dsi0_in_tcon0: endpoint {
                remote-endpoint = <&tcon0_out_dsi0>;
            };
        };
    };

...
+41 −1
Original line number Diff line number Diff line
@@ -9,6 +9,40 @@ Optional properties:
	  about hotplug events.
	- reset-gpios: OF device-tree gpio specification for RST_N pin.

	HDMI audio properties:
	- #sound-dai-cells: <0> or <1>. <0> if only i2s or spdif pin
	   is wired, <1> if the both are wired. HDMI audio is
	   configured only if this property is found.
	- sil,i2s-data-lanes: Array of up to 4 integers with values of 0-3
	   Each integer indicates which i2s pin is connected to which
	   audio fifo. The first integer selects i2s audio pin for the
	   first audio fifo#0 (HDMI channels 1&2), second for fifo#1
	   (HDMI channels 3&4), and so on. There is 4 fifos and 4 i2s
	   pins (SD0 - SD3). Any i2s pin can be connected to any fifo,
	   but there can be no gaps. E.g. an i2s pin must be mapped to
	   fifo#0 and fifo#1 before mapping a channel to fifo#2. Default
	   value is <0>, describing SD0 pin beiging routed to hdmi audio
	   fifo #0.
	- clocks: phandle and clock specifier for each clock listed in
           the clock-names property
	- clock-names: "mclk"
	   Describes SII902x MCLK input. MCLK is used to produce
	   HDMI audio CTS values. This property is required if
	   "#sound-dai-cells"-property is present. This property follows
	   Documentation/devicetree/bindings/clock/clock-bindings.txt
	   consumer binding.

	If HDMI audio is configured the sii902x device becomes an I2S
	and/or spdif audio codec component (e.g a digital audio sink),
	that can be used in configuring a full audio devices with
	simple-card or audio-graph-card binding. See their binding
	documents on how to describe the way the sii902x device is
	connected to the rest of the audio system:
	Documentation/devicetree/bindings/sound/simple-card.txt
	Documentation/devicetree/bindings/sound/audio-graph-card.txt
	Note: In case of the audio-graph-card binding the used port
	index should be 3.

Optional subnodes:
	- video input: this subnode can contain a video input port node
	  to connect the bridge to a display controller output (See this
@@ -21,6 +55,12 @@ Example:
		compatible = "sil,sii9022";
		reg = <0x39>;
		reset-gpios = <&pioA 1 0>;

		#sound-dai-cells = <0>;
		sil,i2s-data-lanes = < 0 1 2 >;
		clocks = <&mclk>;
		clock-names = "mclk";

		ports {
			#address-cells = <1>;
			#size-cells = <0>;
+1 −0
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ Optional properties:
                   (active high shutdown input)
 - reset-gpios: OF device-tree gpio specification for RSTX pin
                (active low system reset)
 - toshiba,hpd-pin: TC358767 GPIO pin number to which HPD is connected to (0 or 1)
 - ports: the ports node can contain video interface port nodes to connect
   to a DPI/DSI source and to an eDP/DP sink according to [1][2]:
    - port@0: DSI input port
+9 −0
Original line number Diff line number Diff line
Armadeus ST0700 Adapt. A Santek ST0700I5Y-RBSLW 7.0" WVGA (800x480) TFT with
an adapter board.

Required properties:
- compatible: "armadeus,st0700-adapt"
- power-supply: see panel-common.txt

Optional properties:
- backlight: see panel-common.txt
+42 −0
Original line number Diff line number Diff line
Kaohsiung Opto-Electronics Inc. 5.7" QVGA (320 x 240) TFT LCD panel

Required properties:
- compatible: should be "koe,tx14d24vm1bpa"
- backlight: phandle of the backlight device attached to the panel
- power-supply: single regulator to provide the supply voltage

Required nodes:
- port: Parallel port mapping to connect this display

This panel needs single power supply voltage. Its backlight is conntrolled
via PWM signal.

Example:
--------

Example device-tree definition when connected to iMX53 based board

	lcd_panel: lcd-panel {
		compatible = "koe,tx14d24vm1bpa";
		backlight = <&backlight_lcd>;
		power-supply = <&reg_3v3>;

		port {
			lcd_panel_in: endpoint {
				remote-endpoint = <&lcd_display_out>;
			};
		};
	};

Then one needs to extend the dispX node:

	lcd_display: disp1 {

		port@1 {
			reg = <1>;

			lcd_display_out: endpoint {
				remote-endpoint = <&lcd_panel_in>;
			};
		};
	};
Loading