Commit 29baa82a authored by Dave Airlie's avatar Dave Airlie
Browse files

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

UAPI Changes:

Cross-subsystem Changes:

Core Changes:
- DP SDP defines (Ville)
- polish for scdc helpers (Thierry Reding)
- fix lifetimes for connector/plane state across crtc changes (Maarten
  Lankhorst).
- sparse fixes (Ville+Thierry)
- make legacy kms ioctls all interruptible (Maarten)
- push edid override into the edid helpers (out of probe helpers)
  (Jani)
- DP ESI defines for link status (DK)

Driver Changes:
- drm-panel is now in drm-misc!
- minor panel-simple cleanups/refactoring by various folks
- drm_bridge_add cleanup (Inki Dae)
- constify a few i2c_device_id structs (Arvind Yadav)
- More patches from Noralf's fb/gem helper cleanup
- bridge/synopsis: reset fix (Philippe Cornu)
- fix tracepoint include handling in drivers (Thierry)
- rockchip: lvds support (Sandy Huang)
- move sun4i into drm-misc fold (Maxime Ripard)
- sun4i: refactor driver load + support TCON backend/layer muxing
  (Chen-Yu Tsai)
- pl111: support more pl11x variants (Linus Walleij)
- bridge/adv7511: robustify probing/edid handling (Lars-Petersen
  Clausen)

New hw support:
- S6E63J0X03 panel (Hoegeun Kwon)
- OTM8009A panel (Philippe CORNU)
- Seiko 43WVF1G panel (Marco Franchi)
- tve200 driver (Linus Walleij)

Plus assorted of tiny patches all over, including our first outreachy
patches from applicants for the winter round!

* tag 'drm-misc-next-2017-09-20' of git://anongit.freedesktop.org/git/drm-misc: (101 commits)
  drm: add backwards compatibility support for drm_kms_helper.edid_firmware
  drm: handle override and firmware EDID at drm_do_get_edid() level
  drm/dp: DPCD register defines for link status within ESI field
  drm/rockchip: Replace dev_* with DRM_DEV_*
  drm/tinydrm: Drop driver registered message
  drm/gem-fb-helper: Use debug message on gem lookup failure
  drm/imx: Use drm_gem_fb_create() and drm_gem_fb_prepare_fb()
  drm/bridge: adv7511: Constify HDMI CODEC platform data
  drm/bridge: adv7511: Enable connector polling when no interrupt is specified
  drm/bridge: adv7511: Remove private copy of the EDID
  drm/bridge: adv7511: Properly update EDID when no EDID was found
  drm/crtc: Convert setcrtc ioctl locking to interruptible.
  drm/atomic: Convert pageflip ioctl locking to interruptible.
  drm/legacy: Convert setplane ioctl locking to interruptible.
  drm/legacy: Convert cursor ioctl locking to interruptible.
  drm/atomic: Convert atomic ioctl locking to interruptible.
  drm/atomic: Prepare drm_modeset_lock infrastructure for interruptible waiting, v2.
  drm/tve200: Clean up panel bridging
  drm/doc: Update todo.rst
  drm/dp/mst: Sideband message transaction to power up/down nodes
  ...
parents e19b205b ac6c35a4

Documentation/admin-guide/kernel-parameters.txt

+1 −1
Original line number Original line Diff line number Diff line
@@ -854,7 +854,7 @@ 
			The filter can be disabled or changed to another

			The filter can be disabled or changed to another

			driver later using sysfs.

			driver later using sysfs.





	drm_kms_helper.edid_firmware=[<connector>:]<file>[,[<connector>:]<file>]

	drm.edid_firmware=[<connector>:]<file>[,[<connector>:]<file>]

			Broken monitors, graphic adapters, KVMs and EDIDless

			Broken monitors, graphic adapters, KVMs and EDIDless

			panels may send no or incorrect EDID data sets.

			panels may send no or incorrect EDID data sets.

			This parameter allows to specify an EDID data sets

			This parameter allows to specify an EDID data sets

Documentation/devicetree/bindings/display/faraday,tve200.txt

0 → 100644
+54 −0
Original line number Original line Diff line number Diff line 
* Faraday TV Encoder TVE200



Required properties:



- compatible: must be one of:

	"faraday,tve200"

	"cortina,gemini-tvc", "faraday,tve200"



- reg: base address and size of the control registers block



- interrupts: contains an interrupt specifier for the interrupt

	line from the TVE200



- clock-names: should contain "PCLK" for the clock line clocking the

	silicon and "TVE" for the 27MHz clock to the video driver



- clocks: contains phandle and clock specifier pairs for the entries

	in the clock-names property. See

	Documentation/devicetree/bindings/clock/clock-bindings.txt



Optional properties:



- resets: contains the reset line phandle for the block



Required sub-nodes:



- port: describes LCD panel signals, following the common binding

	for video transmitter interfaces; see

	Documentation/devicetree/bindings/media/video-interfaces.txt

	This port should have the properties:

	reg = <0>;

	It should have one endpoint connected to a remote endpoint where

	the display is connected.



Example:



display-controller@6a000000 {

	#address-cells = <1>;

	#size-cells = <0>;

	compatible = "faraday,tve200";

	reg = <0x6a000000 0x1000>;

	interrupts = <13 IRQ_TYPE_EDGE_RISING>;

	resets = <&syscon GEMINI_RESET_TVC>;

	clocks = <&syscon GEMINI_CLK_GATE_TVC>,

		 <&syscon GEMINI_CLK_TVC>;

	clock-names = "PCLK", "TVE";



	port@0 {

		reg = <0>;

		display_out: endpoint {

			remote-endpoint = <&panel_in>;

		};

	};

};

Documentation/devicetree/bindings/display/panel/orisetech,otm8009a.txt

0 → 100644
+21 −0
Original line number Original line Diff line number Diff line 
Orise Tech OTM8009A 3.97" 480x800 TFT LCD panel (MIPI-DSI video mode)



The Orise Tech OTM8009A is a 3.97" 480x800 TFT LCD panel connected using

a MIPI-DSI video interface. Its backlight is managed through the DSI link.



Required properties:

  - compatible: "orisetech,otm8009a"

  - reg: the virtual channel number of a DSI peripheral



Optional properties:

  - reset-gpios: a GPIO spec for the reset pin (active low).



Example:

&dsi {

	...

	panel@0 {

		compatible = "orisetech,otm8009a";

		reg = <0>;

		reset-gpios = <&gpioh 7 GPIO_ACTIVE_LOW>;

	};

};

Documentation/devicetree/bindings/display/panel/samsung,s6e63j0x03.txt

0 → 100644
+24 −0
Original line number Original line Diff line number Diff line 
Samsung S6E63J0X03 1.63" 320x320 AMOLED panel (interface: MIPI-DSI command mode)



Required properties:

  - compatible: "samsung,s6e63j0x03"

  - reg: the virtual channel number of a DSI peripheral

  - vdd3-supply: I/O voltage supply

  - vci-supply: voltage supply for analog circuits

  - reset-gpios: a GPIO spec for the reset pin (active low)

  - te-gpios: a GPIO spec for the tearing effect synchronization signal

    gpio pin (active high)



Example:

&dsi {

	...



	panel@0 {

		compatible = "samsung,s6e63j0x03";

		reg = <0>;

		vdd3-supply = <&ldo16_reg>;

		vci-supply = <&ldo20_reg>;

		reset-gpios = <&gpe0 1 GPIO_ACTIVE_LOW>;

		te-gpios = <&gpx0 6 GPIO_ACTIVE_HIGH>;

	};

};

Documentation/devicetree/bindings/display/panel/seiko,43wvf1g.txt

0 → 100644
+23 −0
Original line number Original line Diff line number Diff line 
Seiko Instruments Inc. 4.3" WVGA (800 x RGB x 480) TFT with Touch-Panel



Required properties:

- compatible: should be "sii,43wvf1g".

- "dvdd-supply": 3v3 digital regulator.

- "avdd-supply": 5v analog regulator.



Optional properties:

- backlight: phandle for the backlight control.



Example:



	panel {

		compatible = "sii,43wvf1g";

		backlight = <&backlight_display>;

		dvdd-supply = <&reg_lcd_3v3>;

		avdd-supply = <&reg_lcd_5v>;

		port {

			panel_in: endpoint {

				remote-endpoint = <&display_out>;

			};

		};

	};