Documentation/drm: Describing aspect ratio property

[deliverable/linux.git] / Documentation / DocBook / drm.tmpl

diff --git a/Documentation/DocBook/drm.tmpl b/Documentation/DocBook/drm.tmpl
index 7df3134ebc0e1d4b88985132eda82f26b267f4f3..f5d1b180b83163785708ac8ac5ec2e27c130102f 100644 (file)
--- a/Documentation/DocBook/drm.tmpl
+++ b/Documentation/DocBook/drm.tmpl
@@ -2502,7 +2502,7 @@ void intel_crt_init(struct drm_device *dev)
        <td valign="top" >Description/Restrictions</td>
        </tr>
        <tr>
-       <td rowspan="20" valign="top" >DRM</td>
+       <td rowspan="21" valign="top" >DRM</td>
        <td rowspan="2" valign="top" >Generic</td>
        <td valign="top" >“EDID”</td>
        <td valign="top" >BLOB | IMMUTABLE</td>
@@ -2633,7 +2633,7 @@ void intel_crt_init(struct drm_device *dev)
        <td valign="top" >TBD</td>
        </tr>
        <tr>
-       <td rowspan="2" valign="top" >Optional</td>
+       <td rowspan="3" valign="top" >Optional</td>
        <td valign="top" >“scaling mode”</td>
        <td valign="top" >ENUM</td>
        <td valign="top" >{ "None", "Full", "Center", "Full aspect" }</td>
@@ -2641,6 +2641,15 @@ void intel_crt_init(struct drm_device *dev)
        <td valign="top" >TBD</td>
        </tr>
        <tr>
+       <td valign="top" >"aspect ratio"</td>
+       <td valign="top" >ENUM</td>
+       <td valign="top" >{ "None", "4:3", "16:9" }</td>
+       <td valign="top" >Connector</td>
+       <td valign="top" >DRM property to set aspect ratio from user space app.
+               This enum is made generic to allow addition of custom aspect
+               ratios.</td>
+       </tr>
+       <tr>
        <td valign="top" >“dirty”</td>
        <td valign="top" >ENUM | IMMUTABLE</td>
        <td valign="top" >{ "Off", "On", "Annotate" }</td>
@@ -2649,7 +2658,7 @@ void intel_crt_init(struct drm_device *dev)
        </tr>
        <tr>
        <td rowspan="21" valign="top" >i915</td>
-       <td rowspan="3" valign="top" >Generic</td>
+       <td rowspan="2" valign="top" >Generic</td>
        <td valign="top" >"Broadcast RGB"</td>
        <td valign="top" >ENUM</td>
        <td valign="top" >{ "Automatic", "Full", "Limited 16:235" }</td>
@@ -2664,10 +2673,11 @@ void intel_crt_init(struct drm_device *dev)
        <td valign="top" >TBD</td>
        </tr>
        <tr>
-       <td valign="top" >Standard name as in DRM</td>
-       <td valign="top" >Standard type as in DRM</td>
-       <td valign="top" >Standard value as in DRM</td>
-       <td valign="top" >Standard Object as in DRM</td>
+       <td rowspan="1" valign="top" >Plane</td>
+       <td valign="top" >“rotation”</td>
+       <td valign="top" >BITMASK</td>
+       <td valign="top" >{ 0, "rotate-0" }, { 2, "rotate-180" }</td>
+       <td valign="top" >Plane</td>
        <td valign="top" >TBD</td>
        </tr>
        <tr>
@@ -2799,8 +2809,8 @@ void intel_crt_init(struct drm_device *dev)
        <td valign="top" >TBD</td>
        </tr>
        <tr>
-       <td rowspan="3" valign="top" >CDV gma-500</td>
-       <td rowspan="3" valign="top" >Generic</td>
+       <td rowspan="2" valign="top" >CDV gma-500</td>
+       <td rowspan="2" valign="top" >Generic</td>
        <td valign="top" >"Broadcast RGB"</td>
        <td valign="top" >ENUM</td>
        <td valign="top" >{ “Full”, “Limited 16:235” }</td>
@@ -2815,15 +2825,8 @@ void intel_crt_init(struct drm_device *dev)
        <td valign="top" >TBD</td>
        </tr>
        <tr>
-       <td valign="top" >Standard name as in DRM</td>
-       <td valign="top" >Standard type as in DRM</td>
-       <td valign="top" >Standard value as in DRM</td>
-       <td valign="top" >Standard Object as in DRM</td>
-       <td valign="top" >TBD</td>
-       </tr>
-       <tr>
-       <td rowspan="20" valign="top" >Poulsbo</td>
-       <td rowspan="2" valign="top" >Generic</td>
+       <td rowspan="19" valign="top" >Poulsbo</td>
+       <td rowspan="1" valign="top" >Generic</td>
        <td valign="top" >“backlight”</td>
        <td valign="top" >RANGE</td>
        <td valign="top" >Min=0, Max=100</td>
@@ -2831,13 +2834,6 @@ void intel_crt_init(struct drm_device *dev)
        <td valign="top" >TBD</td>
        </tr>
        <tr>
-       <td valign="top" >Standard name as in DRM</td>
-       <td valign="top" >Standard type as in DRM</td>
-       <td valign="top" >Standard value as in DRM</td>
-       <td valign="top" >Standard Object as in DRM</td>
-       <td valign="top" >TBD</td>
-       </tr>
-       <tr>
        <td rowspan="17" valign="top" >SDVO-TV</td>
        <td valign="top" >“mode”</td>
        <td valign="top" >ENUM</td>
@@ -3064,7 +3060,7 @@ void intel_crt_init(struct drm_device *dev)
        <td valign="top" >TBD</td>
        </tr>
        <tr>
-       <td rowspan="3" valign="top" >i2c/ch7006_drv</td>
+       <td rowspan="2" valign="top" >i2c/ch7006_drv</td>
        <td valign="top" >Generic</td>
        <td valign="top" >“scale”</td>
        <td valign="top" >RANGE</td>
@@ -3073,14 +3069,7 @@ void intel_crt_init(struct drm_device *dev)
        <td valign="top" >TBD</td>
        </tr>
        <tr>
-       <td rowspan="2" valign="top" >TV</td>
-       <td valign="top" >Standard names as in DRM</td>
-       <td valign="top" >Standard types as in DRM</td>
-       <td valign="top" >Standard Values as in DRM</td>
-       <td valign="top" >Standard object as in DRM</td>
-       <td valign="top" >TBD</td>
-       </tr>
-       <tr>
+       <td rowspan="1" valign="top" >TV</td>
        <td valign="top" >“mode”</td>
        <td valign="top" >ENUM</td>
        <td valign="top" >{ "PAL", "PAL-M","PAL-N"}, ”PAL-Nc"
@@ -3089,7 +3078,7 @@ void intel_crt_init(struct drm_device *dev)
        <td valign="top" >TBD</td>
        </tr>
        <tr>
-       <td rowspan="16" valign="top" >nouveau</td>
+       <td rowspan="15" valign="top" >nouveau</td>
        <td rowspan="6" valign="top" >NV10 Overlay</td>
        <td valign="top" >"colorkey"</td>
        <td valign="top" >RANGE</td>
@@ -3198,14 +3187,6 @@ void intel_crt_init(struct drm_device *dev)
        <td valign="top" >TBD</td>
        </tr>
        <tr>
-       <td valign="top" >Generic</td>
-       <td valign="top" >Standard name as in DRM</td>
-       <td valign="top" >Standard type as in DRM</td>
-       <td valign="top" >Standard value as in DRM</td>
-       <td valign="top" >Standard Object as in DRM</td>
-       <td valign="top" >TBD</td>
-       </tr>
-       <tr>
        <td rowspan="2" valign="top" >omap</td>
        <td rowspan="2" valign="top" >Generic</td>
        <td valign="top" >“rotation”</td>
@@ -3236,7 +3217,7 @@ void intel_crt_init(struct drm_device *dev)
        <td valign="top" >TBD</td>
        </tr>
        <tr>
-       <td rowspan="10" valign="top" >radeon</td>
+       <td rowspan="9" valign="top" >radeon</td>
        <td valign="top" >DVI-I</td>
        <td valign="top" >“coherent”</td>
        <td valign="top" >RANGE</td>
@@ -3308,14 +3289,6 @@ void intel_crt_init(struct drm_device *dev)
        <td valign="top" >TBD</td>
        </tr>
        <tr>
-       <td valign="top" >Generic</td>
-       <td valign="top" >Standard name as in DRM</td>
-       <td valign="top" >Standard type as in DRM</td>
-       <td valign="top" >Standard value as in DRM</td>
-       <td valign="top" >Standard Object as in DRM</td>
-       <td valign="top" >TBD</td>
-       </tr>
-       <tr>
        <td rowspan="3" valign="top" >rcar-du</td>
        <td rowspan="3" valign="top" >Generic</td>
        <td valign="top" >"alpha"</td>