[PATCH v2] drm/docs: Move "scaling mode" property.

[PATCH v2] drm/docs: Move "scaling mode" property.

[robert.foss]

From: Robert Foss <robert.foss@collabora.com>

The "scaling mode" property has been moved to the DRM->Generic.
It has also had a list of supported drivers added to it.

Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Robert Foss <robert.foss@collabora.com>
---
Changes since v1:
- Added Reviewed-by: Alex Deucher <alexander.deucher@amd.com>

    Documentation/DocBook/gpu.tmpl | 22 ++++++++++------------
 1 file changed, 10 insertions(+), 12 deletions(-)

diff --git a/Documentation/DocBook/gpu.tmpl b/Documentation/DocBook/gpu.tmpl
index 1692c4d..da58702 100644
--- a/Documentation/DocBook/gpu.tmpl
+++ b/Documentation/DocBook/gpu.tmpl
@@ -1817,7 +1817,7 @@ void intel_crt_init(struct drm_device *dev)
 	</tr>
 	<tr>
 	<td rowspan="42" valign="top" >DRM</td>
-	<td valign="top" >Generic</td>
+	<td rowspan="2" valign="top" >Generic</td>
 	<td valign="top" >“rotation”</td>
 	<td valign="top" >BITMASK</td>
 	<td valign="top" >{ 0, "rotate-0" },
@@ -1832,6 +1832,13 @@ void intel_crt_init(struct drm_device *dev)
 	image along the specified axis prior to rotation</td>
 	</tr>
 	<tr>
+	<td valign="top" >“scaling mode”</td>
+	<td valign="top" >ENUM</td>
+	<td valign="top" >{ "None", "Full", "Center", "Full aspect" }</td>
+	<td valign="top" >Connector</td>
+	<td valign="top" >Supported by: amdgpu, gma500, i915, nouveau and radeon.</td>
+	</tr>
+	<tr>
 	<td rowspan="5" valign="top" >Connector</td>
 	<td valign="top" >“EDID”</td>
 	<td valign="top" >BLOB | IMMUTABLE</td>
@@ -2068,21 +2075,12 @@ void intel_crt_init(struct drm_device *dev)
 	<td valign="top" >property to suggest an Y offset for a connector</td>
 	</tr>
 	<tr>
-	<td rowspan="8" valign="top" >Optional</td>
-	<td valign="top" >“scaling mode”</td>
-	<td valign="top" >ENUM</td>
-	<td valign="top" >{ "None", "Full", "Center", "Full aspect" }</td>
-	<td valign="top" >Connector</td>
-	<td valign="top" >TBD</td>
-	</tr>
-	<tr>
+	<td rowspan="7" valign="top" >Optional</td>
 	<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>
+	<td valign="top" >TDB</td>
 	</tr>
 	<tr>
 	<td valign="top" >“dirty”</td>
-- 
2.5.0

Re: [PATCH v2] drm/docs: Move "scaling mode" property.

[Daniel Vetter]

On Mon, May 02, 2016 at 03:13:01PM -0400, robert.foss@collabora.com wrote:
> From: Robert Foss <robert.foss@collabora.com>
> 
> The "scaling mode" property has been moved to the DRM->Generic.
> It has also had a list of supported drivers added to it.
> 
> Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
> Signed-off-by: Robert Foss <robert.foss@collabora.com>

Applied to drm-misc, thanks.
-Daniel

> ---
> Changes since v1:
> - Added Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
> 
>     Documentation/DocBook/gpu.tmpl | 22 ++++++++++------------
>  1 file changed, 10 insertions(+), 12 deletions(-)
> 
> diff --git a/Documentation/DocBook/gpu.tmpl b/Documentation/DocBook/gpu.tmpl
> index 1692c4d..da58702 100644
> --- a/Documentation/DocBook/gpu.tmpl
> +++ b/Documentation/DocBook/gpu.tmpl
> @@ -1817,7 +1817,7 @@ void intel_crt_init(struct drm_device *dev)
>  	</tr>
>  	<tr>
>  	<td rowspan="42" valign="top" >DRM</td>
> -	<td valign="top" >Generic</td>
> +	<td rowspan="2" valign="top" >Generic</td>
>  	<td valign="top" >“rotation”</td>
>  	<td valign="top" >BITMASK</td>
>  	<td valign="top" >{ 0, "rotate-0" },
> @@ -1832,6 +1832,13 @@ void intel_crt_init(struct drm_device *dev)
>  	image along the specified axis prior to rotation</td>
>  	</tr>
>  	<tr>
> +	<td valign="top" >“scaling mode”</td>
> +	<td valign="top" >ENUM</td>
> +	<td valign="top" >{ "None", "Full", "Center", "Full aspect" }</td>
> +	<td valign="top" >Connector</td>
> +	<td valign="top" >Supported by: amdgpu, gma500, i915, nouveau and radeon.</td>
> +	</tr>
> +	<tr>
>  	<td rowspan="5" valign="top" >Connector</td>
>  	<td valign="top" >“EDID”</td>
>  	<td valign="top" >BLOB | IMMUTABLE</td>
> @@ -2068,21 +2075,12 @@ void intel_crt_init(struct drm_device *dev)
>  	<td valign="top" >property to suggest an Y offset for a connector</td>
>  	</tr>
>  	<tr>
> -	<td rowspan="8" valign="top" >Optional</td>
> -	<td valign="top" >“scaling mode”</td>
> -	<td valign="top" >ENUM</td>
> -	<td valign="top" >{ "None", "Full", "Center", "Full aspect" }</td>
> -	<td valign="top" >Connector</td>
> -	<td valign="top" >TBD</td>
> -	</tr>
> -	<tr>
> +	<td rowspan="7" valign="top" >Optional</td>
>  	<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>
> +	<td valign="top" >TDB</td>
>  	</tr>
>  	<tr>
>  	<td valign="top" >“dirty”</td>
> -- 
> 2.5.0
> 

-- 
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch