Currently, vkms only support the reflect-x property. Therefore, add the
reflect-y property to vkms through a software implementation of the
operation. This is possible by reverse reading the y axis during the
blending.

Now, vkms support all possible rotation values.

Tested with igt@kms_rotation_crc@primary-reflect-y and
igt@kms_rotation_crc@sprite-reflect-y [1].

[1] https://patchwork.freedesktop.org/series/116025/

Signed-off-by: Maíra Canal <mca...@igalia.com>
---
 drivers/gpu/drm/vkms/vkms_composer.c |  7 ++++++-
 drivers/gpu/drm/vkms/vkms_plane.c    | 16 ++++------------
 2 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/drivers/gpu/drm/vkms/vkms_composer.c 
b/drivers/gpu/drm/vkms/vkms_composer.c
index 25d412f555ae..0566eb8e2dee 100644
--- a/drivers/gpu/drm/vkms/vkms_composer.c
+++ b/drivers/gpu/drm/vkms/vkms_composer.c
@@ -92,8 +92,13 @@ static int get_y_pos(struct vkms_frame_info *frame_info, int 
y)
                        return -1;
                return y + frame_info->dst.x1;
        default:
-               return y;
+               break;
        }
+
+       if (frame_info->rotation & DRM_MODE_REFLECT_Y)
+               return drm_rect_height(&frame_info->dst) - y - 1;
+
+       return y;
 }
 
 static bool check_limit(struct vkms_frame_info *frame_info, int pos)
diff --git a/drivers/gpu/drm/vkms/vkms_plane.c 
b/drivers/gpu/drm/vkms/vkms_plane.c
index e2bd2231fe4c..3f82b5315fef 100644
--- a/drivers/gpu/drm/vkms/vkms_plane.c
+++ b/drivers/gpu/drm/vkms/vkms_plane.c
@@ -121,12 +121,8 @@ static void vkms_plane_atomic_update(struct drm_plane 
*plane,
        frame_info->fb = fb;
        memcpy(&frame_info->map, &shadow_plane_state->data, 
sizeof(frame_info->map));
        drm_framebuffer_get(frame_info->fb);
-       frame_info->rotation = drm_rotation_simplify(new_state->rotation,
-                                                    DRM_MODE_ROTATE_0 |
-                                                    DRM_MODE_ROTATE_90 |
-                                                    DRM_MODE_ROTATE_180 |
-                                                    DRM_MODE_ROTATE_270 |
-                                                    DRM_MODE_REFLECT_X);
+       frame_info->rotation = drm_rotation_simplify(new_state->rotation, 
DRM_MODE_ROTATE_MASK |
+                                                    DRM_MODE_REFLECT_MASK);
 
        drm_rect_rotate(&frame_info->dst, drm_rect_width(&frame_info->dst),
                        drm_rect_height(&frame_info->dst), 
frame_info->rotation);
@@ -240,12 +236,8 @@ struct vkms_plane *vkms_plane_init(struct vkms_device 
*vkmsdev,
 
        drm_plane_helper_add(&plane->base, funcs);
 
-       drm_plane_create_rotation_property(&plane->base, DRM_MODE_ROTATE_0,
-                                          DRM_MODE_ROTATE_0 |
-                                          DRM_MODE_ROTATE_90 |
-                                          DRM_MODE_ROTATE_180 |
-                                          DRM_MODE_ROTATE_270 |
-                                          DRM_MODE_REFLECT_X);
+       drm_plane_create_rotation_property(&plane->base, DRM_MODE_ROTATE_0, 
DRM_MODE_ROTATE_MASK |
+                                          DRM_MODE_REFLECT_MASK);
 
        return plane;
 }
-- 
2.39.2

Reply via email to