drm: BIT(DRM_ROTATE_?) -> DRM_ROTATE_?

Only property creation uses the rotation as an index, so convert the
to figure the index when needed.

v2: Use the new defines to build the _MASK defines (Sean)

Cc: intel-gfx@lists.freedesktop.org
Cc: linux-arm-msm@vger.kernel.org
Cc: freedreno@lists.freedesktop.org
Cc: malidp@foss.arm.com
Cc: David Airlie <airlied@linux.ie>
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
Cc: Liviu Dudau <Liviu.Dudau@arm.com>
Cc: Sean Paul <seanpaul@chromium.org>
Acked-by: Liviu Dudau <Liviu.Dudau@arm.com>
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com> (v1)
Signed-off-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Sean Paul <seanpaul@chromium.org>
Link: http://patchwork.freedesktop.org/patch/msgid/1469771405-17653-1-git-send-email-joonas.lahtinen@linux.intel.com

3 files changed, 15 insertions, 15 deletions

diff --git a/drivers/gpu/drm/omapdrm/omap_drv.c b/drivers/gpu/drm/omapdrm/omap_drv.c
index 26c6134eb744..3dd78f2045f9 100644
--- a/drivers/gpu/drm/omapdrm/omap_drv.c
+++ b/drivers/gpu/drm/omapdrm/omap_drv.c
@@ -295,9 +295,9 @@ static int omap_modeset_init_properties(struct drm_device *dev)
         if (priv->has_dmm) {
                 dev->mode_config.rotation_property =
                         drm_mode_create_rotation_property(dev,
-                                BIT(DRM_ROTATE_0) | BIT(DRM_ROTATE_90) |
-                                BIT(DRM_ROTATE_180) | BIT(DRM_ROTATE_270) |
-                                BIT(DRM_REFLECT_X) | BIT(DRM_REFLECT_Y));
+                                DRM_ROTATE_0 | DRM_ROTATE_90 |
+                                DRM_ROTATE_180 | DRM_ROTATE_270 |
+                                DRM_REFLECT_X | DRM_REFLECT_Y);
                 if (!dev->mode_config.rotation_property)
                         return -ENOMEM;
         }
diff --git a/drivers/gpu/drm/omapdrm/omap_fb.c b/drivers/gpu/drm/omapdrm/omap_fb.c
index 31f5178c22c7..5f3337f1e9aa 100644
--- a/drivers/gpu/drm/omapdrm/omap_fb.c
+++ b/drivers/gpu/drm/omapdrm/omap_fb.c
@@ -179,24 +179,24 @@ void omap_framebuffer_update_scanout(struct drm_framebuffer *fb,
                                         (uint32_t)win->rotation);
                         /* fallthru to default to no rotation */
                 case 0:
-                case BIT(DRM_ROTATE_0):
+                case DRM_ROTATE_0:
                         orient = 0;
                         break;
-                case BIT(DRM_ROTATE_90):
+                case DRM_ROTATE_90:
                         orient = MASK_XY_FLIP | MASK_X_INVERT;
                         break;
-                case BIT(DRM_ROTATE_180):
+                case DRM_ROTATE_180:
                         orient = MASK_X_INVERT | MASK_Y_INVERT;
                         break;
-                case BIT(DRM_ROTATE_270):
+                case DRM_ROTATE_270:
                         orient = MASK_XY_FLIP | MASK_Y_INVERT;
                         break;
                 }
 
-                if (win->rotation & BIT(DRM_REFLECT_X))
+                if (win->rotation & DRM_REFLECT_X)
                         orient ^= MASK_X_INVERT;
 
-                if (win->rotation & BIT(DRM_REFLECT_Y))
+                if (win->rotation & DRM_REFLECT_Y)
                         orient ^= MASK_Y_INVERT;
 
                 /* adjust x,y offset for flip/invert: */
@@ -213,7 +213,7 @@ void omap_framebuffer_update_scanout(struct drm_framebuffer *fb,
         } else {
                 switch (win->rotation & DRM_ROTATE_MASK) {
                 case 0:
-                case BIT(DRM_ROTATE_0):
+                case DRM_ROTATE_0:
                         /* OK */
                         break;
 
diff --git a/drivers/gpu/drm/omapdrm/omap_plane.c b/drivers/gpu/drm/omapdrm/omap_plane.c
index 5252ab720e70..4c7727e6be7c 100644
--- a/drivers/gpu/drm/omapdrm/omap_plane.c
+++ b/drivers/gpu/drm/omapdrm/omap_plane.c
@@ -109,8 +109,8 @@ static void omap_plane_atomic_update(struct drm_plane *plane,
         win.src_y = state->src_y >> 16;
 
         switch (state->rotation & DRM_ROTATE_MASK) {
-        case BIT(DRM_ROTATE_90):
-        case BIT(DRM_ROTATE_270):
+        case DRM_ROTATE_90:
+        case DRM_ROTATE_270:
                 win.src_w = state->src_h >> 16;
                 win.src_h = state->src_w >> 16;
                 break;
@@ -149,7 +149,7 @@ static void omap_plane_atomic_disable(struct drm_plane *plane,
         struct omap_plane_state *omap_state = to_omap_plane_state(plane->state);
         struct omap_plane *omap_plane = to_omap_plane(plane);
 
-        plane->state->rotation = BIT(DRM_ROTATE_0);
+        plane->state->rotation = DRM_ROTATE_0;
         omap_state->zorder = plane->type == DRM_PLANE_TYPE_PRIMARY
                            ? 0 : omap_plane->id;
 
@@ -178,7 +178,7 @@ static int omap_plane_atomic_check(struct drm_plane *plane,
                 return -EINVAL;
 
         if (state->fb) {
-                if (state->rotation != BIT(DRM_ROTATE_0) &&
+                if (state->rotation != DRM_ROTATE_0 &&
                     !omap_framebuffer_supports_rotation(state->fb))
                         return -EINVAL;
         }
@@ -269,7 +269,7 @@ static void omap_plane_reset(struct drm_plane *plane)
          */
         omap_state->zorder = plane->type == DRM_PLANE_TYPE_PRIMARY
                            ? 0 : omap_plane->id;
-        omap_state->base.rotation = BIT(DRM_ROTATE_0);
+        omap_state->base.rotation = DRM_ROTATE_0;
 
         plane->state = &omap_state->base;
         plane->state->plane = plane;