From nobody Mon Feb 9 07:23:51 2026 Received: from smtpout-02.galae.net (smtpout-02.galae.net [185.246.84.56]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 9264833B6F2; Wed, 29 Oct 2025 13:30:40 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=185.246.84.56 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1761744643; cv=none; b=T2XFXuIzASLr+WN3nZ8Yt+iU7YyV85GtNpp7LmUvnEVzWx7VTBrXL3hKXoTR8qGV1sxpG5/jJbaIf6lmhsCbjPLyVfB+pyKcIci0liY5Had+eEAqVC964Hdj+MOIkcZgGv+BRIDJtvz9kMTm4F+7Q+AdesWtEfcAG5z7inXmFKE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1761744643; c=relaxed/simple; bh=EWVgtj5CqLfQMmBn4PxWSe+Ra69UhyW4oe1nnFTIWxY=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=ASfy2Kt8s5LxUIhDpXr1EssP0sJUrGxvT22YlvvCdTzH197os5DysXYWbYf07OSL9M9Bld/ZmwvVIbxPnrnmHRTU95ZQ10DZtGPigbGJsNbn92jXGk8pqgP4cDqYzNVP/Nm+33affJBkfpzC5ciTIQtgC+3tSG+FAm++WxE2P7s= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=bootlin.com; spf=pass smtp.mailfrom=bootlin.com; dkim=pass (2048-bit key) header.d=bootlin.com header.i=@bootlin.com header.b=XlPjhOwF; arc=none smtp.client-ip=185.246.84.56 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=bootlin.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=bootlin.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=bootlin.com header.i=@bootlin.com header.b="XlPjhOwF" Received: from smtpout-01.galae.net (smtpout-01.galae.net [212.83.139.233]) by smtpout-02.galae.net (Postfix) with ESMTPS id 3324B1A16EB; Wed, 29 Oct 2025 13:30:39 +0000 (UTC) Received: from mail.galae.net (mail.galae.net [212.83.136.155]) by smtpout-01.galae.net (Postfix) with ESMTPS id 080CE606E8; Wed, 29 Oct 2025 13:30:39 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) by localhost (Mailerdaemon) with ESMTPSA id B06D6117F809C; Wed, 29 Oct 2025 14:30:36 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bootlin.com; s=dkim; t=1761744638; h=from:subject:date:message-id:to:cc:mime-version:content-type: content-transfer-encoding:in-reply-to:references; bh=DiQB9CvqPCMSCmfCQm+BM0yWoh/K98ULkreAzLkudAw=; b=XlPjhOwFp2gY+DrFIuWnfXi5LaWcpT/qRdWEhKNszh85ZKmBXRHBTzBLKlEHqmXo0SpV8o hSKGcQ3YrPOsx1lfgC52fyQa7AamjI78NmYpI99o1av02C7NSNcclbuXrp+5AJ9ag3LkAc MLZqItmch8NSKi3saRaT/RX1PoQ7q31NU6z7JEhBz8JqEbgwxyfIalgtnUV87ag4jqy91L 42tVsUoCPrWy3LcN6+5snJ8N+4L+7Ji8Ytsmko+RLa/EKQESSrnU7gc+nwXEROOkGfwMYC TCIdikWbnCASFMQ6cam6vVRiCY1E+YR66wEm0QRJs67i6uS3ZEjvI0xsRdlH9w== From: Louis Chauvet Date: Wed, 29 Oct 2025 14:30:18 +0100 Subject: [PATCH v2 08/32] drm/vkms: Introduce config for plane rotation Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20251029-vkms-all-config-v2-8-be20b9bf146e@bootlin.com> References: <20251029-vkms-all-config-v2-0-be20b9bf146e@bootlin.com> In-Reply-To: <20251029-vkms-all-config-v2-0-be20b9bf146e@bootlin.com> To: Haneen Mohammed , Simona Vetter , Melissa Wen , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , jose.exposito89@gmail.com, Jonathan Corbet Cc: victoria@system76.com, sebastian.wick@redhat.com, victoria@system76.com, airlied@gmail.com, thomas.petazzoni@bootlin.com, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, linux-doc@vger.kernel.org, Louis Chauvet X-Mailer: b4 0.14.3 X-Developer-Signature: v=1; a=openpgp-sha256; l=11951; i=louis.chauvet@bootlin.com; h=from:subject:message-id; bh=EWVgtj5CqLfQMmBn4PxWSe+Ra69UhyW4oe1nnFTIWxY=; b=owEBbQKS/ZANAwAKASCtLsZbECziAcsmYgBpAhbq/ORowCo53sfuuxJ30YiUvaC6Y23nfGble bgFxdQXqE2JAjMEAAEKAB0WIQRPj7g/vng8MQxQWQQgrS7GWxAs4gUCaQIW6gAKCRAgrS7GWxAs 4qqhD/4smtYR4onzZutjdlzcVrS+BJPQ3E6w8VGV1CnkQbqeJGl9huNOpAEJudxipLEKLYhlbe4 7R7esZbDu8SecpbrvIHu5ae+axsc2Ouz08WPVQDtlyfRQgcUJ3Vq5VVtL3vOyyF2pVylL6NjfdR 0327Yw+0FXjqXAHDMEqZpXGZ8ms9SMaVWi2AXseCqn00mmXWyE28/BLk1G4Mm4HyEodi7LHll1j COtw3lWW6dx7ur24LzzfCKhsRvFWhE7fDoEvlsDriDmHMfUCHIil+pquG3KIxDZ0i9rt3QHuefu UxoR+3b0FD/2rkvbN08v7ZP3bLfQMKX3oXuwWcWX6QE5k1vvR/7LQ3wZ3BRmn9f/i8T999FCpns HvvLvhg/96baPBff8cV2dyOOriFpVl/oEwVpA/PCZjVUOIwRL3/ccxnRcqXLjIzA6K0GvP82Zzw Zv9fBY+m2uqUSIExJv7blZ/rjM8JfYYxAAlZOHGk7B719rKn8e1NRHedQdYrUFH6GrmrPg4nMqw +iUj4URbYuOgKaLiuixPYbazF2wPDYJ53JAffoKYY7yIl6zNJX9tO33G5cT8HHwA9d/qxqpe2yh H8DTjMsK8bfBSoqStZa23h54qv+rR4ScSMf+KpkajnTIGF0mmndj3pBn/p67UmGgki2fFMSYPgZ 90r08f6CPob5m8g== X-Developer-Key: i=louis.chauvet@bootlin.com; a=openpgp; fpr=8B7104AE9A272D6693F527F2EC1883F55E0B40A5 X-Last-TLS-Session-Version: TLSv1.3 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 --- drivers/gpu/drm/vkms/tests/vkms_config_test.c | 46 +++++++++++++++++++ drivers/gpu/drm/vkms/vkms_config.c | 63 +++++++++++++++++++++++= ++++ drivers/gpu/drm/vkms/vkms_config.h | 59 +++++++++++++++++++++++= ++ drivers/gpu/drm/vkms/vkms_plane.c | 6 ++- 4 files changed, 172 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/vkms/tests/vkms_config_test.c b/drivers/gpu/dr= m/vkms/tests/vkms_config_test.c index d75a6252e4d2..8d805084ad96 100644 --- a/drivers/gpu/drm/vkms/tests/vkms_config_test.c +++ b/drivers/gpu/drm/vkms/tests/vkms_config_test.c @@ -1,5 +1,6 @@ // SPDX-License-Identifier: GPL-2.0+ =20 +#include #include =20 #include "../vkms_config.h" @@ -172,6 +173,12 @@ static void vkms_config_test_default_config(struct kun= it *test) n_possible_crtcs++; } KUNIT_EXPECT_EQ(test, n_possible_crtcs, 1); + KUNIT_EXPECT_EQ(test, + vkms_config_plane_get_supported_rotations(plane_cfg), + DRM_MODE_ROTATE_MASK | DRM_MODE_REFLECT_MASK); + KUNIT_EXPECT_EQ(test, + vkms_config_plane_get_default_rotation(plane_cfg), + DRM_MODE_ROTATE_0); } =20 /* Encoders */ @@ -468,6 +475,44 @@ static void vkms_config_test_valid_plane_type(struct k= unit *test) vkms_config_destroy(config); } =20 +static void vkms_config_test_valid_plane_rotations(struct kunit *test) +{ + struct vkms_config *config; + struct vkms_config_plane *plane_cfg; + + config =3D vkms_config_default_create(false, false, false); + KUNIT_ASSERT_NOT_ERR_OR_NULL(test, config); + + plane_cfg =3D get_first_plane(config); + + /* Valid, no rotation, no reflection */ + vkms_config_plane_set_supported_rotations(plane_cfg, DRM_MODE_ROTATE_0); + vkms_config_plane_set_default_rotation(plane_cfg, DRM_MODE_ROTATE_0); + KUNIT_EXPECT_TRUE(test, vkms_config_valid_plane_rotation(config, plane_cf= g)); + KUNIT_EXPECT_TRUE(test, vkms_config_is_valid(config)); + + /* Invalid, default rotation is not supported */ + vkms_config_plane_set_supported_rotations(plane_cfg, DRM_MODE_ROTATE_0); + vkms_config_plane_set_default_rotation(plane_cfg, DRM_MODE_ROTATE_90); + KUNIT_EXPECT_FALSE(test, vkms_config_valid_plane_rotation(config, plane_c= fg)); + KUNIT_EXPECT_FALSE(test, vkms_config_is_valid(config)); + + /* Invalid, supported rotations must contains at least one rotation */ + vkms_config_plane_set_supported_rotations(plane_cfg, DRM_MODE_REFLECT_MAS= K); + vkms_config_plane_set_default_rotation(plane_cfg, DRM_MODE_REFLECT_X | DR= M_MODE_ROTATE_0); + KUNIT_EXPECT_FALSE(test, vkms_config_valid_plane_rotation(config, plane_c= fg)); + KUNIT_EXPECT_FALSE(test, vkms_config_is_valid(config)); + + /* Invalid, default rotation must contains at least one rotation */ + vkms_config_plane_set_supported_rotations(plane_cfg, + DRM_MODE_REFLECT_MASK | DRM_MODE_ROTATE_0); + vkms_config_plane_set_default_rotation(plane_cfg, DRM_MODE_REFLECT_X); + KUNIT_EXPECT_FALSE(test, vkms_config_valid_plane_rotation(config, plane_c= fg)); + KUNIT_EXPECT_FALSE(test, vkms_config_is_valid(config)); + + vkms_config_destroy(config); +} + static void vkms_config_test_valid_plane_possible_crtcs(struct kunit *test) { struct vkms_config *config; @@ -990,6 +1035,7 @@ static struct kunit_case vkms_config_test_cases[] =3D { KUNIT_CASE(vkms_config_test_get_connectors), KUNIT_CASE(vkms_config_test_invalid_plane_number), KUNIT_CASE(vkms_config_test_valid_plane_type), + KUNIT_CASE(vkms_config_test_valid_plane_rotations), KUNIT_CASE(vkms_config_test_valid_plane_possible_crtcs), KUNIT_CASE(vkms_config_test_invalid_crtc_number), KUNIT_CASE(vkms_config_test_invalid_encoder_number), diff --git a/drivers/gpu/drm/vkms/vkms_config.c b/drivers/gpu/drm/vkms/vkms= _config.c index bfafb5d2504d..dd951db88888 100644 --- a/drivers/gpu/drm/vkms/vkms_config.c +++ b/drivers/gpu/drm/vkms/vkms_config.c @@ -3,7 +3,9 @@ #include #include =20 +#include #include +#include #include #include #include @@ -146,6 +148,33 @@ static bool valid_plane_number(const struct vkms_confi= g *config) return true; } =20 +VISIBLE_IF_KUNIT +bool vkms_config_valid_plane_rotation(const struct vkms_config *config, + const struct vkms_config_plane *plane_cfg) +{ + struct drm_device *dev =3D config->dev ? &config->dev->drm : NULL; + + if ((vkms_config_plane_get_default_rotation(plane_cfg) & + vkms_config_plane_get_supported_rotations(plane_cfg)) !=3D + vkms_config_plane_get_default_rotation(plane_cfg)) { + drm_info(dev, "Configured default rotation is not supported by the plane= \n"); + return false; + } + + if ((vkms_config_plane_get_default_rotation(plane_cfg) & DRM_MODE_ROTATE_= MASK) =3D=3D 0) { + drm_info(dev, "Configured default rotation must contains at least one po= ssible rotation\n"); + return false; + } + + if ((vkms_config_plane_get_supported_rotations(plane_cfg) & DRM_MODE_ROTA= TE_MASK) =3D=3D 0) { + drm_info(dev, "Configured supported rotations must contains at least one= possible rotation\n"); + return false; + } + + return true; +} +EXPORT_SYMBOL_IF_KUNIT(vkms_config_valid_plane_rotation); + static bool valid_planes_for_crtc(const struct vkms_config *config, struct vkms_config_crtc *crtc_cfg) { @@ -303,6 +332,12 @@ static bool valid_connector_possible_encoders(const st= ruct vkms_config *config) bool vkms_config_is_valid(const struct vkms_config *config) { struct vkms_config_crtc *crtc_cfg; + struct vkms_config_plane *plane_cfg; + + vkms_config_for_each_plane(config, plane_cfg) { + if (!vkms_config_valid_plane_rotation(config, plane_cfg)) + return false; + } =20 if (!valid_plane_number(config)) return false; @@ -334,6 +369,22 @@ bool vkms_config_is_valid(const struct vkms_config *co= nfig) } EXPORT_SYMBOL_IF_KUNIT(vkms_config_is_valid); =20 +static void show_bitfield(struct seq_file *m, uint32_t value, const char *= callback(unsigned int)) +{ + u32 offset =3D 0; + bool first =3D true; + + while (value >=3D BIT(offset) && offset < 32) { + if (value & BIT(offset)) { + if (!first) + seq_puts(m, ","); + seq_printf(m, callback(offset)); + first =3D false; + } + offset +=3D 1; + } +} + static int vkms_config_show(struct seq_file *m, void *data) { struct drm_debugfs_entry *entry =3D m->private; @@ -354,6 +405,14 @@ static int vkms_config_show(struct seq_file *m, void *= data) drm_get_plane_type_name(vkms_config_plane_get_type(plane_cfg))); seq_printf(m, "\tname=3D%s\n", vkms_config_plane_get_name(plane_cfg)); + seq_puts(m, "\tsupported rotations=3D"); + show_bitfield(m, vkms_config_plane_get_supported_rotations(plane_cfg), + drm_get_rotation_name); + seq_puts(m, "\n"); + seq_puts(m, "\tdefault rotation=3D"); + show_bitfield(m, vkms_config_plane_get_default_rotation(plane_cfg), + drm_get_rotation_name); + seq_puts(m, "\n"); } =20 vkms_config_for_each_crtc(vkmsdev->config, crtc_cfg) { @@ -395,6 +454,10 @@ struct vkms_config_plane *vkms_config_create_plane(str= uct vkms_config *config) plane_cfg->config =3D config; vkms_config_plane_set_type(plane_cfg, DRM_PLANE_TYPE_OVERLAY); vkms_config_plane_set_name(plane_cfg, NULL); + vkms_config_plane_set_supported_rotations(plane_cfg, + DRM_MODE_ROTATE_MASK | DRM_MODE_REFLECT_MASK); + vkms_config_plane_set_default_rotation(plane_cfg, DRM_MODE_ROTATE_0); + xa_init_flags(&plane_cfg->possible_crtcs, XA_FLAGS_ALLOC); =20 list_add_tail(&plane_cfg->link, &config->planes); diff --git a/drivers/gpu/drm/vkms/vkms_config.h b/drivers/gpu/drm/vkms/vkms= _config.h index 57342db5795a..8d413e02180a 100644 --- a/drivers/gpu/drm/vkms/vkms_config.h +++ b/drivers/gpu/drm/vkms/vkms_config.h @@ -39,6 +39,8 @@ struct vkms_config { * @type: Type of the plane. The creator of configuration needs to ensures= that * at least one primary plane is present. * @possible_crtcs: Array of CRTCs that can be used with this plane + * @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 vali= d. * It can be used to store a temporary reference to a VKMS plane d= uring * device creation. This pointer is not managed by the configurati= on and @@ -50,6 +52,8 @@ struct vkms_config_plane { =20 const char *name; enum drm_plane_type type; + unsigned int default_rotation; + unsigned int supported_rotations; struct xarray possible_crtcs; =20 /* Internal usage */ @@ -290,6 +294,61 @@ vkms_config_plane_set_type(struct vkms_config_plane *p= lane_cfg, plane_cfg->type =3D type; } =20 +/** + * vkms_config_plane_get_default_rotation() - Get the default rotation for= a plane + * @plane_cfg: Plane to get the default rotation from + * + * Returns: + * The default rotation for the plane. + */ +static inline unsigned int +vkms_config_plane_get_default_rotation(const struct vkms_config_plane *pla= ne_cfg) +{ + return plane_cfg->default_rotation; +} + +/** + * vkms_config_plane_set_default_rotation() - Set the default rotation for= a plane + * @plane_cfg: Plane to set the default rotation to + * @default_rotation: New default rotation for the plane + */ +static inline void +vkms_config_plane_set_default_rotation(struct vkms_config_plane *plane_cfg, + unsigned int default_rotation) +{ + plane_cfg->default_rotation =3D default_rotation; +} + +/** + * vkms_config_plane_get_supported_rotations() - Get the supported rotatio= ns for a plane + * @plane_cfg: Plane to get the supported rotations from + * + * Returns: + * The supported rotations for the plane. + */ +static inline unsigned int +vkms_config_plane_get_supported_rotations(const struct vkms_config_plane *= plane_cfg) +{ + return plane_cfg->supported_rotations; +} + +/** + * vkms_config_plane_set_supported_rotations() - Set the supported rotatio= ns for a plane + * @plane_cfg: Plane to set the supported rotations to + * @supported_rotations: New supported rotations for the plane + */ +static inline void +vkms_config_plane_set_supported_rotations(struct vkms_config_plane *plane_= cfg, + unsigned int supported_rotations) +{ + plane_cfg->supported_rotations =3D supported_rotations; +} + +#if IS_ENABLED(CONFIG_KUNIT) +bool vkms_config_valid_plane_rotation(const struct vkms_config *config, + const struct vkms_config_plane *plane_cfg); +#endif + /** * vkms_config_plane_set_name() - Set the plane name * @plane_cfg: Plane to set the name to diff --git a/drivers/gpu/drm/vkms/vkms_plane.c b/drivers/gpu/drm/vkms/vkms_= plane.c index 73180cbb78b1..d147b70692fa 100644 --- a/drivers/gpu/drm/vkms/vkms_plane.c +++ b/drivers/gpu/drm/vkms/vkms_plane.c @@ -1,5 +1,6 @@ // SPDX-License-Identifier: GPL-2.0+ =20 +#include "vkms_config.h" #include =20 #include @@ -233,8 +234,9 @@ struct vkms_plane *vkms_plane_init(struct vkms_device *= vkmsdev, =20 drm_plane_helper_add(&plane->base, &vkms_plane_helper_funcs); =20 - 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, + vkms_config_plane_get_default_rotation(config), + vkms_config_plane_get_supported_rotations(config)); =20 drm_plane_create_color_properties(&plane->base, BIT(DRM_COLOR_YCBCR_BT601) | --=20 2.51.0