1 files changed, 14 insertions, 0 deletions

diff --git a/drivers/gpu/drm/omapdrm/omap_fb.c b/drivers/gpu/drm/omapdrm/omap_fb.c
index d2b8c49bfb4a..8b019602ffe6 100644
--- a/drivers/gpu/drm/omapdrm/omap_fb.c
+++ b/drivers/gpu/drm/omapdrm/omap_fb.c
@@ -218,6 +218,20 @@ void omap_framebuffer_update_scanout(struct drm_framebuffer *fb,
                 info->rotation_type = OMAP_DSS_ROT_TILER;
                 info->screen_width  = omap_gem_tiled_stride(plane->bo, orient);
         } else {
+                switch (win->rotation & 0xf) {
+                case 0:
+                case BIT(DRM_ROTATE_0):
+                        /* OK */
+                        break;
+
+                default:
+                        dev_warn(fb->dev->dev,
+                                "rotation '%d' ignored for non-tiled fb\n",
+                                win->rotation);
+                        win->rotation = 0;
+                        break;
+                }
+
                 info->paddr         = get_linear_addr(plane, format, 0, x, y);
                 info->rotation_type = OMAP_DSS_ROT_DMA;
                 info->screen_width  = plane->pitch;