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

Commit e9f37d3a authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux 

Pull drm updates from Dave Airlie:
 "Highlights:

   - drm:

     Generic display port aux features, primary plane support, drm
     master management fixes, logging cleanups, enforced locking checks
     (instead of docs), documentation improvements, minor number
     handling cleanup, pseudofs for shared inodes.

   - ttm:

     add ability to allocate from both ends

   - i915:

     broadwell features, power domain and runtime pm, per-process
     address space infrastructure (not enabled)

   - msm:

     power management, hdmi audio support

   - nouveau:

     ongoing GPU fault recovery, initial maxwell support, random fixes

   - exynos:

     refactored driver to clean up a lot of abstraction, DP support
     moved into drm, LVDS bridge support added, parallel panel support

   - gma500:

     SGX MMU support, SGX irq handling, asle irq work fixes

   - radeon:

     video engine bringup, ring handling fixes, use dp aux helpers

   - vmwgfx:

     add rendernode support"

* 'drm-next' of git://people.freedesktop.org/~airlied/linux: (849 commits)
  DRM: armada: fix corruption while loading cursors
  drm/dp_helper: don't return EPROTO for defers (v2)
  drm/bridge: export ptn3460_init function
  drm/exynos: remove MODULE_DEVICE_TABLE definitions
  ARM: dts: exynos4412-trats2: enable exynos/fimd node
  ARM: dts: exynos4210-trats: enable exynos/fimd node
  ARM: dts: exynos4412-trats2: add panel node
  ARM: dts: exynos4210-trats: add panel node
  ARM: dts: exynos4: add MIPI DSI Master node
  drm/panel: add S6E8AA0 driver
  ARM: dts: exynos4210-universal_c210: add proper panel node
  drm/panel: add ld9040 driver
  panel/ld9040: add DT bindings
  panel/s6e8aa0: add DT bindings
  drm/exynos: add DSIM driver
  exynos/dsim: add DT bindings
  drm/exynos: disallow fbdev initialization if no device is connected
  drm/mipi_dsi: create dsi devices only for nodes with reg property
  drm/mipi_dsi: add flags to DSI messages
  Skip intel_crt_init for Dell XPS 8700
  ...
parents 5fb6b953 c39b0695

Documentation/DocBook/drm.tmpl

+369 −181

File changed.

Preview size limit exceeded, changes collapsed.

Documentation/devicetree/bindings/drm/bridge/ptn3460.txt

0 → 100644
+27 −0
Original line number Diff line number Diff line 
ptn3460 bridge bindings



Required properties:

	- compatible: "nxp,ptn3460"

	- reg: i2c address of the bridge

	- powerdown-gpio: OF device-tree gpio specification

	- reset-gpio: OF device-tree gpio specification

	- edid-emulation: The EDID emulation entry to use

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

		| Value | Resolution | Description      |

		|   0   |  1024x768  | NXP Generic      |

		|   1   |  1920x1080 | NXP Generic      |

		|   2   |  1920x1080 | NXP Generic      |

		|   3   |  1600x900  | Samsung LTM200KT |

		|   4   |  1920x1080 | Samsung LTM230HT |

		|   5   |  1366x768  | NXP Generic      |

		|   6   |  1600x900  | ChiMei M215HGE   |

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



Example:

	lvds-bridge@20 {

		compatible = "nxp,ptn3460";

		reg = <0x20>;

		powerdown-gpio = <&gpy2 5 1 0 0>;

		reset-gpio = <&gpx1 5 1 0 0>;

		edid-emulation = <5>;

	};

Documentation/devicetree/bindings/drm/i2c/tda998x.txt

0 → 100644
+27 −0
Original line number Diff line number Diff line 
Device-Tree bindings for the NXP TDA998x HDMI transmitter



Required properties;

  - compatible: must be "nxp,tda998x"



Optional properties:

  - interrupts: interrupt number and trigger type

	default: polling



  - pinctrl-0: pin control group to be used for

	screen plug/unplug interrupt.



  - pinctrl-names: must contain a "default" entry.



  - video-ports: 24 bits value which defines how the video controller

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



Example:



	tda998x: hdmi-encoder {

		compatible = "nxp,tda998x";

		reg = <0x70>;

		interrupt-parent = <&gpio0>;

		interrupts = <27 2>;		/* falling edge */

		pinctrl-0 = <&pmx_camera>;

		pinctrl-names = "default";

	};

Documentation/devicetree/bindings/gpu/nvidia,tegra20-host1x.txt

+42 −0
Original line number Diff line number Diff line
@@ -190,6 +190,48 @@ of the following host1x client modules: 
  - nvidia,edid: supplies a binary EDID blob

  - nvidia,panel: phandle of a display panel



- sor: serial output resource



  Required properties:

  - compatible: "nvidia,tegra124-sor"

  - reg: Physical base address and length of the controller's registers.

  - interrupts: The interrupt outputs from the controller.

  - clocks: Must contain an entry for each entry in clock-names.

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

  - clock-names: Must include the following entries:

    - sor: clock input for the SOR hardware

    - parent: input for the pixel clock

    - dp: reference clock for the SOR clock

    - safe: safe reference for the SOR clock during power up

  - resets: Must contain an entry for each entry in reset-names.

    See ../reset/reset.txt for details.

  - reset-names: Must include the following entries:

    - sor



  Optional properties:

  - nvidia,ddc-i2c-bus: phandle of an I2C controller used for DDC EDID probing

  - nvidia,hpd-gpio: specifies a GPIO used for hotplug detection

  - nvidia,edid: supplies a binary EDID blob

  - nvidia,panel: phandle of a display panel



  Optional properties when driving an eDP output:

  - nvidia,dpaux: phandle to a DispayPort AUX interface



- dpaux: DisplayPort AUX interface

  - compatible: "nvidia,tegra124-dpaux"

  - reg: Physical base address and length of the controller's registers.

  - interrupts: The interrupt outputs from the controller.

  - clocks: Must contain an entry for each entry in clock-names.

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

  - clock-names: Must include the following entries:

    - dpaux: clock input for the DPAUX hardware

    - parent: reference clock

  - resets: Must contain an entry for each entry in reset-names.

    See ../reset/reset.txt for details.

  - reset-names: Must include the following entries:

    - dpaux

  - vdd-supply: phandle of a supply that powers the DisplayPort link



Example:



/ {

Documentation/devicetree/bindings/panel/lg,ld070wx3-sl01.txt

0 → 100644
+7 −0
Original line number Diff line number Diff line 
LG Corporation 7" WXGA TFT LCD panel



Required properties:

- compatible: should be "lg,ld070wx3-sl01"



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

in simple-panel.txt in this directory.