@@ -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>
@@ -22,6 +23,8 @@ static struct pixel_argb_u16 *get_out_buffer(const struct vkms_frame_info *frame
switch (frame_info->rotation & DRM_MODE_ROTATE_MASK) {
case DRM_MODE_ROTATE_90:
return out - frame_info->dst.y1;
+ case DRM_MODE_ROTATE_270:
+ return out + frame_info->dst.y1;
default:
return out + frame_info->dst.x1;
}
@@ -59,7 +62,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++) {
@@ -80,6 +83,10 @@ static int get_y_pos(struct vkms_frame_info *frame_info, int y)
if (y - frame_info->dst.x1 < 0)
return -1;
return frame_info->dst.x2 - 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;
}
@@ -87,7 +94,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 {
@@ -2,6 +2,8 @@
#include <linux/kernel.h>
#include <linux/minmax.h>
+
+#include <drm/drm_blend.h>
#include <drm/drm_rect.h>
#include <drm/drm_fixed.h>
@@ -44,14 +46,14 @@ 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 limit, int x)
{
- if (frame_info->rotation & DRM_MODE_REFLECT_X)
+ if (frame_info->rotation & (DRM_MODE_REFLECT_X | DRM_MODE_ROTATE_270))
return 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);
}
@@ -125,7 +127,7 @@ void vkms_compose_row(struct line_buffer *stage_buffer, struct vkms_plane_state
for (size_t x = 0; x < limit; x++, src_pixels += plane->frame_info->cpp) {
int x_pos = get_x_position(plane->frame_info, limit, x);
- if (plane->frame_info->rotation & DRM_MODE_ROTATE_90)
+ if (drm_rotation_90_or_270(plane->frame_info->rotation))
src_pixels = get_packed_src_addr(plane->frame_info, x
+ plane->frame_info->dst.y1)
+ plane->frame_info->cpp * y;
@@ -123,6 +123,7 @@ static void vkms_plane_atomic_update(struct drm_plane *plane,
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_270 |
DRM_MODE_REFLECT_X |
DRM_MODE_REFLECT_Y);
@@ -239,11 +240,7 @@ 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_REFLECT_X |
- DRM_MODE_REFLECT_Y);
+ DRM_MODE_ROTATE_MASK | DRM_MODE_REFLECT_MASK);
return plane;
}
Currently, vkms supports the rotate-90, rotate-180, reflect-x and reflect-y 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. Now, vkms supports all possible rotation values. Tested with igt@kms_rotation_crc@primary-rotation-270, and igt@kms_rotation_crc@sprite-rotation-270. Signed-off-by: Maíra Canal <mcanal@igalia.com> --- drivers/gpu/drm/vkms/vkms_composer.c | 11 +++++++++-- drivers/gpu/drm/vkms/vkms_formats.c | 8 +++++--- drivers/gpu/drm/vkms/vkms_plane.c | 7 ++----- 3 files changed, 16 insertions(+), 10 deletions(-)