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

Commit 6b25e21f authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'drm-for-v4.9' of git://people.freedesktop.org/~airlied/linux 

Pull drm updates from Dave Airlie:
 "Core:
   - Fence destaging work
   - DRIVER_LEGACY to split off legacy drm drivers
   - drm_mm refactoring
   - Splitting drm_crtc.c into chunks and documenting better
   - Display info fixes
   - rbtree support for prime buffer lookup
   - Simple VGA DAC driver

  Panel:
   - Add Nexus 7 panel
   - More simple panels

  i915:
   - Refactoring GEM naming
   - Refactored vma/active tracking
   - Lockless request lookups
   - Better stolen memory support
   - FBC fixes
   - SKL watermark fixes
   - VGPU improvements
   - dma-buf fencing support
   - Better DP dongle support

  amdgpu:
   - Powerplay for Iceland asics
   - Improved GPU reset support
   - UVD/VEC powergating support for CZ/ST
   - Preinitialised VRAM buffer support
   - Virtual display support
   - Initial SI support
   - GTT rework
   - PCI shutdown callback support
   - HPD IRQ storm fixes

  amdkfd:
   - bugfixes

  tilcdc:
   - Atomic modesetting support

  mediatek:
   - AAL + GAMMA engine support
   - Hook up gamma LUT
   - Temporal dithering support

  imx:
   - Pixel clock from devicetree
   - drm bridge support for LVDS bridges
   - active plane reconfiguration
   - VDIC deinterlacer support
   - Frame synchronisation unit support
   - Color space conversion support

  analogix:
   - PSR support
   - Better panel on/off support

  rockchip:
   - rk3399 vop/crtc support
   - PSR support

  vc4:
   - Interlaced vblank timing
   - 3D rendering CPU overhead reduction
   - HDMI output fixes

  tda998x:
   - HDMI audio ASoC support

  sunxi:
   - Allwinner A33 support
   - better TCON support

  msm:
   - DT binding cleanups
   - Explicit fence-fd support

  sti:
   - remove sti415/416 support

  etnaviv:
   - MMUv2 refactoring
   - GC3000 support

  exynos:
   - Refactoring HDMI DCC/PHY
   - G2D pm regression fix
   - Page fault issues with wait for vblank

  There is no nouveau work in this tree, as Ben didn't get a pull
  request in, and he was fighting moving to atomic and adding mst
  support, so maybe best it waits for a cycle"

* tag 'drm-for-v4.9' of git://people.freedesktop.org/~airlied/linux: (1412 commits)
  drm/crtc: constify drm_crtc_index parameter
  drm/i915: Fix conflict resolution from backmerge of v4.8-rc8 to drm-next
  drm/i915/guc: Unwind GuC workqueue reservation if request construction fails
  drm/i915: Reset the breadcrumbs IRQ more carefully
  drm/i915: Force relocations via cpu if we run out of idle aperture
  drm/i915: Distinguish last emitted request from last submitted request
  drm/i915: Allow DP to work w/o EDID
  drm/i915: Move long hpd handling into the hotplug work
  drm/i915/execlists: Reinitialise context image after GPU hang
  drm/i915: Use correct index for backtracking HUNG semaphores
  drm/i915: Unalias obj->phys_handle and obj->userptr
  drm/i915: Just clear the mmiodebug before a register access
  drm/i915/gen9: only add the planes actually affected by ddb changes
  drm/i915: Allow PCH DPLL sharing regardless of DPLL_SDVO_HIGH_SPEED
  drm/i915/bxt: Fix HDMI DPLL configuration
  drm/i915/gen9: fix the watermark res_blocks value
  drm/i915/gen9: fix plane_blocks_per_line on watermarks calculations
  drm/i915/gen9: minimum scanlines for Y tile is not always 4
  drm/i915/gen9: fix the WaWmMemoryReadLatency implementation
  drm/i915/kbl: KBL also needs to run the SAGV code
  ...
parents a379f71a 69405d3d

Documentation/devicetree/bindings/display/bridge/dumb-vga-dac.txt

0 → 100644
+48 −0
Original line number Diff line number Diff line 
Dumb RGB to VGA DAC bridge

---------------------------



This binding is aimed for dumb RGB to VGA DAC based bridges that do not require

any configuration.



Required properties:



- compatible: Must be "dumb-vga-dac"



Required nodes:



This device has two video ports. Their connections are modelled using the OF

graph bindings specified in Documentation/devicetree/bindings/graph.txt.



- Video port 0 for RGB input

- Video port 1 for VGA output





Example

-------



bridge {

	compatible = "dumb-vga-dac";

	#address-cells = <1>;

	#size-cells = <0>;



	ports {

		#address-cells = <1>;

		#size-cells = <0>;



		port@0 {

			reg = <0>;



			vga_bridge_in: endpoint {

				remote-endpoint = <&tcon0_out_vga>;

			};

		};



		port@1 {

			reg = <1>;



			vga_bridge_out: endpoint {

				remote-endpoint = <&vga_con_in>;

			};

		};

	};

};

Documentation/devicetree/bindings/display/bridge/tda998x.txt

+18 −0
Original line number Diff line number Diff line
@@ -21,8 +21,19 @@ Optional properties: 
  - video-ports: 24 bits value which defines how the video controller

	output is wired to the TDA998x input - default: <0x230145>



  - audio-ports: array of 8-bit values, 2 values per one DAI[1].

	The first value defines the DAI type: TDA998x_SPDIF or TDA998x_I2S[2].

	The second value defines the tda998x AP_ENA reg content when the DAI

	in question is used. The implementation allows one or two DAIs. If two

	DAIs are defined, they must be of different type.



[1] Documentation/sound/alsa/soc/DAI.txt

[2] include/dt-bindings/display/tda998x.h



Example:



#include <dt-bindings/display/tda998x.h>



	tda998x: hdmi-encoder {

		compatible = "nxp,tda998x";

		reg = <0x70>;
@@ -30,4 +41,11 @@ Example: 
		interrupts = <27 2>;		/* falling edge */

		pinctrl-0 = <&pmx_camera>;

		pinctrl-names = "default";

		video-ports = <0x230145>;



		#sound-dai-cells = <2>;

			     /*	DAI-format	AP_ENA reg value */

		audio-ports = <	TDA998x_SPDIF	0x04

				TDA998x_I2S	0x03>;



	};

Documentation/devicetree/bindings/display/msm/hdmi.txt

+4 −5
Original line number Diff line number Diff line
@@ -14,17 +14,16 @@ Required properties: 
- power-domains: Should be <&mmcc MDSS_GDSC>.

- clocks: device clocks

  See ../clocks/clock-bindings.txt for details.

- qcom,hdmi-tx-ddc-clk-gpio: ddc clk pin

- qcom,hdmi-tx-ddc-data-gpio: ddc data pin

- qcom,hdmi-tx-hpd-gpio: hpd pin

- core-vdda-supply: phandle to supply regulator

- hdmi-mux-supply: phandle to mux regulator

- phys: the phandle for the HDMI PHY device

- phy-names: the name of the corresponding PHY device



Optional properties:

- qcom,hdmi-tx-mux-en-gpio: hdmi mux enable pin

- qcom,hdmi-tx-mux-sel-gpio: hdmi mux select pin

- hpd-gpios: hpd pin

- qcom,hdmi-tx-mux-en-gpios: hdmi mux enable pin

- qcom,hdmi-tx-mux-sel-gpios: hdmi mux select pin

- qcom,hdmi-tx-mux-lpm-gpios: hdmi mux lpm pin

- power-domains: reference to the power domain(s), if available.

- pinctrl-names: the pin control state names; should contain "default"

- pinctrl-0: the default pinctrl state (active)

Documentation/devicetree/bindings/display/panel/innolux,g101ice-l01.txt

0 → 100644
+7 −0
Original line number Diff line number Diff line 
Innolux Corporation 10.1" G101ICE-L01 WXGA (1280x800) LVDS panel



Required properties:

- compatible: should be "innolux,g101ice-l01"



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

in simple-panel.txt in this directory.

Documentation/devicetree/bindings/display/panel/jdi,lt070me05000.txt

0 → 100644
+31 −0
Original line number Diff line number Diff line 
JDI model LT070ME05000 1200x1920 7" DSI Panel



Required properties:

- compatible: should be "jdi,lt070me05000"

- vddp-supply: phandle of the regulator that provides the supply voltage

  Power IC supply (3-5V)

- iovcc-supply: phandle of the regulator that provides the supply voltage

  IOVCC , power supply for LCM (1.8V)

- enable-gpios: phandle of gpio for enable line

  LED_EN, LED backlight enable, High active

- reset-gpios: phandle of gpio for reset line

  This should be 8mA, gpio can be configured using mux, pinctrl, pinctrl-names

  XRES, Reset, Low active

- dcdc-en-gpios: phandle of the gpio for power ic line

  Power IC supply enable, High active



Example:



	dsi0: qcom,mdss_dsi@4700000 {

		panel@0 {

			compatible = "jdi,lt070me05000";

			reg = <0>;



			vddp-supply = <&pm8921_l17>;

			iovcc-supply = <&pm8921_lvs7>;



			enable-gpios = <&pm8921_gpio 36 GPIO_ACTIVE_HIGH>;

			reset-gpios = <&tlmm_pinmux 54 GPIO_ACTIVE_LOW>;

			dcdc-en-gpios = <&pm8921_gpio 23 GPIO_ACTIVE_HIGH>;

		};

	};