From nobody Mon Feb 9 17:05:21 2026 Received: from smtpout-04.galae.net (smtpout-04.galae.net [185.171.202.116]) (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 439C12EBB88 for ; Wed, 29 Oct 2025 14:37:12 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=185.171.202.116 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1761748634; cv=none; b=C080daZZmJCBcB1cavsqjtUL47v0BwgnF4AtmYUBRCH63iwVuOKA9XSxDuUiMLFpuXfhEEh+1WjC0GMRoizVIiAIFpZtnDoxoS35o/XczW5S/hNG5/db47s1uZjvt6DkuDxri6suNYg2Hwo2i3R1IwfSjYSkamNL7G3AOCb7Zw0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1761748634; c=relaxed/simple; bh=fjA3uHrWGPIdRuzypNSgwDb9BsOZZE8SEPcDqjBca6M=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=OxQJZEAk41BLmZsbbbygDMzswo9+TA4PDhIGsQBG1F/B/ixYMlLgLaX60FrVvtoRPZPzraZJeJ37Q++oO1satiaKqE8H4MOl/Gn6kbsCDletgbyoNMffXokzFsNPwH05Dae69IE/JeDTNdGz5S6xpYgO/4ksLrEvdqTK9pjef10= 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=O1WGgp4i; arc=none smtp.client-ip=185.171.202.116 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="O1WGgp4i" Received: from smtpout-01.galae.net (smtpout-01.galae.net [212.83.139.233]) by smtpout-04.galae.net (Postfix) with ESMTPS id B1D30C0DA84; Wed, 29 Oct 2025 14:36:50 +0000 (UTC) Received: from mail.galae.net (mail.galae.net [212.83.136.155]) by smtpout-01.galae.net (Postfix) with ESMTPS id 155D1606E8; Wed, 29 Oct 2025 14:37:11 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) by localhost (Mailerdaemon) with ESMTPSA id D3D5A117F81B5; Wed, 29 Oct 2025 15:37:08 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bootlin.com; s=dkim; t=1761748630; h=from:subject:date:message-id:to:cc:mime-version:content-type: content-transfer-encoding:in-reply-to:references; bh=EiYlyg9skF8q1c98aSDi7YMXuCRISp0a8Q6aImyKbJc=; b=O1WGgp4iWC+282lp+6Ag3yaI5ibygLHhDUd4DAWBxhrbsTgQMtOgadZ5fwbd04dHPe1553 tw2KaSouienGulcBamSanE+UpzwcsqgOHeIAOKjXC5Pf86GcP0r5YEf15/t6gfUW+i5TGp XpojZ1PPqwceWlLg9l1plhFfySKXcIXatGiWB2O9CjuHZO8fXMPKEw1eaRQ0j4wIaR2VL4 6ZtKu5BGRu0LyrZXbR56zhlyO79mOnz750E5wbMUdF7r+KHkEq+MSZ5CL0mKV/AHo4pak0 Ej4Pck3edLqMH59lJms77G4yINeKPRYFps2E/m2XgN5wgq5P354FiaGm98l2qw== From: Louis Chauvet Date: Wed, 29 Oct 2025 15:36:48 +0100 Subject: [PATCH RESEND v2 11/32] drm/vkms: Introduce config for plane color encoding 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-11-a49a2d4cba26@bootlin.com> References: <20251029-vkms-all-config-v2-0-a49a2d4cba26@bootlin.com> In-Reply-To: <20251029-vkms-all-config-v2-0-a49a2d4cba26@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=11725; i=louis.chauvet@bootlin.com; h=from:subject:message-id; bh=fjA3uHrWGPIdRuzypNSgwDb9BsOZZE8SEPcDqjBca6M=; b=owEBbQKS/ZANAwAKASCtLsZbECziAcsmYgBpAiZ7q1KmHgzT++39u1P0ouPt3aF+zh8cuiIty 5Vv1pNDKBqJAjMEAAEKAB0WIQRPj7g/vng8MQxQWQQgrS7GWxAs4gUCaQImewAKCRAgrS7GWxAs 4kTkD/9E1o72yJS1QTsOvJqGaDRSJqh9o8XdeTRsTENG6p2qsBrqJDwMnkeCgl3CSaEarVF4tbu KWKKXMsoJnJ1oXpg3wL3IzQRSQqqZc6ArnOM8RFhp76NqUyv7GMkrfBBWUNiX9lFqbZy1mxawL/ I+68QFdZf/b0IzLHifN3cSLkqHHY0uC8CAeu68LbFyrGGlU0slcEZau+8QQ8Pe5nLTrzRC81IEK 2JeNY0q8sIgX3+rOZx68lG8PZ5M7xpM6eLkQ8GDNPyogwempMNCKMMXHw8jeRm/ZQQMF4/KbnK9 xyRxxGH6iJgmjUItbTuZXZ0RohGMQf63Yiz7XYf4BCt/wplCevzGf2bg3t6frA1t8Qz1AIOlAQR q1/INCJZsRosR6l4v2CtwSDBjTMrHVlyNtFf6VecRK0Phgd/6ppKjVamo6T/N/YjztcDQk9K7Mt 5PlXi3AcDK4B7hG11yiADs0PCS3nFzvmnvMKtpY+lWFRAgAC6tESzEbG1uwsJvnJ7lFy2PhtzM3 REE6GG4F1NTDSCxC3T11aommyo41t5LO33ZUUTm2Qykz8D8y1soKmBRhPqOQd/26sE9VU8KKZg/ FgX4zAnUYojVEhfvTdqYQZXTDlFwp1SYHU4E8mjOzUVwytsALuoPAunEx5geWlsRQ2B5rsErzEN Sc8lQqVGTw2tL3A== X-Developer-Key: i=louis.chauvet@bootlin.com; a=openpgp; fpr=8B7104AE9A272D6693F527F2EC1883F55E0B40A5 X-Last-TLS-Session-Version: TLSv1.3 VKMS driver supports all the color encoding on planes, but for testing it can be useful to only advertise few of them. This new configuration interface will allow configuring the color encoding per planes. Signed-off-by: Louis Chauvet --- drivers/gpu/drm/vkms/tests/vkms_config_test.c | 51 +++++++++++++++++++++ drivers/gpu/drm/vkms/vkms_config.c | 32 ++++++++++++++ drivers/gpu/drm/vkms/vkms_config.h | 64 +++++++++++++++++++++++= ++++ drivers/gpu/drm/vkms/vkms_plane.c | 15 +++---- 4 files changed, 154 insertions(+), 8 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 8d805084ad96..e9bc051188f9 100644 --- a/drivers/gpu/drm/vkms/tests/vkms_config_test.c +++ b/drivers/gpu/drm/vkms/tests/vkms_config_test.c @@ -179,6 +179,14 @@ static void vkms_config_test_default_config(struct kun= it *test) KUNIT_EXPECT_EQ(test, vkms_config_plane_get_default_rotation(plane_cfg), DRM_MODE_ROTATE_0); + KUNIT_EXPECT_EQ(test, + vkms_config_plane_get_supported_color_encodings(plane_cfg), + BIT(DRM_COLOR_YCBCR_BT601) | + BIT(DRM_COLOR_YCBCR_BT709) | + BIT(DRM_COLOR_YCBCR_BT2020)); + KUNIT_EXPECT_EQ(test, + vkms_config_plane_get_default_color_encoding(plane_cfg), + DRM_COLOR_YCBCR_BT601); } =20 /* Encoders */ @@ -513,6 +521,48 @@ static void vkms_config_test_valid_plane_rotations(str= uct kunit *test) vkms_config_destroy(config); } =20 +static void vkms_config_test_valid_plane_color_encoding(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, all color encoding supported */ + vkms_config_plane_set_supported_color_encodings(plane_cfg, + BIT(DRM_COLOR_YCBCR_BT601) | + BIT(DRM_COLOR_YCBCR_BT709) | + BIT(DRM_COLOR_YCBCR_BT2020)); + vkms_config_plane_set_default_color_encoding(plane_cfg, DRM_COLOR_YCBCR_B= T601); + KUNIT_EXPECT_TRUE(test, vkms_config_valid_plane_color_encoding(config, pl= ane_cfg)); + KUNIT_EXPECT_TRUE(test, vkms_config_is_valid(config)); + + /* Invalid, default color encoding is not supported */ + vkms_config_plane_set_supported_color_encodings(plane_cfg, + BIT(DRM_COLOR_YCBCR_BT601) | + BIT(DRM_COLOR_YCBCR_BT2020)); + vkms_config_plane_set_default_color_encoding(plane_cfg, DRM_COLOR_YCBCR_B= T709); + KUNIT_EXPECT_FALSE(test, vkms_config_valid_plane_color_encoding(config, p= lane_cfg)); + KUNIT_EXPECT_FALSE(test, vkms_config_is_valid(config)); + + /* Valid, no supported or color encoding */ + vkms_config_plane_set_supported_color_encodings(plane_cfg, 0); + vkms_config_plane_set_default_color_encoding(plane_cfg, 0); + KUNIT_EXPECT_TRUE(test, vkms_config_valid_plane_color_encoding(config, pl= ane_cfg)); + KUNIT_EXPECT_TRUE(test, vkms_config_is_valid(config)); + + /* Valid, if no supported color encoding, default is ignored */ + vkms_config_plane_set_supported_color_encodings(plane_cfg, 0); + vkms_config_plane_set_default_color_encoding(plane_cfg, DRM_COLOR_YCBCR_B= T601); + KUNIT_EXPECT_TRUE(test, vkms_config_valid_plane_color_encoding(config, pl= ane_cfg)); + KUNIT_EXPECT_TRUE(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; @@ -1036,6 +1086,7 @@ static struct kunit_case vkms_config_test_cases[] =3D= { 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_color_encoding), 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 dd951db88888..6a3d52c1141d 100644 --- a/drivers/gpu/drm/vkms/vkms_config.c +++ b/drivers/gpu/drm/vkms/vkms_config.c @@ -175,6 +175,25 @@ bool vkms_config_valid_plane_rotation(const struct vkm= s_config *config, } EXPORT_SYMBOL_IF_KUNIT(vkms_config_valid_plane_rotation); =20 +VISIBLE_IF_KUNIT +bool vkms_config_valid_plane_color_encoding(const struct vkms_config *conf= ig, + const struct vkms_config_plane *plane_cfg) +{ + struct drm_device *dev =3D config->dev ? &config->dev->drm : NULL; + + if (vkms_config_plane_get_supported_color_encodings(plane_cfg)) { + if ((BIT(vkms_config_plane_get_default_color_encoding(plane_cfg)) & + vkms_config_plane_get_supported_color_encodings(plane_cfg)) !=3D + BIT(vkms_config_plane_get_default_color_encoding(plane_cfg))) { + drm_info(dev, "Configured default color encoding is not supported by th= e plane\n"); + return false; + } + } + + return true; +} +EXPORT_SYMBOL_IF_KUNIT(vkms_config_valid_plane_color_encoding); + static bool valid_planes_for_crtc(const struct vkms_config *config, struct vkms_config_crtc *crtc_cfg) { @@ -337,6 +356,9 @@ bool vkms_config_is_valid(const struct vkms_config *con= fig) vkms_config_for_each_plane(config, plane_cfg) { if (!vkms_config_valid_plane_rotation(config, plane_cfg)) return false; + + if (!vkms_config_valid_plane_color_encoding(config, plane_cfg)) + return false; } =20 if (!valid_plane_number(config)) @@ -413,6 +435,12 @@ static int vkms_config_show(struct seq_file *m, void *= data) show_bitfield(m, vkms_config_plane_get_default_rotation(plane_cfg), drm_get_rotation_name); seq_puts(m, "\n"); + seq_puts(m, "\tsupported color encoding=3D"); + show_bitfield(m, vkms_config_plane_get_supported_color_encodings(plane_c= fg), + drm_get_color_encoding_name); + seq_puts(m, "\n"); + seq_printf(m, "\tdefault color encoding=3D%s\n", + drm_get_color_encoding_name(vkms_config_plane_get_default_color_enco= ding(plane_cfg))); } =20 vkms_config_for_each_crtc(vkmsdev->config, crtc_cfg) { @@ -457,6 +485,10 @@ struct vkms_config_plane *vkms_config_create_plane(str= uct vkms_config *config) 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); + vkms_config_plane_set_supported_color_encodings(plane_cfg, BIT(DRM_COLOR_= YCBCR_BT601) | + BIT(DRM_COLOR_YCBCR_BT709) | + BIT(DRM_COLOR_YCBCR_BT2020)); + vkms_config_plane_set_default_color_encoding(plane_cfg, DRM_COLOR_YCBCR_B= T601); =20 xa_init_flags(&plane_cfg->possible_crtcs, XA_FLAGS_ALLOC); =20 diff --git a/drivers/gpu/drm/vkms/vkms_config.h b/drivers/gpu/drm/vkms/vkms= _config.h index 8d413e02180a..d740c9478256 100644 --- a/drivers/gpu/drm/vkms/vkms_config.h +++ b/drivers/gpu/drm/vkms/vkms_config.h @@ -45,6 +45,8 @@ struct vkms_config { * 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 * must be managed by other means. + * @default_color_encoding: Default color encoding that should be used by = this plane + * @supported_color_encodings: Color encoding that this plane will support */ struct vkms_config_plane { struct list_head link; @@ -54,6 +56,8 @@ struct vkms_config_plane { enum drm_plane_type type; unsigned int default_rotation; unsigned int supported_rotations; + enum drm_color_encoding default_color_encoding; + unsigned int supported_color_encodings; struct xarray possible_crtcs; =20 /* Internal usage */ @@ -349,6 +353,66 @@ bool vkms_config_valid_plane_rotation(const struct vkm= s_config *config, const struct vkms_config_plane *plane_cfg); #endif =20 +/** + * vkms_config_plane_get_default_color_encoding() - Get the default color = encoding for a plane + * @plane_cfg: Plane to get the default color encoding from + * + * Returns: + * The default color encoding for the plane + */ +static inline enum drm_color_encoding +vkms_config_plane_get_default_color_encoding(const struct vkms_config_plan= e *plane_cfg) +{ + return plane_cfg->default_color_encoding; +} + +/** + * vkms_config_plane_set_default_color_encoding() - Set the default color = encoding for a plane + * @plane_cfg: Plane to set the default color encoding to + * @default_color_encoding: New default color encoding for the plane + */ +static inline void +vkms_config_plane_set_default_color_encoding(struct vkms_config_plane *pla= ne_cfg, + enum drm_color_encoding default_color_encoding) +{ + plane_cfg->default_color_encoding =3D default_color_encoding; +} + +/** + * vkms_config_plane_get_supported_color_encodings() - Get the supported c= olor encodings for a plane + * @plane_cfg: Plane to get the supported color encodings from + * + * Returns: + * The supported color encodings for the plane. Each set bit correspond to= a value of enum + * drm_color_encoding: BIT(DRM_COLOR_YCBCR_BT601) | BIT(DRM_COLOR_YCBCR_BT= 709) means that + * DRM_COLOR_YCBCR_BT601 and DRM_COLOR_YCBCR_BT709 are supported. + */ +static inline unsigned int +vkms_config_plane_get_supported_color_encodings(const struct vkms_config_p= lane *plane_cfg) +{ + return plane_cfg->supported_color_encodings; +} + +/** + * vkms_config_plane_set_supported_color_encodings() - Set the supported c= olor encodings for a plane + * @plane_cfg: Plane to set the supported color encodings to + * @supported_color_encodings: New supported color encodings for the plane= . Each set bit corresponds + * to a value of enum drm_color_encoding: + * BIT(DRM_COLOR_YCBCR_BT601) | BIT(DRM_COLOR_Y= CBCR_BT709) means that + * DRM_COLOR_YCBCR_BT601 and DRM_COLOR_YCBCR_BT= 709 are supported. + */ +static inline void +vkms_config_plane_set_supported_color_encodings(struct vkms_config_plane *= plane_cfg, + unsigned int supported_color_encodings) +{ + plane_cfg->supported_color_encodings =3D supported_color_encodings; +} + +#if IS_ENABLED(CONFIG_KUNIT) +bool vkms_config_valid_plane_color_encoding(const struct vkms_config *conf= ig, + 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 d147b70692fa..9550831be51a 100644 --- a/drivers/gpu/drm/vkms/vkms_plane.c +++ b/drivers/gpu/drm/vkms/vkms_plane.c @@ -238,14 +238,13 @@ struct vkms_plane *vkms_plane_init(struct vkms_device= *vkmsdev, 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) | - BIT(DRM_COLOR_YCBCR_BT709) | - BIT(DRM_COLOR_YCBCR_BT2020), - BIT(DRM_COLOR_YCBCR_LIMITED_RANGE) | - BIT(DRM_COLOR_YCBCR_FULL_RANGE), - DRM_COLOR_YCBCR_BT601, - DRM_COLOR_YCBCR_FULL_RANGE); + if (vkms_config_plane_get_supported_color_encodings(config) !=3D 0) + drm_plane_create_color_properties(&plane->base, + vkms_config_plane_get_supported_color_encodings(config), + BIT(DRM_COLOR_YCBCR_LIMITED_RANGE) | + BIT(DRM_COLOR_YCBCR_FULL_RANGE), + vkms_config_plane_get_default_color_encoding(config), + DRM_COLOR_YCBCR_FULL_RANGE); =20 return plane; } --=20 2.51.0