1 files changed, 11 insertions, 3 deletions

diff --git a/drivers/gpu/drm/omapdrm/omap_plane.c b/drivers/gpu/drm/omapdrm/omap_plane.c
index 6ddaa5ea4b6b..0ffd5b930ec0 100644
--- a/drivers/gpu/drm/omapdrm/omap_plane.c
+++ b/drivers/gpu/drm/omapdrm/omap_plane.c
@@ -211,9 +211,17 @@ void omap_plane_install_properties(struct drm_plane *plane,
         struct omap_drm_private *priv = dev->dev_private;
 
         if (priv->has_dmm) {
-                struct drm_property *prop = dev->mode_config.rotation_property;
-
-                drm_object_attach_property(obj, prop, DRM_ROTATE_0);
+                if (!plane->rotation_property)
+                        drm_plane_create_rotation_property(plane,
+                                                           DRM_ROTATE_0,
+                                                           DRM_ROTATE_0 | DRM_ROTATE_90 |
+                                                           DRM_ROTATE_180 | DRM_ROTATE_270 |
+                                                           DRM_REFLECT_X | DRM_REFLECT_Y);
+
+                /* Attach the rotation property also to the crtc object */
+                if (plane->rotation_property && obj != &plane->base)
+                        drm_object_attach_property(obj, plane->rotation_property,
+                                                   DRM_ROTATE_0);
         }
 
         drm_object_attach_property(obj, priv->zorder_prop, 0);