drm/imx/dcss: fix rotations for Vivante tiled formats

[ Upstream commit 59cb403f38099506ddbe05fd09126f3f0890860b ]

DCSS supports 90/180/270 degree rotations for Vivante tiled and super-tiled
formats. Unfortunately, with the current code, they didn't work properly.

This simple patch makes the rotations work by fixing the way the scaler is set
up for 90/270 degree rotations. In this particular case, the source width and
height need to be swapped since DPR is sending the buffer to scaler already
rotated.

Also, make sure to allow full rotations for DRM_FORMAT_MOD_VIVANTE_SUPER_TILED.

Fixes: 9021c317b770 ("drm/imx: Add initial support for DCSS on iMX8MQ")
Signed-off-by: Laurentiu Palcu <laurentiu.palcu@oss.nxp.com>
Reviewed-by: Lucas Stach <l.stach@pengutronix.de>
Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
Link: https://patchwork.freedesktop.org/patch/msgid/20201105140127.25249-2-laurentiu.palcu@oss.nxp.com
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/gpu/drm/imx/dcss/dcss-plane.c b/drivers/gpu/drm/imx/dcss/dcss-plane.c
index 961d671..f54087a 100644 (file)
--- a/drivers/gpu/drm/imx/dcss/dcss-plane.c
+++ b/drivers/gpu/drm/imx/dcss/dcss-plane.c
@@ -111,7 +111,8 @@ static bool dcss_plane_can_rotate(const struct drm_format_info *format,
                supported_rotation = DRM_MODE_ROTATE_0 | DRM_MODE_ROTATE_180 |
                                     DRM_MODE_REFLECT_MASK;
        else if (!format->is_yuv &&
-                modifier == DRM_FORMAT_MOD_VIVANTE_TILED)
+                (modifier == DRM_FORMAT_MOD_VIVANTE_TILED ||
+                 modifier == DRM_FORMAT_MOD_VIVANTE_SUPER_TILED))
                supported_rotation = DRM_MODE_ROTATE_MASK |
                                     DRM_MODE_REFLECT_MASK;
        else if (format->is_yuv && linear_format &&
@@ -273,6 +274,7 @@ static void dcss_plane_atomic_update(struct drm_plane *plane,
        u32 src_w, src_h, dst_w, dst_h;
        struct drm_rect src, dst;
        bool enable = true;
+       bool is_rotation_90_or_270;
 
        if (!fb || !state->crtc || !state->visible)
                return;
@@ -311,8 +313,13 @@ static void dcss_plane_atomic_update(struct drm_plane *plane,
 
        dcss_plane_atomic_set_base(dcss_plane);
 
+       is_rotation_90_or_270 = state->rotation & (DRM_MODE_ROTATE_90 |
+                                                  DRM_MODE_ROTATE_270);
+
        dcss_scaler_setup(dcss->scaler, dcss_plane->ch_num,
-                         state->fb->format, src_w, src_h,
+                         state->fb->format,
+                         is_rotation_90_or_270 ? src_h : src_w,
+                         is_rotation_90_or_270 ? src_w : src_h,
                          dst_w, dst_h,
                          drm_mode_vrefresh(&crtc_state->mode));