drm/arm: Use per-plane rotation property
authorVille Syrjälä <ville.syrjala@linux.intel.com>
Mon, 26 Sep 2016 16:30:49 +0000 (19:30 +0300)
committerDaniel Vetter <daniel.vetter@ffwll.ch>
Fri, 21 Oct 2016 16:24:04 +0000 (18:24 +0200)
The global mode_config.rotation_property is going away, switch over to
per-plane rotation_property.

v2: Drop the BIT()

Cc: Liviu Dudau <liviu.dudau@arm.com>
Cc: Brian Starkey <brian.starkey@arm.com>
Cc: Mali DP Maintainers <malidp@foss.arm.com>
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Acked-by: Brian Starkey <brian.starkey@arm.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Link: http://patchwork.freedesktop.org/patch/msgid/1474907460-10717-5-git-send-email-ville.syrjala@linux.intel.com
drivers/gpu/drm/arm/malidp_planes.c

index 82c193e5e0d61654f5e28fcc961d0b74a31863a2..abaca03b9d361b1d488c314e7d1bb3a475eb6ada 100644 (file)
@@ -254,21 +254,18 @@ int malidp_de_planes_init(struct drm_device *drm)
                if (ret < 0)
                        goto cleanup;
 
-               if (!drm->mode_config.rotation_property) {
+               /* SMART layer can't be rotated */
+               if (id != DE_SMART) {
                        unsigned long flags = DRM_ROTATE_0 |
                                              DRM_ROTATE_90 |
                                              DRM_ROTATE_180 |
                                              DRM_ROTATE_270 |
                                              DRM_REFLECT_X |
                                              DRM_REFLECT_Y;
-                       drm->mode_config.rotation_property =
-                               drm_mode_create_rotation_property(drm, flags);
+                       drm_plane_create_rotation_property(&plane->base,
+                                                          DRM_ROTATE_0,
+                                                          flags);
                }
-               /* SMART layer can't be rotated */
-               if (drm->mode_config.rotation_property && (id != DE_SMART))
-                       drm_object_attach_property(&plane->base.base,
-                                                  drm->mode_config.rotation_property,
-                                                  DRM_ROTATE_0);
 
                drm_plane_helper_add(&plane->base,
                                     &malidp_de_plane_helper_funcs);