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

Commit 542aefb5 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'drm-misc-next-2017-07-26' of git://anongit.freedesktop.org/git/drm-misc into drm-next 

drm-misc-next-2017-07-18:
Core Changes:
- A couple fixes to only opening crc when needed (Maarten)
- Change atomic helper swap_state to be interruptible (Maarten)
- fb_helper: Support waiting for an output before setting up (Daniel)
- Allow drivers supporting runtime_pm to use helper_commit_tail (Maxime)

Driver Changes:
- misc: Use %pOF to print device node names (Rob)
- Miscellaneous fixes

drm-misc-next-2017-07-18:
UAPI Changes:
- Fail commits which request an event without including a crtc (Andrey)

Core Changes:
- Add YCBCR 4:2:0 support (Shashank)
- s/drm_atomic_replace_property_blob/drm_property_replace_blob/ (Peter)
- Add proper base class for private objs instead of using void* (Ville)
- Remove pending_read/write_domains from drm_gem_object (Chris)
- Add async plane update support (ie: cursor) to atomic helpers (Gustavo)
- Add old state to .enable and rename to .atomic_enable (Laurent)
- Add drm_atomic_helper_wait_for_flip_done() (Boris)
- Remove drm_driver->set_busid hook (Daniel)
- Migrate vblank documentation into the source files (Daniel)
- Add fb_helper->lock instead of abusing modeset lock (Thierry/Daniel)

Driver Changes:
- stm: Add STM32 DSI controller driver (Phillipe)
- amdgpu: Numerous small/misc fixes
- bridge: Add Synopsys Designware MIPI DSI host bridge driver (Phillipe)
- tinydrm: Add support for Pervasive Displays RePaper displays (Noralf)
- misc: Replace for_each_[obj]_in_state to prep for removal (Maarten)
- misc: Use .atomic_disable for atomic drivers (Laurent)
- vgem: Pin pages when mapped/exported (Chris)
- dw_hdmi: Add support for Rockchip RK3399 (Mark)
- atmel-hlcdc: Add 8-bit color look-up table format (Peter)
- vc4: Send vblank event when disabling a crtc (Boris)
- vc4: Use atomic helpers for fence waits (Eric)
- misc: drop drm_vblank_cleanup cargo-cult (Daniel)

Cc: Daniel Vetter <daniel.vetter@intel.com>
Cc: Boris Brezillon <boris.brezillon@free-electrons.com>
Cc: Eric Anholt <eric@anholt.net>
Cc: Peter Rosin <peda@axentia.se>
Cc: Mark Yao <mark.yao@rock-chips.com>
Cc: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Andrey Grodzovsky <Andrey.Grodzovsky@amd.com>
Cc: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Cc: Gustavo Padovan <gustavo.padovan@collabora.com>
Cc: Thierry Reding <treding@nvidia.com>
Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
Cc: Peter Rosin <peda@axentia.se>
Cc: Shashank Sharma <shashank.sharma@intel.com>
Cc: Philippe CORNU <philippe.cornu@st.com>
Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Cc: Rob Herring <robh@kernel.org>
Cc: Maxime Ripard <maxime.ripard@free-electrons.com>

* tag 'drm-misc-next-2017-07-26' of git://anongit.freedesktop.org/git/drm-misc: (171 commits)
  drm/hisilicon: fix build error without fbdev emulation
  drm/atomic: implement drm_atomic_helper_commit_tail for runtime_pm users
  drm: Improve kerneldoc for drm_modeset_lock
  drm/hisilicon: Remove custom FB helper deferred setup
  drm/exynos: Remove custom FB helper deferred setup
  drm/fb-helper: Support deferred setup
  dma-fence: Don't BUG_ON when not absolutely needed
  drm: Convert to using %pOF instead of full_name
  drm/syncobj: Fix kerneldoc
  drm/atomic: Allow drm_atomic_helper_swap_state to fail
  drm/atomic: Add __must_check to drm_atomic_helper_swap_state.
  drm/vc4: Handle drm_atomic_helper_swap_state failure
  drm/tilcdc: Handle drm_atomic_helper_swap_state failure
  drm/tegra: Handle drm_atomic_helper_swap_state failure
  drm/msm: Handle drm_atomic_helper_swap_state failure
  drm/mediatek: Handle drm_atomic_helper_swap_state failure
  drm/i915: Handle drm_atomic_helper_swap_state failure
  drm/atmel-hlcdc: Handle drm_atomic_helper_swap_state failure
  drm/nouveau: Handle drm_atomic_helper_swap_state failure
  drm/atomic: Change drm_atomic_helper_swap_state to return an error.
  ...
parents 2d62c799 8bb97773

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/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/vendor-prefixes.txt

+1 −0
Original line number Diff line number Diff line
@@ -249,6 +249,7 @@ oxsemi Oxford Semiconductor, Ltd. 
panasonic	Panasonic Corporation

parade	Parade Technologies Inc.

pericom	Pericom Technology Inc.

pervasive	Pervasive Displays, Inc.

phytec	PHYTEC Messtechnik GmbH

picochip	Picochip Ltd

pine64	Pine64

Documentation/gpu/drm-internals.rst

+2 −0
Original line number Diff line number Diff line
@@ -201,6 +201,8 @@ drivers. 
Open/Close, File Operations and IOCTLs

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



.. _drm_driver_fops:



File Operations

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