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

Commit 906dde0f authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull drm updates from Dave Airlie:
 "This is the main drm pull request for 4.14 merge window.

  I'm sending this early, as my continuing journey into fatherhood is
  occurring really soon now, I'm going to be mostly useless for the next
  couple of weeks, though I may be able to read email, I doubt I'll be
  doing much patch applications or git sending. If anything urgent pops
  up I've asked Daniel/Jani/Alex/Sean to try and direct stuff towards
  you.

  Outside drm changes:

  Some rcar-du updates that touch the V4L tree, all acks should be in
  place. It adds one export to the radix tree code for new i915 use
  case. There are some minor AGP cleanups (don't see that too often).
  Changes to the vbox driver in staging to avoid breaking compilation.

  Summary:

  core:
   - Atomic helper fixes
   - Atomic UAPI fixes
   - Add YCBCR 4:2:0 support
   - Drop set_busid hook
   - Refactor fb_helper locking
   - Remove a bunch of internal APIs
   - Add a bunch of better default handlers
   - Format modifier/blob plane property added
   - More internal header refactoring
   - Make more internal API names consistent
   - Enhanced syncobj APIs (wait/signal/reset/create signalled)

  bridge:
   - Add Synopsys Designware MIPI DSI host bridge driver

  tiny:
   - Add Pervasive Displays RePaper displays
   - Add support for LEGO MINDSTORMS EV3 LCD

  i915:
   - Lots of GEN10/CNL  support patches
   - drm syncobj support
   - Skylake+ watermark refactoring
   - GVT vGPU 48-bit ppgtt support
   - GVT performance improvements
   - NOA change ioctl
   - CCS (color compression) scanout support
   - GPU reset improvements

  amdgpu:
   - Initial hugepage support
   - BO migration logic rework
   - Vega10 improvements
   - Powerplay fixes
   - Stop reprogramming the MC
   - Fixes for ACP audio on stoney
   - SR-IOV fixes/improvements
   - Command submission overhead improvements

  amdkfd:
   - Non-dGPU upstreaming patches
   - Scratch VA ioctl
   - Image tiling modes
   - Update PM4 headers for new firmware
   - Drop all BUG_ONs.

  nouveau:
   - GP108 modesetting support.
   - Disable MSI on big endian.

  vmwgfx:
   - Add fence fd support.

  msm:
   - Runtime PM improvements

  exynos:
   - NV12MT support
   - Refactor KMS drivers

  imx-drm:
   - Lock scanout channel to improve memory bw
   - Cleanups

  etnaviv:
   - GEM object population fixes

  tegra:
   - Prep work for Tegra186 support
   - PRIME mmap support

  sunxi:
   - HDMI support improvements
   - HDMI CEC support

  omapdrm:
   - HDMI hotplug IRQ support
   - Big driver cleanup
   - OMAP5 DSI support

  rcar-du:
   - vblank fixes
   - VSP1 updates

  arcgpu:
   - Minor fixes

  stm:
   - Add STM32 DSI controller driver

  dw_hdmi:
   - Add support for Rockchip RK3399
   - HDMI CEC support

  atmel-hlcdc:
   - Add 8-bit color support

  vc4:
   - Atomic fixes
   - New ioctl to attach a label to a buffer object
   - HDMI CEC support
   - Allow userspace to dictate rendering order on submit ioctl"

* tag 'drm-for-v4.14' of git://people.freedesktop.org/~airlied/linux: (1074 commits)
  drm/syncobj: Add a signal ioctl (v3)
  drm/syncobj: Add a reset ioctl (v3)
  drm/syncobj: Add a syncobj_array_find helper
  drm/syncobj: Allow wait for submit and signal behavior (v5)
  drm/syncobj: Add a CREATE_SIGNALED flag
  drm/syncobj: Add a callback mechanism for replace_fence (v3)
  drm/syncobj: add sync obj wait interface. (v8)
  i915: Use drm_syncobj_fence_get
  drm/syncobj: Add a race-free drm_syncobj_fence_get helper (v2)
  drm/syncobj: Rename fence_get to find_fence
  drm: kirin: Add mode_valid logic to avoid mode clocks we can't generate
  drm/vmwgfx: Bump the version for fence FD support
  drm/vmwgfx: Add export fence to file descriptor support
  drm/vmwgfx: Add support for imported Fence File Descriptor
  drm/vmwgfx: Prepare to support fence fd
  drm/vmwgfx: Fix incorrect command header offset at restart
  drm/vmwgfx: Support the NOP_ERROR command
  drm/vmwgfx: Restart command buffers after errors
  drm/vmwgfx: Move irq bottom half processing to threads
  drm/vmwgfx: Don't use drm_irq_[un]install
  ...
parents 69c0067a 7846b12f

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

0 → 100644
+32 −0
Original line number Diff line number Diff line 
Synopsys DesignWare MIPI DSI host controller

============================================



This document defines device tree properties for the Synopsys DesignWare MIPI

DSI host controller. It doesn't constitue a device tree binding specification

by itself but is meant to be referenced by platform-specific device tree

bindings.



When referenced from platform device tree bindings the properties defined in

this document are defined as follows. The platform device tree bindings are

responsible for defining whether each optional property is used or not.



- reg: Memory mapped base address and length of the DesignWare MIPI DSI

  host controller registers. (mandatory)



- clocks: References to all the clocks specified in the clock-names property

  as specified in [1]. (mandatory)



- clock-names:

  - "pclk" is the peripheral clock for either AHB and APB. (mandatory)

  - "px_clk" is the pixel clock for the DPI/RGB input. (optional)



- resets: References to all the resets specified in the reset-names property

  as specified in [2]. (optional)



- reset-names: string reset name, must be "apb" if used. (optional)



- panel or bridge node: see [3]. (mandatory)



[1] Documentation/devicetree/bindings/clock/clock-bindings.txt

[2] Documentation/devicetree/bindings/reset/reset.txt

[3] Documentation/devicetree/bindings/display/mipi-dsi-bus.txt

Documentation/devicetree/bindings/display/exynos/exynos5433-decon.txt

+0 −12
Original line number Diff line number Diff line
@@ -25,12 +25,6 @@ Required properties: 
	 size-cells must 1 and 0, respectively.

- port: contains an endpoint node which is connected to the endpoint in the mic

	node. The reg value muset be 0.

- i80-if-timings: specify whether the panel which is connected to decon uses

		  i80 lcd interface or mipi video interface. This node contains

		  no timing information as that of fimd does. Because there is

		  no register in decon to specify i80 interface timing value,

		  it is not needed, but make it remain to use same kind of node

		  in fimd and exynos7 decon.



Example:

SoC specific DT entry:
@@ -59,9 +53,3 @@ decon: decon@13800000 { 
		};

	};

};
 


Board specific DT entry:

&decon {

	i80-if-timings {

	};

};

Documentation/devicetree/bindings/display/repaper.txt

0 → 100644
+52 −0
Original line number Diff line number Diff line 
Pervasive Displays RePaper branded e-ink displays



Required properties:

- compatible:		"pervasive,e1144cs021" for 1.44" display

			"pervasive,e1190cs021" for 1.9" display

			"pervasive,e2200cs021" for 2.0" display

			"pervasive,e2271cs021" for 2.7" display



- panel-on-gpios:	Timing controller power control

- discharge-gpios:	Discharge control

- reset-gpios:		RESET pin

- busy-gpios:		BUSY pin



Required property for e2271cs021:

- border-gpios:		Border control



The node for this driver must be a child node of a SPI controller, hence

all mandatory properties described in ../spi/spi-bus.txt must be specified.



Optional property:

- pervasive,thermal-zone:	name of thermometer's thermal zone



Example:



	display_temp: lm75@48 {

		compatible = "lm75b";

		reg = <0x48>;

		#thermal-sensor-cells = <0>;

	};



	thermal-zones {

		display {

			polling-delay-passive = <0>;

			polling-delay = <0>;

			thermal-sensors = <&display_temp>;

		};

	};



	papirus27@0{

		compatible = "pervasive,e2271cs021";

		reg = <0>;



		spi-max-frequency = <8000000>;



		panel-on-gpios = <&gpio 23 0>;

		border-gpios = <&gpio 14 0>;

		discharge-gpios = <&gpio 15 0>;

		reset-gpios = <&gpio 24 0>;

		busy-gpios = <&gpio 25 0>;



		pervasive,thermal-zone = "display";

	};

Documentation/devicetree/bindings/display/rockchip/dw_hdmi-rockchip.txt

+5 −2
Original line number Diff line number Diff line
@@ -11,7 +11,9 @@ following device-specific properties. 


Required properties:



- compatible: Shall contain "rockchip,rk3288-dw-hdmi".

- compatible: should be one of the following:

		"rockchip,rk3288-dw-hdmi"

		"rockchip,rk3399-dw-hdmi"

- reg: See dw_hdmi.txt.

- reg-io-width: See dw_hdmi.txt. Shall be 4.

- interrupts: HDMI interrupt number
@@ -30,7 +32,8 @@ Optional properties 
  I2C master controller.

- clock-names: See dw_hdmi.txt. The "cec" clock is optional.

- clock-names: May contain "cec" as defined in dw_hdmi.txt.



- clock-names: May contain "grf", power for grf io.

- clock-names: May contain "vpll", external clock for some hdmi phy.



Example:

Documentation/devicetree/bindings/display/rockchip/rockchip-vop.txt

+4 −0
Original line number Diff line number Diff line
@@ -8,8 +8,12 @@ Required properties: 
- compatible: value should be one of the following

		"rockchip,rk3036-vop";

		"rockchip,rk3288-vop";

		"rockchip,rk3368-vop";

		"rockchip,rk3366-vop";

		"rockchip,rk3399-vop-big";

		"rockchip,rk3399-vop-lit";

		"rockchip,rk3228-vop";

		"rockchip,rk3328-vop";



- interrupts: should contain a list of all VOP IP block interrupts in the

		 order: VSYNC, LCD_SYSTEM. The interrupt specifier