| Message ID | 1432811107-27244-1-git-send-email-sonika.jindal@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
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
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>
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(-)