From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=185.246.84.56 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1795197878; b=H300zXIWTF6jrxgcU1kVSee3j+r2GCrvlFK1OiVz4JrJXiJAnxzuzvAWwGWUMvW7MlX4 Zwo7ppQ4I/jDyDx3FKo9x3W8SjE+qdzQRWV75tY8WGjYOMIPO1g/htrejVGYfMoZ6Uq9p kAtJPYh84RiVklCN1CqmBPrRunQ4DBiQ/33P20dk6TPhEsvPEqCFoYsGKgrOtYrjMig7P VLqA4nSyy3wYdcPCJ+vPqd8sUz9YJ8/RE1zfCD8XK8EmWGyHkrG3RSgNEwTGUq1/amZbt rsBR3r1FoxDogJC/nDVurNaxzRLwMSSNAorLdczIMsZdvXg5upwLZJGxWlL1Yt2Ay5Q== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1795197878; h=DMARC-Filter:Received:Received:Received:DKIM-Signature:From:Date: Subject:MIME-Version:Content-Type:Content-Transfer-Encoding: Message-Id:References:In-Reply-To:To:Cc:X-Mailer: X-Developer-Signature:X-Developer-Key:X-Last-TLS-Session-Version; bh=ICx4BThnWzLJY8ulzYzexmZCvMczADwc2z7Za4cF/qI=; b=0zzk4Q2yX8m33WWLWFIl7b4yHhUU3ZwDP0VWPbhUZg2VF3yB24FV0LzYDJvvjhOwbeia oJ6/5+YUmpdvT07xvZQSdSYtJXB0eVDV/09pTpNGqzuw0xAvHRX1aOkrs3hyFsftno1Z/ 7mCRfXPIx3u4zB23017DVT0PNKWbkM1pdQ5doXfA0tPrp5dabqSmEGyunxP+huofTavMl 66YeJoO5o9EyhhYyqDlL5Ma77WSe//Sd3FIIeQoz6N/tNnuafDPOHmgAr4Y4AdYet8iAg anKE8BjEEyNVUfzsUUUHCgdqghaRoqbZ1P1URSKVx/ZI46MBLijuaBD1WcZep5rlsIA== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass header.from=bootlin.com; spf=pass smtp.mailfrom=bootlin.com; dkim=pass header.d=bootlin.com header.i=@bootlin.com header.a=rsa-sha256 header.s=dkim header.b=VkQ6klue; arc=none smtp.remote-ip=185.246.84.56 Received: from smtpout-02.galae.net (smtpout-02.galae.net [185.246.84.56]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1) server-digest SHA256) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 93A1960A6F60 for ; Fri, 20 Nov 2026 18:04:37 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.2 smtp.subspace.kernel.org 93A1960A6F60 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.a=rsa-sha256 header.s=dkim header.b=VkQ6klue Received: from smtpout-01.galae.net (smtpout-01.galae.net [212.83.139.233]) by smtpout-02.galae.net (Postfix) with ESMTPS id 71CDE1A1757; Fri, 20 Nov 2026 18:04:36 +0000 (UTC) Received: from mail.galae.net (mail.galae.net [212.83.136.155]) by smtpout-01.galae.net (Postfix) with ESMTPS id 3CD27601B9; Fri, 20 Nov 2026 18:04:36 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) by localhost (Mailerdaemon) with ESMTPSA id DBB1311BC0966; Fri, 20 Nov 2026 19:04:30 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bootlin.com; s=dkim; t=1795197874; h=from:subject:date:message-id:to:cc:mime-version:content-type: content-transfer-encoding:in-reply-to:references; bh=ICx4BThnWzLJY8ulzYzexmZCvMczADwc2z7Za4cF/qI=; b=VkQ6kluecYVOzpw2yywjrPtHs5YIo47bIMwU+mZ+lBhz02cfvwOD5AWH3jQpqHziQhyPPK K24w+NPgyHUXy7O48jZFa5bqP8kg4KKnzRB7ieeY5LzM6F1IqOlyCX1Ufv+A9RqARrNM8l 0D1Gan0FkrkbQyPiXGFF5qIZXM9XhF/LcwzixG+NRRyR4o2UDgHffnLHiN1AJAAWFep4ny scSprUgLkqTAaXZdCvJGeogydNgyyNYMwonSyOAI/9htQ1jpTHvsVdTgf8aMhlTEXLhW7c 7U34mkZ4LQO7tOvQsqbsH72PjopSbIk9Vw5LcohczhmdfpScEgxcfwKYKUfbDA== From: Louis Chauvet Date: Fri, 20 Nov 2026 18:59:04 +0100 Subject: [PATCH v6 22/43] drm/vkms: Introduce config for plane color encoding X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20261120-vkms-all-config-v6-22-78ace90f4fc1@bootlin.com> References: <20261120-vkms-all-config-v6-0-78ace90f4fc1@bootlin.com> In-Reply-To: <20261120-vkms-all-config-v6-0-78ace90f4fc1@bootlin.com> To: Haneen Mohammed , Simona Vetter , Melissa Wen , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , jose.exposito89@gmail.com, Jonathan Corbet , Oarora Etimis , Harry Wentland , Lucas De Marchi , =?utf-8?q?Ville_Syrj=C3=A4l=C3=A4?= , Randy Dunlap , Nick Desaulniers , Louis Chauvet , Shuah Khan , Miguel Ojeda , Nathan Chancellor , Nick Desaulniers , Bill Wendling , Justin Stitt Cc: Luca Ceresoli , Kory Maincent , sebastian.wick@redhat.com, victoria@system76.com, thomas.petazzoni@bootlin.com, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, linux-doc@vger.kernel.org, Simona Vetter , llvm@lists.linux.dev X-Mailer: b4 0.17-dev X-Developer-Signature: v=1; a=openpgp-sha256; l=12569; i=louis.chauvet@bootlin.com; h=from:subject:message-id; bh=gEvHH37w06YMtPzZAbwPd+kMDry9O7RBzL6amX75Yzs=; b=owEBiQJ2/ZANAwAIASCtLsZbECziAcsmYgBrAIsAfnB5cENqoEqiM95f34MeWd0VeHcP6i3UI bcDtyXhg7aJAk8EAAEIADkWIQRPj7g/vng8MQxQWQQgrS7GWxAs4gUCawCLABsUgAAAAAAEAA5t YW51MiwyLjUrMS4xMiwyLDIACgkQIK0uxlsQLOKfSA/7B4WeYaqeA3T6vjsKMLS/Pc+EzUngoNt 06tNvLbrAreuQ0fr22vQ/0jxVwp7LucrI1sZPUMsoEz5ayaA6l2CABXsqxfJ2SeS4DacNapFq78 3Kw01BvnN5+fLNGHxpfOP9bD+ugwD0bt3Zx+l5Bk8Rr6/y7jHkJgjQmvJqbp72K1LAkERgbP6d0 ToKboOPUV9OrfKrgI97w/98X0tpZTBVSsAcnoc09oB8uM7ynAYOvRmPHa2gsDU3ePykByEB/HeK M+qC4/j4mO4fZwdidnG5FfRU/h19JpBedukN+QN260hgfi/Lea8GoRCr0Bt3Lt7KXvvmDzHT8+w LpmfcAQbH7BOMbCwDVGfawtnqnqvvsRayIOE8JjzBUDshJWL9vUk2Jxf7DxfHwAyGoppABFw2wS eUKEfWE5C6W80JqY0jVyCQSTBsdea+YQlr6UXky3tF6PLrTqCtRK4XGalFZMgO4F7askmKZT0Dy R8uBf1C9qCkQr1iuRqTizKc+ODbhq2eL7cCm/jX+vvRTu/OjCZGH0K7ArK37d6DgkV8MBMY/Ggg CGtoyPZUsQiaMM3EBG4Cx6vb+E+Z4wYuKsVSg34rDnb9nSuAvO5rVDZ5u1UGU8EepWxL6mD+qME ND5LFTjFwq+HflCe9zm9tZBOZq8tDE55EcrgXcde/vvrpJhkwGKg= 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 | 48 ++++++++++++++++++++ drivers/gpu/drm/vkms/vkms_config.h | 64 +++++++++++++++++++++++++++ drivers/gpu/drm/vkms/vkms_plane.c | 15 +++---- 4 files changed, 170 insertions(+), 8 deletions(-) diff --git a/drivers/gpu/drm/vkms/tests/vkms_config_test.c b/drivers/gpu/drm/vkms/tests/vkms_config_test.c index dcb29ed8ac4a..0254268da6a2 100644 --- a/drivers/gpu/drm/vkms/tests/vkms_config_test.c +++ b/drivers/gpu/drm/vkms/tests/vkms_config_test.c @@ -192,6 +192,14 @@ static void vkms_config_test_default_config(struct kunit *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); } /* Encoders */ @@ -533,6 +541,48 @@ static void vkms_config_test_valid_plane_rotations(struct kunit *test) vkms_config_destroy(config); } +static void vkms_config_test_valid_plane_color_encoding(struct kunit *test) +{ + struct vkms_config *config; + struct vkms_config_plane *plane_cfg; + + config = vkms_config_default_create(false, false, false, false); + KUNIT_ASSERT_NOT_ERR_OR_NULL(test, config); + + plane_cfg = 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_BT601); + KUNIT_EXPECT_TRUE(test, vkms_config_valid_plane_color_encoding(config, plane_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_BT709); + KUNIT_EXPECT_FALSE(test, vkms_config_valid_plane_color_encoding(config, plane_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, plane_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_BT601); + KUNIT_EXPECT_TRUE(test, vkms_config_valid_plane_color_encoding(config, plane_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; @@ -1056,6 +1106,7 @@ static struct kunit_case vkms_config_test_cases[] = { 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 82e8ada05b26..aad7576b730f 100644 --- a/drivers/gpu/drm/vkms/vkms_config.c +++ b/drivers/gpu/drm/vkms/vkms_config.c @@ -212,6 +212,25 @@ bool vkms_config_valid_plane_rotation(const struct vkms_config *config, } EXPORT_SYMBOL_IF_KUNIT(vkms_config_valid_plane_rotation); +VISIBLE_IF_KUNIT +bool vkms_config_valid_plane_color_encoding(const struct vkms_config *config, + const struct vkms_config_plane *plane_cfg) +{ + struct drm_device *dev = 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)) != + BIT(vkms_config_plane_get_default_color_encoding(plane_cfg))) { + drm_info(dev, "Configured default color encoding is not supported by the 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) { @@ -374,6 +393,9 @@ bool vkms_config_is_valid(const struct vkms_config *config) 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; } if (!valid_plane_number(config)) @@ -406,6 +428,22 @@ bool vkms_config_is_valid(const struct vkms_config *config) } EXPORT_SYMBOL_IF_KUNIT(vkms_config_is_valid); +static __nocfi void show_bitfield(struct seq_file *m, uint32_t value, const char *callback(unsigned int)) +{ + u32 offset = 0; + bool first = true; + + while (value >= BIT(offset) && offset < 32) { + if (value & BIT(offset)) { + if (!first) + seq_puts(m, ","); + seq_printf(m, "%s", callback(offset)); + first = false; + } + offset += 1; + } +} + static int vkms_config_show(struct seq_file *m, void *data) { struct drm_debugfs_entry *entry = m->private; @@ -439,6 +477,12 @@ static int vkms_config_show(struct seq_file *m, void *data) DRM_ROTATION_FMT_ARGS(vkms_config_plane_get_supported_rotations(plane_cfg))); seq_printf(m, "\tdefault rotation=" DRM_ROTATION_FMT "\n", DRM_ROTATION_FMT_ARGS(vkms_config_plane_get_default_rotation(plane_cfg))); + seq_puts(m, "\tsupported color encoding="); + show_bitfield(m, vkms_config_plane_get_supported_color_encodings(plane_cfg), + drm_get_color_encoding_name); + seq_puts(m, "\n"); + seq_printf(m, "\tdefault color encoding=%s\n", + drm_get_color_encoding_name(vkms_config_plane_get_default_color_encoding(plane_cfg))); } vkms_config_for_each_crtc(vkmsdev->config, crtc_cfg) { @@ -492,6 +536,10 @@ struct vkms_config_plane __must_check *vkms_config_create_plane(struct vkms_conf 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_BT601); xa_init_flags(&plane_cfg->possible_crtcs, XA_FLAGS_ALLOC); diff --git a/drivers/gpu/drm/vkms/vkms_config.h b/drivers/gpu/drm/vkms/vkms_config.h index b0a5a1ae6537..554c730aebd2 100644 --- a/drivers/gpu/drm/vkms/vkms_config.h +++ b/drivers/gpu/drm/vkms/vkms_config.h @@ -54,6 +54,8 @@ struct vkms_config { * 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. + * @default_color_encoding: Default color encoding that should be used by this plane + * @supported_color_encodings: Color encodings that this plane will support */ struct vkms_config_plane { struct list_head link; @@ -63,6 +65,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; bool default_pipeline; @@ -403,6 +407,66 @@ bool vkms_config_valid_plane_rotation(const struct vkms_config *config, const struct vkms_config_plane *plane_cfg); #endif +/** + * 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_plane *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 *plane_cfg, + enum drm_color_encoding default_color_encoding) +{ + plane_cfg->default_color_encoding = default_color_encoding; +} + +/** + * vkms_config_plane_get_supported_color_encodings() - Get the supported color 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_BT709) 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_plane *plane_cfg) +{ + return plane_cfg->supported_color_encodings; +} + +/** + * vkms_config_plane_set_supported_color_encodings() - Set the supported color 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_YCBCR_BT709) means that + * DRM_COLOR_YCBCR_BT601 and DRM_COLOR_YCBCR_BT709 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 = supported_color_encodings; +} + +#if IS_ENABLED(CONFIG_KUNIT) +bool vkms_config_valid_plane_color_encoding(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 91c51a8d908b..6b60b0c09cba 100644 --- a/drivers/gpu/drm/vkms/vkms_plane.c +++ b/drivers/gpu/drm/vkms/vkms_plane.c @@ -276,14 +276,13 @@ struct vkms_plane *vkms_plane_init(struct vkms_device *vkmsdev, vkms_config_plane_get_default_rotation(plane_cfg), vkms_config_plane_get_supported_rotations(plane_cfg)); - 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(plane_cfg) != 0) + drm_plane_create_color_properties(&plane->base, + vkms_config_plane_get_supported_color_encodings(plane_cfg), + BIT(DRM_COLOR_YCBCR_LIMITED_RANGE) | + BIT(DRM_COLOR_YCBCR_FULL_RANGE), + vkms_config_plane_get_default_color_encoding(plane_cfg), + DRM_COLOR_YCBCR_FULL_RANGE); if (vkms_config_plane_get_default_pipeline(plane_cfg)) vkms_initialize_colorops(&plane->base); -- 2.56.0