Skip to content

Commit

Permalink
Merge remote-tracking branch 'airlied/drm-next' into drm-nouveau-next
Browse files Browse the repository at this point in the history
  • Loading branch information
Ben Skeggs committed Jul 8, 2013
2 parents d2989b5 + 7c6ca30 commit 06d5a24
Show file tree
Hide file tree
Showing 339 changed files with 69,952 additions and 7,122 deletions.
2 changes: 2 additions & 0 deletions Documentation/DocBook/device-drivers.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -126,6 +126,8 @@ X!Edrivers/base/interface.c
</sect1>
<sect1><title>Device Drivers DMA Management</title>
!Edrivers/base/dma-buf.c
!Edrivers/base/reservation.c
!Iinclude/linux/reservation.h
!Edrivers/base/dma-coherent.c
!Edrivers/base/dma-mapping.c
</sect1>
Expand Down
271 changes: 219 additions & 52 deletions Documentation/DocBook/drm.tmpl

Large diffs are not rendered by default.

8 changes: 8 additions & 0 deletions Documentation/devicetree/bindings/drm/tilcdc/tilcdc.txt
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,14 @@ Recommended properties:
services interrupts for this device.
- ti,hwmods: Name of the hwmod associated to the LCDC

Optional properties:
- max-bandwidth: The maximum pixels per second that the memory
interface / lcd controller combination can sustain
- max-width: The maximum horizontal pixel width supported by
the lcd controller.
- max-pixelclock: The maximum pixel clock that can be supported
by the lcd controller in KHz.

Example:

fb: fb@4830e000 {
Expand Down
1 change: 1 addition & 0 deletions Documentation/devicetree/bindings/video/display-timing.txt
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ optional properties:
- ignored = ignored
- interlaced (bool): boolean to enable interlaced mode
- doublescan (bool): boolean to enable doublescan mode
- doubleclk (bool): boolean to enable doubleclock mode

All the optional properties that are not bool follow the following logic:
<1>: high active
Expand Down
7 changes: 5 additions & 2 deletions Documentation/devicetree/bindings/video/exynos_hdmi.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
Device-Tree bindings for drm hdmi driver

Required properties:
- compatible: value should be "samsung,exynos5-hdmi".
- compatible: value should be one among the following:
1) "samsung,exynos5-hdmi" <DEPRECATED>
2) "samsung,exynos4210-hdmi"
3) "samsung,exynos4212-hdmi"
- reg: physical base address of the hdmi and length of memory mapped
region.
- interrupts: interrupt number to the cpu.
Expand All @@ -15,7 +18,7 @@ Required properties:
Example:

hdmi {
compatible = "samsung,exynos5-hdmi";
compatible = "samsung,exynos4212-hdmi";
reg = <0x14530000 0x100000>;
interrupts = <0 95 0>;
hpd-gpio = <&gpx3 7 0xf 1 3>;
Expand Down
7 changes: 5 additions & 2 deletions Documentation/devicetree/bindings/video/exynos_hdmiddc.txt
Original file line number Diff line number Diff line change
@@ -1,12 +1,15 @@
Device-Tree bindings for hdmiddc driver

Required properties:
- compatible: value should be "samsung,exynos5-hdmiddc".
- compatible: value should be one of the following
1) "samsung,exynos5-hdmiddc" <DEPRECATED>
2) "samsung,exynos4210-hdmiddc"

- reg: I2C address of the hdmiddc device.

Example:

hdmiddc {
compatible = "samsung,exynos5-hdmiddc";
compatible = "samsung,exynos4210-hdmiddc";
reg = <0x50>;
};
7 changes: 5 additions & 2 deletions Documentation/devicetree/bindings/video/exynos_hdmiphy.txt
Original file line number Diff line number Diff line change
@@ -1,12 +1,15 @@
Device-Tree bindings for hdmiphy driver

Required properties:
- compatible: value should be "samsung,exynos5-hdmiphy".
- compatible: value should be one of the following:
1) "samsung,exynos5-hdmiphy" <DEPRECATED>
2) "samsung,exynos4210-hdmiphy".
3) "samsung,exynos4212-hdmiphy".
- reg: I2C address of the hdmiphy device.

Example:

hdmiphy {
compatible = "samsung,exynos5-hdmiphy";
compatible = "samsung,exynos4210-hdmiphy";
reg = <0x38>;
};
9 changes: 7 additions & 2 deletions Documentation/devicetree/bindings/video/exynos_mixer.txt
Original file line number Diff line number Diff line change
@@ -1,15 +1,20 @@
Device-Tree bindings for mixer driver

Required properties:
- compatible: value should be "samsung,exynos5-mixer".
- compatible: value should be one of the following:
1) "samsung,exynos5-mixer" <DEPRECATED>
2) "samsung,exynos4210-mixer"
3) "samsung,exynos5250-mixer"
4) "samsung,exynos5420-mixer"

- reg: physical base address of the mixer and length of memory mapped
region.
- interrupts: interrupt number to the cpu.

Example:

mixer {
compatible = "samsung,exynos5-mixer";
compatible = "samsung,exynos5250-mixer";
reg = <0x14450000 0x10000>;
interrupts = <0 94 0>;
};
16 changes: 5 additions & 11 deletions Documentation/fb/uvesafb.txt
Original file line number Diff line number Diff line change
Expand Up @@ -81,17 +81,11 @@ pmipal Use the protected mode interface for palette changes.

mtrr:n Setup memory type range registers for the framebuffer
where n:
0 - disabled (equivalent to nomtrr) (default)
1 - uncachable
2 - write-back
3 - write-combining
4 - write-through

If you see the following in dmesg, choose the type that matches
the old one. In this example, use "mtrr:2".
...
mtrr: type mismatch for e0000000,8000000 old: write-back new: write-combining
...
0 - disabled (equivalent to nomtrr)
3 - write-combining (default)

Values other than 0 and 3 will result in a warning and will be
treated just like 3.

nomtrr Do not use memory type range registers.

Expand Down
Loading

0 comments on commit 06d5a24

Please sign in to comment.