@@ -82,6 +82,8 @@ struct vkms_config_plane *vkms_config_create_plane(struct vkms_config *vkms_conf
return NULL;
vkms_config_overlay->type = DRM_PLANE_TYPE_OVERLAY;
+ vkms_config_overlay->supported_rotations = DRM_MODE_ROTATE_MASK | DRM_MODE_REFLECT_MASK;
+ vkms_config_overlay->default_rotation = DRM_MODE_ROTATE_0;
list_add(&vkms_config_overlay->link, &vkms_config->planes);
@@ -118,6 +120,11 @@ bool vkms_config_is_valid(struct vkms_config *config)
bool has_primary = false;
list_for_each_entry(config_plane, &config->planes, link) {
+ // Default rotation not in supported rotations
+ if ((config_plane->default_rotation & config_plane->supported_rotations) !=
+ config_plane->default_rotation)
+ return false;
+
if (config_plane->type == DRM_PLANE_TYPE_PRIMARY) {
// Multiple primary planes for only one CRTC
if (has_primary)
@@ -151,6 +158,8 @@ static int vkms_config_show(struct seq_file *m, void *data)
seq_puts(m, "plane:\n");
seq_printf(m, "\tname: %s\n", config_plane->name);
seq_printf(m, "\ttype: %d\n", config_plane->type);
+ seq_printf(m, "\tsupported rotations: 0x%x\n", config_plane->supported_rotations);
+ seq_printf(m, "\tdefault rotation: 0x%x\n", config_plane->default_rotation);
}
return 0;
@@ -30,6 +30,8 @@ struct vkms_config {
* @name: Name of the plane
* @type: Type of the plane. The creator of configuration needs to ensures that at least one
* plane is primary.
+ * @default_rotation: Default rotation that should be used by this plane
+ * @supported_rotation: Rotation that this plane will support
* @plane: Internal usage. This pointer should never be considered as valid. It can be used to
* store a temporary reference to a vkms plane during device creation. This pointer is
* not managed by the configuration and must be managed by other means.
@@ -39,6 +41,8 @@ struct vkms_config_plane {
char *name;
enum drm_plane_type type;
+ unsigned int default_rotation;
+ unsigned int supported_rotations;
/* Internal usage */
struct vkms_plane *plane;
@@ -202,8 +202,9 @@ struct vkms_plane *vkms_plane_init(struct vkms_device *vkmsdev,
drm_plane_helper_add(&plane->base, &vkms_plane_helper_funcs);
- drm_plane_create_rotation_property(&plane->base, DRM_MODE_ROTATE_0,
- DRM_MODE_ROTATE_MASK | DRM_MODE_REFLECT_MASK);
+ drm_plane_create_rotation_property(&plane->base,
+ config->default_rotation,
+ config->supported_rotations);
return plane;
}
VKMS driver supports all the rotation on planes, but for testing it can be useful to only advertise few of them. This new configuration interface will allow configuring the rotation per planes. Signed-off-by: Louis Chauvet <louis.chauvet@bootlin.com> --- drivers/gpu/drm/vkms/vkms_config.c | 9 +++++++++ drivers/gpu/drm/vkms/vkms_config.h | 4 ++++ drivers/gpu/drm/vkms/vkms_plane.c | 5 +++-- 3 files changed, 16 insertions(+), 2 deletions(-)