Currently, vkms only supports the rotate-90 and rotate-180 properties.
Therefore, improve the vkms IGT test coverage by adding the rotate-270
property to vkms. The rotation was implement by software: rotate the way
the blending occurs by making the source x axis be the destination y axis
and the source y axis be the destination x axis and reverse-read the axis.
Tested with igt@kms_rotation_crc@primary-rotation-270, and
igt@kms_rotation_crc@sprite-rotation-270.
Signed-off-by: Maíra Canal <mcanal@xxxxxxxxxx>
---
drivers/gpu/drm/vkms/vkms_composer.c | 12 ++++++++++--
drivers/gpu/drm/vkms/vkms_formats.c | 7 ++++---
drivers/gpu/drm/vkms/vkms_plane.c | 6 ++++--
3 files changed, 18 insertions(+), 7 deletions(-)
diff --git a/drivers/gpu/drm/vkms/vkms_composer.c b/drivers/gpu/drm/vkms/vkms_composer.c
index 824bb65badb7..b05bd008aeab 100644
--- a/drivers/gpu/drm/vkms/vkms_composer.c
+++ b/drivers/gpu/drm/vkms/vkms_composer.c
@@ -4,6 +4,7 @@
#include <drm/drm_atomic.h>
#include <drm/drm_atomic_helper.h>
+#include <drm/drm_blend.h>
#include <drm/drm_fourcc.h>
#include <drm/drm_gem_framebuffer_helper.h>
#include <drm/drm_vblank.h>
@@ -23,6 +24,9 @@ static struct pixel_argb_u16 *get_out_buffer(const struct vkms_frame_info *frame
case DRM_MODE_ROTATE_180:
out -= frame_info->dst.x1;
break;
+ case DRM_MODE_ROTATE_270:
+ out += frame_info->dst.y1;
+ break;
default:
out += frame_info->dst.x1;
break;
@@ -63,7 +67,7 @@ static void pre_mul_alpha_blend(struct vkms_frame_info *frame_info,
struct pixel_argb_u16 *in = stage_buffer->pixels;
int limit = min_t(size_t, drm_rect_width(&frame_info->dst), stage_buffer->n_pixels);
- if (frame_info->rotation & DRM_MODE_ROTATE_90)
+ if (drm_rotation_90_or_270(frame_info->rotation))
limit = min_t(size_t, drm_rect_height(&frame_info->dst), stage_buffer->n_pixels);
for (int x = 0; x < limit; x++) {
@@ -83,6 +87,10 @@ static int get_y_pos(struct vkms_frame_info *frame_info, int y)
return frame_info->dst.x2 - y - 1;
case DRM_MODE_ROTATE_180:
return drm_rect_height(&frame_info->dst) - y - 1;
+ case DRM_MODE_ROTATE_270:
+ if (y + frame_info->dst.x1 < 0)
+ return -1;
+ return y + frame_info->dst.x1;
default:
return y;
}
@@ -90,7 +98,7 @@ static int get_y_pos(struct vkms_frame_info *frame_info, int y)
static bool check_limit(struct vkms_frame_info *frame_info, int pos)
{
- if (frame_info->rotation & DRM_MODE_ROTATE_90) {
+ if (drm_rotation_90_or_270(frame_info->rotation)) {
if (pos >= 0 && pos < drm_rect_width(&frame_info->dst))
return true;
} else {
diff --git a/drivers/gpu/drm/vkms/vkms_formats.c b/drivers/gpu/drm/vkms/vkms_formats.c
index 90b72b0ff8c9..c4513f3d6876 100644
--- a/drivers/gpu/drm/vkms/vkms_formats.c
+++ b/drivers/gpu/drm/vkms/vkms_formats.c
@@ -2,6 +2,7 @@
#include <linux/kernel.h>
#include <linux/minmax.h>
+#include <drm/drm_blend.h>
#include <drm/drm_rect.h>
#include <drm/drm_fixed.h>
@@ -44,21 +45,21 @@ static void *get_packed_src_addr(const struct vkms_frame_info *frame_info, int y
static int get_x_position(const struct vkms_frame_info *frame_info, int x_limit, int x)
{
- if (frame_info->rotation & DRM_MODE_ROTATE_180)
+ if (frame_info->rotation & (DRM_MODE_ROTATE_180 | DRM_MODE_ROTATE_270))
return x_limit - x - 1;
return x;
}
static int get_limit(const struct vkms_frame_info *frame_info, struct line_buffer *stage_buffer)
{
- if (frame_info->rotation & DRM_MODE_ROTATE_90)
+ if (drm_rotation_90_or_270(frame_info->rotation))
return min_t(size_t, drm_rect_height(&frame_info->dst), stage_buffer->n_pixels);
return min_t(size_t, drm_rect_width(&frame_info->dst), stage_buffer->n_pixels);
}
static void *get_src_pixels(const struct vkms_frame_info *frame_info, int x, int y, int pixel_size)
{
- if (frame_info->rotation & DRM_MODE_ROTATE_90)
+ if (drm_rotation_90_or_270(frame_info->rotation))
return get_packed_src_addr(frame_info, x + frame_info->dst.y1) + pixel_size * y;
return get_packed_src_addr(frame_info, y) + pixel_size * x;
}
diff --git a/drivers/gpu/drm/vkms/vkms_plane.c b/drivers/gpu/drm/vkms/vkms_plane.c
index ce2ebe56f6e4..5f69e0efd85f 100644
--- a/drivers/gpu/drm/vkms/vkms_plane.c
+++ b/drivers/gpu/drm/vkms/vkms_plane.c
@@ -124,7 +124,8 @@ static void vkms_plane_atomic_update(struct drm_plane *plane,
frame_info->rotation = drm_rotation_simplify(new_state->rotation,
DRM_MODE_ROTATE_0 |
DRM_MODE_ROTATE_90 |
- DRM_MODE_ROTATE_180);
+ DRM_MODE_ROTATE_180 |
+ DRM_MODE_ROTATE_270);
drm_rect_rotate(&frame_info->dst, drm_rect_width(&frame_info->dst),
drm_rect_height(&frame_info->dst), frame_info->rotation);
@@ -241,7 +242,8 @@ struct vkms_plane *vkms_plane_init(struct vkms_device *vkmsdev,
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_180 |
+ DRM_MODE_ROTATE_270);
return plane;
}
--
2.39.2
