Commit 93cd6fa6 authored by Daniel Vetter's avatar Daniel Vetter
Browse files

Merge remote-tracking branch 'airlied/drm-next' into drm-intel-next-queued 



Resync, and we need all the fancy new drm_mm stuff to implement more
efficient evict algorithms for softpin.

Signed-off-by: default avatarDaniel Vetter <daniel.vetter@intel.com>
parents ce6612d6 f03ee46b

CREDITS

+4 −4
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ 
			Linus

----------



M: Matt Mackal

N: Matt Mackal

E: mpm@selenic.com

D: SLOB slab allocator
@@ -1910,7 +1910,7 @@ S: Ra'annana, Israel 


N: Andi Kleen

E: andi@firstfloor.org

U: http://www.halobates.de

W: http://www.halobates.de

D: network, x86, NUMA, various hacks

S: Schwalbenstr. 96

S: 85551 Ottobrunn
@@ -2089,8 +2089,8 @@ D: ST Microelectronics SPEAr13xx PCI host bridge driver 
D: Synopsys Designware PCI host bridge driver



N: Gabor Kuti

M: seasons@falcon.sch.bme.hu

M: seasons@makosteszta.sote.hu

E: seasons@falcon.sch.bme.hu

E: seasons@makosteszta.sote.hu

D: Original author of software suspend



N: Jaroslav Kysela

Documentation/ABI/testing/sysfs-devices-system-ibm-rtl

+2 −2
Original line number Diff line number Diff line 
What:           state

What:           /sys/devices/system/ibm_rtl/state

Date:           Sep 2010

KernelVersion:  2.6.37

Contact:        Vernon Mauery <vernux@us.ibm.com>
@@ -10,7 +10,7 @@ Description: The state file allows a means by which to change in and 
Users:          The ibm-prtm userspace daemon uses this interface.





What:           version

What:           /sys/devices/system/ibm_rtl/version

Date:           Sep 2010

KernelVersion:  2.6.37

Contact:        Vernon Mauery <vernux@us.ibm.com>

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

+2 −0
Original line number Diff line number Diff line
@@ -16,6 +16,8 @@ graph bindings specified in Documentation/devicetree/bindings/graph.txt. 
- Video port 0 for RGB input

- Video port 1 for VGA output



Optional properties:

- vdd-supply: Power supply for DAC



Example

-------

Documentation/devicetree/bindings/display/ti/ti,tfp410.txt→Documentation/devicetree/bindings/display/bridge/ti,tfp410.txt

+7 −2
Original line number Diff line number Diff line
@@ -6,10 +6,15 @@ Required properties: 


Optional properties:

- powerdown-gpios: power-down gpio

- reg: I2C address. If and only if present the device node

       should be placed into the i2c controller node where the

       tfp410 i2c is connected to.



Required nodes:

- Video port 0 for DPI input

- Video port 1 for DVI output

- Video port 0 for DPI input [1].

- Video port 1 for DVI output [1].



[1]: Documentation/devicetree/bindings/media/video-interfaces.txt



Example

-------

Documentation/devicetree/bindings/display/tilcdc/tilcdc.txt

+4 −2
Original line number Diff line number Diff line 
Device-Tree bindings for tilcdc DRM driver



Required properties:

 - compatible: value should be "ti,am33xx-tilcdc".

 - compatible: value should be one of the following:

    - "ti,am33xx-tilcdc" for AM335x based boards

    - "ti,da850-tilcdc" for DA850/AM18x/OMAP-L138 based boards

 - interrupts: the interrupt number

 - reg: base address and size of the LCDC device
@@ -51,7 +53,7 @@ Optional nodes: 
Example:



	fb: fb@4830e000 {

		compatible = "ti,am33xx-tilcdc";

		compatible = "ti,am33xx-tilcdc", "ti,da850-tilcdc";

		reg = <0x4830e000 0x1000>;

		interrupt-parent = <&intc>;

		interrupts = <36>;