Cc: dri-devel@lists.freedesktop.org Signed-off-by: Sonika Jindal sonika.jindal@intel.com --- Documentation/DocBook/drm.tmpl | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/Documentation/DocBook/drm.tmpl b/Documentation/DocBook/drm.tmpl index f4976cd..266d50a 100644 --- a/Documentation/DocBook/drm.tmpl +++ b/Documentation/DocBook/drm.tmpl @@ -2853,9 +2853,12 @@ void intel_crt_init(struct drm_device *dev) <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" >{ 0, "rotate-0" }, { 1, "rotate-90" }, + { 2, "rotate-180" }, { 3, "rotate-270" }</td> <td valign="top" >Plane</td> - <td valign="top" >TBD</td> + <td valign="top" >To set plane HW rotation. This rotation property does + the plane rotation in counter clockwise direction which is + inline with the way XRandr works.</td> </tr> <tr> <td rowspan="17" valign="top" >SDVO-TV</td>
On Wed, Apr 15, 2015 at 04:05:19PM +0530, Sonika Jindal wrote:
Cc: dri-devel@lists.freedesktop.org Signed-off-by: Sonika Jindal sonika.jindal@intel.com
Documentation/DocBook/drm.tmpl | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/Documentation/DocBook/drm.tmpl b/Documentation/DocBook/drm.tmpl index f4976cd..266d50a 100644 --- a/Documentation/DocBook/drm.tmpl +++ b/Documentation/DocBook/drm.tmpl @@ -2853,9 +2853,12 @@ void intel_crt_init(struct drm_device *dev)
<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" >{ 0, "rotate-0" }, { 1, "rotate-90" }, + { 2, "rotate-180" }, { 3, "rotate-270" }</td> <td valign="top" >Plane</td> - <td valign="top" >TBD</td> + <td valign="top" >To set plane HW rotation. This rotation property does + the plane rotation in counter clockwise direction which is + inline with the way XRandr works.</td>
I would suggest moving the thing to the generci props section since we have omap and i915 both supporting it.
As for the description, we should also document the reflect flags.
I might write it as something like this: "rotate-0,rotate-90,rotate-180,rotate-270 rotate the image by the specified amount in degrees in a counter clockwise direction. reflect-x,reflect-y reflect the image along the specified axis, prior to rotation."
</tr> <tr> <td rowspan="17" valign="top" >SDVO-TV</td> -- 1.7.10.4
Intel-gfx mailing list Intel-gfx@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/intel-gfx
On 5/12/2015 6:20 PM, Ville Syrjälä wrote:
On Wed, Apr 15, 2015 at 04:05:19PM +0530, Sonika Jindal wrote:
Cc: dri-devel@lists.freedesktop.org Signed-off-by: Sonika Jindal sonika.jindal@intel.com
Documentation/DocBook/drm.tmpl | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/Documentation/DocBook/drm.tmpl b/Documentation/DocBook/drm.tmpl index f4976cd..266d50a 100644 --- a/Documentation/DocBook/drm.tmpl +++ b/Documentation/DocBook/drm.tmpl @@ -2853,9 +2853,12 @@ void intel_crt_init(struct drm_device *dev)
<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" >{ 0, "rotate-0" }, { 1, "rotate-90" }, + { 2, "rotate-180" }, { 3, "rotate-270" }</td> <td valign="top" >Plane</td> - <td valign="top" >TBD</td> + <td valign="top" >To set plane HW rotation. This rotation property does + the plane rotation in counter clockwise direction which is + inline with the way XRandr works.</td>
I would suggest moving the thing to the generci props section since we have omap and i915 both supporting it.
You mean in DRM properties section? Right now, OMAP section also has rotation property. I will remove it from OMAP section as well if you think drm is the better place.
As for the description, we should also document the reflect flags.
I might write it as something like this: "rotate-0,rotate-90,rotate-180,rotate-270 rotate the image by the specified amount in degrees in a counter clockwise direction. reflect-x,reflect-y reflect the image along the specified axis, prior to rotation."
</tr> <tr> <td rowspan="17" valign="top" >SDVO-TV</td> -- 1.7.10.4
Intel-gfx mailing list Intel-gfx@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/intel-gfx
On 5/13/2015 9:57 AM, Jindal, Sonika wrote:
On 5/12/2015 6:20 PM, Ville Syrjälä wrote:
On Wed, Apr 15, 2015 at 04:05:19PM +0530, Sonika Jindal wrote:
Cc: dri-devel@lists.freedesktop.org Signed-off-by: Sonika Jindal sonika.jindal@intel.com
Documentation/DocBook/drm.tmpl | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/Documentation/DocBook/drm.tmpl b/Documentation/DocBook/drm.tmpl index f4976cd..266d50a 100644 --- a/Documentation/DocBook/drm.tmpl +++ b/Documentation/DocBook/drm.tmpl @@ -2853,9 +2853,12 @@ void intel_crt_init(struct drm_device *dev) <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" >{ 0, "rotate-0" }, { 1, "rotate-90" },
{ 2, "rotate-180" }, { 3, "rotate-270" }</td> <td valign="top" >Plane</td>
<td valign="top" >TBD</td>
<td valign="top" >To set plane HW rotation. This rotation
property does
the plane rotation in counter clockwise direction which isinline with the way XRandr works.</td>I would suggest moving the thing to the generci props section since we have omap and i915 both supporting it.
You mean in DRM properties section? Right now, OMAP section also has rotation property. I will remove it from OMAP section as well if you think drm is the better place.
As for the description, we should also document the reflect flags.
Also, i915 doesn't support reflect flags. Only rotation is supported there. For the "generic" part, you meant just moving to the generic group in i915 property section?
I might write it as something like this: "rotate-0,rotate-90,rotate-180,rotate-270 rotate the image by the specified amount in degrees in a counter clockwise direction. reflect-x,reflect-y reflect the image along the specified axis, prior to rotation."
</tr> <tr> <td rowspan="17" valign="top" >SDVO-TV</td>-- 1.7.10.4
Intel-gfx mailing list Intel-gfx@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/intel-gfx
On 5/13/2015 9:57 AM, Jindal, Sonika wrote:
On 5/12/2015 6:20 PM, Ville Syrjälä wrote:
On Wed, Apr 15, 2015 at 04:05:19PM +0530, Sonika Jindal wrote:
Cc: dri-devel@lists.freedesktop.org Signed-off-by: Sonika Jindal sonika.jindal@intel.com
Documentation/DocBook/drm.tmpl | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/Documentation/DocBook/drm.tmpl b/Documentation/DocBook/drm.tmpl index f4976cd..266d50a 100644 --- a/Documentation/DocBook/drm.tmpl +++ b/Documentation/DocBook/drm.tmpl @@ -2853,9 +2853,12 @@ void intel_crt_init(struct drm_device *dev) <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" >{ 0, "rotate-0" }, { 1, "rotate-90" },
{ 2, "rotate-180" }, { 3, "rotate-270" }</td> <td valign="top" >Plane</td>
<td valign="top" >TBD</td>
<td valign="top" >To set plane HW rotation. This rotation
property does
the plane rotation in counter clockwise direction which isinline with the way XRandr works.</td>I would suggest moving the thing to the generci props section since we have omap and i915 both supporting it.
You mean in DRM properties section? Right now, OMAP section also has rotation property. I will remove it from OMAP section as well if you think drm is the better place.
As for the description, we should also document the reflect flags.
i915 doesn't support reflect flags. It only create rotation property with rotation flags.
For "generic" section, you mean moving to generic group of properties in i915 only right?
I might write it as something like this: "rotate-0,rotate-90,rotate-180,rotate-270 rotate the image by the specified amount in degrees in a counter clockwise direction. reflect-x,reflect-y reflect the image along the specified axis, prior to rotation."
</tr> <tr> <td rowspan="17" valign="top" >SDVO-TV</td>-- 1.7.10.4
Intel-gfx mailing list Intel-gfx@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/intel-gfx
On Wed, May 20, 2015 at 01:19:34PM +0530, Jindal, Sonika wrote:
On 5/13/2015 9:57 AM, Jindal, Sonika wrote:
On 5/12/2015 6:20 PM, Ville Syrjälä wrote:
On Wed, Apr 15, 2015 at 04:05:19PM +0530, Sonika Jindal wrote:
Cc: dri-devel@lists.freedesktop.org Signed-off-by: Sonika Jindal sonika.jindal@intel.com
Documentation/DocBook/drm.tmpl | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/Documentation/DocBook/drm.tmpl b/Documentation/DocBook/drm.tmpl index f4976cd..266d50a 100644 --- a/Documentation/DocBook/drm.tmpl +++ b/Documentation/DocBook/drm.tmpl @@ -2853,9 +2853,12 @@ void intel_crt_init(struct drm_device *dev) <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" >{ 0, "rotate-0" }, { 1, "rotate-90" },
{ 2, "rotate-180" }, { 3, "rotate-270" }</td> <td valign="top" >Plane</td>
<td valign="top" >TBD</td>
<td valign="top" >To set plane HW rotation. This rotation
property does
the plane rotation in counter clockwise direction which isinline with the way XRandr works.</td>I would suggest moving the thing to the generci props section since we have omap and i915 both supporting it.
You mean in DRM properties section? Right now, OMAP section also has rotation property. I will remove it from OMAP section as well if you think drm is the better place.
As for the description, we should also document the reflect flags.
i915 doesn't support reflect flags.
It will as soon as I (or someone else) find a bit of time to implement it.
It only create rotation property with rotation flags.
For "generic" section, you mean moving to generic group of properties in i915 only right?
I meant the entire thing. I don't think we should care too much about which actual bits each driver supports since that can even depend on which plane is used in some specific platform. So we should just document all the possible bits, and if you want you could add a note stating that a specific driver/platform/plane may not support all of them.
I might write it as something like this: "rotate-0,rotate-90,rotate-180,rotate-270 rotate the image by the specified amount in degrees in a counter clockwise direction. reflect-x,reflect-y reflect the image along the specified axis, prior to rotation."
</tr> <tr> <td rowspan="17" valign="top" >SDVO-TV</td>-- 1.7.10.4
Intel-gfx mailing list Intel-gfx@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Moving rotation property to "Drm" and removing from i915 and omap. Also, adding description to the property
Cc: DRI Development dri-devel@lists.freedesktop.org Suggested-by: Ville Syrjälä ville.syrjala@linux.intel.com Signed-off-by: Sonika Jindal sonika.jindal@intel.com --- Documentation/DocBook/drm.tmpl | 41 ++++++++++++++++++---------------------- 1 file changed, 18 insertions(+), 23 deletions(-)
diff --git a/Documentation/DocBook/drm.tmpl b/Documentation/DocBook/drm.tmpl index 109fde8..c0312cb 100644 --- a/Documentation/DocBook/drm.tmpl +++ b/Documentation/DocBook/drm.tmpl @@ -2585,7 +2585,22 @@ void intel_crt_init(struct drm_device *dev) <td valign="top" >Description/Restrictions</td> </tr> <tr> - <td rowspan="36" valign="top" >DRM</td> + <td rowspan="37" valign="top" >DRM</td> + <td valign="top" >Generic</td> + <td valign="top" >“rotation”</td> + <td valign="top" >BITMASK</td> + <td valign="top" >{ 0, "rotate-0" }, + { 1, "rotate-90" }, + { 2, "rotate-180" }, + { 3, "rotate-270" }, + { 4, "reflect-x" }, + { 5, "reflect-y" }</td> + <td valign="top" >CRTC, Plane</td> + <td valign="top" >rotate-(degrees) rotates the image by the specified amount in degrees + in counter clockwise direction. reflect-x and reflect-y reflects the + image along the specified axis prior to rotation</td> + </tr> + <tr> <td rowspan="5" valign="top" >Connector</td> <td valign="top" >“EDID”</td> <td valign="top" >BLOB | IMMUTABLE</td> @@ -2846,7 +2861,7 @@ void intel_crt_init(struct drm_device *dev) <td valign="top" >TBD</td> </tr> <tr> - <td rowspan="21" valign="top" >i915</td> + <td rowspan="20" valign="top" >i915</td> <td rowspan="2" valign="top" >Generic</td> <td valign="top" >"Broadcast RGB"</td> <td valign="top" >ENUM</td> @@ -2862,14 +2877,6 @@ void intel_crt_init(struct drm_device *dev) <td valign="top" >TBD</td> </tr> <tr> - <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> <td rowspan="17" valign="top" >SDVO-TV</td> <td valign="top" >“mode”</td> <td valign="top" >ENUM</td> @@ -3377,19 +3384,7 @@ void intel_crt_init(struct drm_device *dev) </tr> <tr> <td rowspan="2" valign="top" >omap</td> - <td rowspan="2" valign="top" >Generic</td> - <td valign="top" >“rotation”</td> - <td valign="top" >BITMASK</td> - <td valign="top" >{ 0, "rotate-0" }, - { 1, "rotate-90" }, - { 2, "rotate-180" }, - { 3, "rotate-270" }, - { 4, "reflect-x" }, - { 5, "reflect-y" }</td> - <td valign="top" >CRTC, Plane</td> - <td valign="top" >TBD</td> - </tr> - <tr> + <td valign="top" >Generic</td> <td valign="top" >“zorder”</td> <td valign="top" >RANGE</td> <td valign="top" >Min=0, Max=3</td>
On Thu, May 28, 2015 at 04:35:07PM +0530, Sonika Jindal wrote:
Moving rotation property to "Drm" and removing from i915 and omap. Also, adding description to the property
Cc: DRI Development dri-devel@lists.freedesktop.org Suggested-by: Ville Syrjälä ville.syrjala@linux.intel.com Signed-off-by: Sonika Jindal sonika.jindal@intel.com
Applied to drm-misc, thanks. -Daniel
Documentation/DocBook/drm.tmpl | 41 ++++++++++++++++++---------------------- 1 file changed, 18 insertions(+), 23 deletions(-)
diff --git a/Documentation/DocBook/drm.tmpl b/Documentation/DocBook/drm.tmpl index 109fde8..c0312cb 100644 --- a/Documentation/DocBook/drm.tmpl +++ b/Documentation/DocBook/drm.tmpl @@ -2585,7 +2585,22 @@ void intel_crt_init(struct drm_device *dev)
<td valign="top" >Description/Restrictions</td> </tr> <tr> - <td rowspan="36" valign="top" >DRM</td> + <td rowspan="37" valign="top" >DRM</td> + <td valign="top" >Generic</td> + <td valign="top" >“rotation”</td> + <td valign="top" >BITMASK</td> + <td valign="top" >{ 0, "rotate-0" }, + { 1, "rotate-90" }, + { 2, "rotate-180" }, + { 3, "rotate-270" }, + { 4, "reflect-x" }, + { 5, "reflect-y" }</td> + <td valign="top" >CRTC, Plane</td> + <td valign="top" >rotate-(degrees) rotates the image by the specified amount in degrees + in counter clockwise direction. reflect-x and reflect-y reflects the + image along the specified axis prior to rotation</td> + </tr> + <tr> <td rowspan="5" valign="top" >Connector</td> <td valign="top" >“EDID”</td> <td valign="top" >BLOB | IMMUTABLE</td> @@ -2846,7 +2861,7 @@ void intel_crt_init(struct drm_device *dev) <td valign="top" >TBD</td> </tr> <tr> - <td rowspan="21" valign="top" >i915</td> + <td rowspan="20" valign="top" >i915</td> <td rowspan="2" valign="top" >Generic</td> <td valign="top" >"Broadcast RGB"</td> <td valign="top" >ENUM</td> @@ -2862,14 +2877,6 @@ void intel_crt_init(struct drm_device *dev) <td valign="top" >TBD</td> </tr> <tr> - <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> <td rowspan="17" valign="top" >SDVO-TV</td> <td valign="top" >“mode”</td> <td valign="top" >ENUM</td> @@ -3377,19 +3384,7 @@ void intel_crt_init(struct drm_device *dev) </tr> <tr> <td rowspan="2" valign="top" >omap</td> - <td rowspan="2" valign="top" >Generic</td> - <td valign="top" >“rotation”</td> - <td valign="top" >BITMASK</td> - <td valign="top" >{ 0, "rotate-0" }, - { 1, "rotate-90" }, - { 2, "rotate-180" }, - { 3, "rotate-270" }, - { 4, "reflect-x" }, - { 5, "reflect-y" }</td> - <td valign="top" >CRTC, Plane</td> - <td valign="top" >TBD</td> - </tr> - <tr> + <td valign="top" >Generic</td> <td valign="top" >“zorder”</td> <td valign="top" >RANGE</td> <td valign="top" >Min=0, Max=3</td> -- 1.7.10.4
Intel-gfx mailing list Intel-gfx@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/intel-gfx
dri-devel@lists.freedesktop.org
-
Daniel Vetter -
Jindal, Sonika -
Sonika Jindal
-
Ville Syrjälä