From nobody Mon Feb 9 09:32:24 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 8233E3168EB; Mon, 22 Dec 2025 10:11:59 +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=1766398321; cv=none; b=A9pcrqiooCQPFMjN/KRYX/pi5ngb/45JJ+bpt7h9G10c40j7jx0Ujzl1SnG4gGbVW/IwMqJdy5rlw1CdDXCXs6ebxhUYeBJ5zE6O8UzLkcbF/zsK3mwnf9Bt7tXzt8nHZfrztXXRrz9Zx6ZVEUgCARKsw8ygULNLytuYw4QVn0c= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1766398321; c=relaxed/simple; bh=YsXBxTtZ2dfU4I3O7VtTUuslG1wNR+/6hNxx1wqF1IM=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=DFOGsYKuDQsNPdMy46qPtB7xZyu8JSLRji9YDBcXJceiWYfqb9DT72zqOiN/pxLBH/kLGtc+9UzR3yk2VnIQqXLFLExNPVXGp2rnbFguFPktPwCKPECBhAuBUQloQ5ncr5hjMuAXbO3GjEP9GorfA02+rUpnUYuaRZHyFyZL5Z8= 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=nu6IiE8v; 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="nu6IiE8v" Received: from smtpout-01.galae.net (smtpout-01.galae.net [212.83.139.233]) by smtpout-02.galae.net (Postfix) with ESMTPS id 2D1F31A2373; Mon, 22 Dec 2025 10:11:58 +0000 (UTC) Received: from mail.galae.net (mail.galae.net [212.83.136.155]) by smtpout-01.galae.net (Postfix) with ESMTPS id 04160606C1; Mon, 22 Dec 2025 10:11:58 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) by localhost (Mailerdaemon) with ESMTPSA id 3416E10AB0194; Mon, 22 Dec 2025 11:11:54 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bootlin.com; s=dkim; t=1766398316; h=from:subject:date:message-id:to:cc:mime-version:content-type: content-transfer-encoding:in-reply-to:references; bh=sl8Le4obEhXGwn4WHUvMuISFrlY/VG+RoyMboE2Djac=; b=nu6IiE8vadVnag0rhvBR2/mG4P3I+i4gP1Ns/G9RY99Xa4ZYMFC3kG+Tjf+pwJwcOSv5rk Cl48giFtY2zY3s4IbcMHuOuWZMhXqbua210Nw3WaSviUmxwgs0sTWcGzhA1UJCv4O+87lq tEVszuZZDRln1/yhreHGeXUJXRuSBzoxhNEFX4JGlP+1BDxorCeV5aT6vvkUBXB5mBnf8g GXPdDuXhoF3gyDIPXZfaI61V/OTp+assXwK2DjCfzXITLSeps3GtKF9v77bpKPisEAWutP 83/stESSIsWYmQiDaknD5Kll/MYdpA2HwfLWypIovmzGKLjq2IUtEkDU9RSVhg== From: Louis Chauvet Date: Mon, 22 Dec 2025 11:11:17 +0100 Subject: [PATCH v3 15/33] drm/vkms: Introduce config for plane color range 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: <20251222-vkms-all-config-v3-15-ba42dc3fb9ff@bootlin.com> References: <20251222-vkms-all-config-v3-0-ba42dc3fb9ff@bootlin.com> In-Reply-To: <20251222-vkms-all-config-v3-0-ba42dc3fb9ff@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 , Luca Ceresoli X-Mailer: b4 0.14.3 X-Developer-Signature: v=1; a=openpgp-sha256; l=10940; i=louis.chauvet@bootlin.com; h=from:subject:message-id; bh=YsXBxTtZ2dfU4I3O7VtTUuslG1wNR+/6hNxx1wqF1IM=; b=owEBiQJ2/ZANAwAIASCtLsZbECziAcsmYgBpSRlB39/nUq+Fu3ban5KWaGpUyua+JCgW+fz/S IK/gQoMPm2JAk8EAAEIADkWIQRPj7g/vng8MQxQWQQgrS7GWxAs4gUCaUkZQRsUgAAAAAAEAA5t YW51MiwyLjUrMS4xMSwyLDIACgkQIK0uxlsQLOKVVA/8CMK0EPQGVNgGsuDUeRIRK4S2WscNlfh CZhHEMBH1/yE77ExdDYBGbN9i+bRfTcLDwOfCvrmiL5mrbi0OAIs2kFxs0HpGpm7QLTyoGUZSCz yXJ45JxLWJBXPNuJtZZSKRrG2mk567b9+PtwJ6d3p8xyY2G46Kt6XLZxuj2EyohN6ZaSX9Kh5OG 6gfT+VJLcqRSoJZm3/KcdMEYDAQC5XducZcrIOBnF5Uajll62DD7nFd2gQzI53uz1i73L0npEiu Wx0iVFFC3ZdGGRwMWJbMLLRDoL/qQ0/uJcs8WzFggPH1qdZOKPPrjhIfUMSD6JJsvt7H715xew/ 7Ln4DhRFF/Bezwd5DIzDGk7z5pS0UMAPwzswvYG7BEEv90KW8F+m/88ocbk0Td1D0dmV4kJmKYc A6jcgWJQ5dYcFtisBcUQvHwIRapRTbpaW+pcoTVdg0tBOjHuLk2WCsFLnqJturYyD7Bx19urvAY lzerhKjfjbmgWFzt6Wq2ew8xQCpLTfM2slo+Rr5dETbBSfaGXWzVS4P82CAIDU+Alt8oZvrB/vd snc55XJmvfQmdgUlpdMtUqidOnnf+HdUvzvxSVRoQSS0fHL9fWRdIMIlNT5YQ+vpcCtb5yXKUKu ZN9QltNLl50hqOGUeDKlZF63YQojfKVzuA/EeQ0ujWeXEwG1Tlyw= 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 range on planes, but for testing it can be useful to only advertise few of them. This new configuration interface will allow configuring the color range per planes. Reviewed-by: Luca Ceresoli Signed-off-by: Louis Chauvet --- drivers/gpu/drm/vkms/tests/vkms_config_test.c | 44 +++++++++++++++++++++++= ++++ drivers/gpu/drm/vkms/vkms_config.c | 39 ++++++++++++++++++++++++ drivers/gpu/drm/vkms/vkms_config.h | 35 +++++++++++++++++++++ drivers/gpu/drm/vkms/vkms_plane.c | 8 ++--- 4 files changed, 122 insertions(+), 4 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 a2a3f1a106a3..a88d8b4a969e 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 #include =20 @@ -562,6 +563,7 @@ static void vkms_config_test_valid_plane_color_encoding= (struct kunit *test) KUNIT_EXPECT_FALSE(test, vkms_config_is_valid(config)); =20 /* Valid, no supported or color encoding */ + vkms_config_plane_set_supported_color_ranges(plane_cfg, 0); 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)); @@ -576,6 +578,47 @@ static void vkms_config_test_valid_plane_color_encodin= g(struct kunit *test) vkms_config_destroy(config); } =20 +static void vkms_config_test_valid_plane_color_range(struct kunit *test) +{ + struct vkms_config *config; + struct vkms_config_plane *plane_cfg; + + config =3D vkms_config_default_create(false, false, false, false); + KUNIT_ASSERT_NOT_ERR_OR_NULL(test, config); + + plane_cfg =3D get_first_plane(config); + + /* Valid, all color range supported */ + vkms_config_plane_set_supported_color_ranges(plane_cfg, + BIT(DRM_COLOR_YCBCR_LIMITED_RANGE) | + BIT(DRM_COLOR_YCBCR_FULL_RANGE)); + vkms_config_plane_set_default_color_range(plane_cfg, DRM_COLOR_YCBCR_FULL= _RANGE); + KUNIT_EXPECT_TRUE(test, vkms_config_valid_plane_color_range(config, plane= _cfg)); + KUNIT_EXPECT_TRUE(test, vkms_config_is_valid(config)); + + /* Invalid, default color range is not supported */ + vkms_config_plane_set_supported_color_ranges(plane_cfg, + BIT(DRM_COLOR_YCBCR_FULL_RANGE)); + vkms_config_plane_set_default_color_range(plane_cfg, DRM_COLOR_YCBCR_LIMI= TED_RANGE); + KUNIT_EXPECT_FALSE(test, vkms_config_valid_plane_color_range(config, plan= e_cfg)); + KUNIT_EXPECT_FALSE(test, vkms_config_is_valid(config)); + + /* Valid, no supported or color range */ + vkms_config_plane_set_supported_color_encodings(plane_cfg, 0); + vkms_config_plane_set_supported_color_ranges(plane_cfg, 0); + vkms_config_plane_set_default_color_range(plane_cfg, 0); + KUNIT_EXPECT_TRUE(test, vkms_config_valid_plane_color_range(config, plane= _cfg)); + KUNIT_EXPECT_TRUE(test, vkms_config_is_valid(config)); + + /* Valid, if no supported color range, default is ignored */ + vkms_config_plane_set_supported_color_ranges(plane_cfg, 0); + vkms_config_plane_set_default_color_range(plane_cfg, DRM_COLOR_YCBCR_LIMI= TED_RANGE); + KUNIT_EXPECT_TRUE(test, vkms_config_valid_plane_color_range(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; @@ -1100,6 +1143,7 @@ static struct kunit_case vkms_config_test_cases[] =3D= { 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_color_range), 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 486cdd1f54a4..5591e0baf1a1 100644 --- a/drivers/gpu/drm/vkms/vkms_config.c +++ b/drivers/gpu/drm/vkms/vkms_config.c @@ -198,6 +198,25 @@ bool vkms_config_valid_plane_color_encoding(const stru= ct vkms_config *config, } EXPORT_SYMBOL_IF_KUNIT(vkms_config_valid_plane_color_encoding); =20 +VISIBLE_IF_KUNIT +bool vkms_config_valid_plane_color_range(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_supported_color_ranges(plane_cfg)) { + if ((BIT(vkms_config_plane_get_default_color_range(plane_cfg)) & + vkms_config_plane_get_supported_color_ranges(plane_cfg)) !=3D + BIT(vkms_config_plane_get_default_color_range(plane_cfg))) { + drm_info(dev, "Configured default color range is not supported by the p= lane\n"); + return false; + } + } + + return true; +} +EXPORT_SYMBOL_IF_KUNIT(vkms_config_valid_plane_color_range); + static bool valid_planes_for_crtc(const struct vkms_config *config, struct vkms_config_crtc *crtc_cfg) { @@ -354,6 +373,7 @@ static bool valid_connector_possible_encoders(const str= uct vkms_config *config) =20 bool vkms_config_is_valid(const struct vkms_config *config) { + struct drm_device *dev =3D config->dev ? &config->dev->drm : NULL; struct vkms_config_crtc *crtc_cfg; struct vkms_config_plane *plane_cfg; =20 @@ -363,6 +383,16 @@ bool vkms_config_is_valid(const struct vkms_config *co= nfig) =20 if (!vkms_config_valid_plane_color_encoding(config, plane_cfg)) return false; + + if (!vkms_config_valid_plane_color_range(config, plane_cfg)) + return false; + + if ((vkms_config_plane_get_supported_color_encodings(plane_cfg) =3D=3D 0= ) !=3D + (vkms_config_plane_get_supported_color_ranges(plane_cfg) =3D=3D 0)) { + drm_info(dev, + "Both supported color encodings and color ranges must be set, or none= \n"); + return false; + } } =20 if (!valid_plane_number(config)) @@ -446,6 +476,12 @@ static int vkms_config_show(struct seq_file *m, void *= data) 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))); + seq_puts(m, "\tsupported color ranges=3D"); + show_bitfield(m, vkms_config_plane_get_supported_color_ranges(plane_cfg), + drm_get_color_range_name); + seq_puts(m, "\n"); + seq_printf(m, "\tdefault color range=3D%s\n", + drm_get_color_range_name(vkms_config_plane_get_default_color_range(p= lane_cfg))); } =20 vkms_config_for_each_crtc(vkmsdev->config, crtc_cfg) { @@ -495,6 +531,9 @@ struct vkms_config_plane *vkms_config_create_plane(stru= ct vkms_config *config) BIT(DRM_COLOR_YCBCR_BT709) | BIT(DRM_COLOR_YCBCR_BT2020)); vkms_config_plane_set_default_color_encoding(plane_cfg, DRM_COLOR_YCBCR_B= T601); + vkms_config_plane_set_supported_color_ranges(plane_cfg, BIT(DRM_COLOR_YCB= CR_LIMITED_RANGE) | + BIT(DRM_COLOR_YCBCR_FULL_RANGE)); + vkms_config_plane_set_default_color_range(plane_cfg, DRM_COLOR_YCBCR_FULL= _RANGE); =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 cae7c3b3da07..bb2721a18d61 100644 --- a/drivers/gpu/drm/vkms/vkms_config.h +++ b/drivers/gpu/drm/vkms/vkms_config.h @@ -47,6 +47,8 @@ struct vkms_config { * 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 + * @default_color_range: Default color range that should be used by this p= lane + * @supported_color_ranges: Color ranges that this plane will support */ struct vkms_config_plane { struct list_head link; @@ -58,6 +60,8 @@ struct vkms_config_plane { unsigned int supported_rotations; enum drm_color_encoding default_color_encoding; unsigned int supported_color_encodings; + enum drm_color_range default_color_range; + unsigned int supported_color_ranges; struct xarray possible_crtcs; bool default_pipeline; =20 @@ -439,6 +443,37 @@ bool vkms_config_valid_plane_color_encoding(const stru= ct vkms_config *config, const struct vkms_config_plane *plane_cfg); #endif =20 +static inline enum drm_color_range +vkms_config_plane_get_default_color_range(const struct vkms_config_plane *= plane_cfg) +{ + return plane_cfg->default_color_range; +} + +static inline void +vkms_config_plane_set_default_color_range(struct vkms_config_plane *plane_= cfg, + enum drm_color_range default_color_range) +{ + plane_cfg->default_color_range =3D default_color_range; +} + +static inline unsigned int +vkms_config_plane_get_supported_color_ranges(const struct vkms_config_plan= e *plane_cfg) +{ + return plane_cfg->supported_color_ranges; +} + +static inline void +vkms_config_plane_set_supported_color_ranges(struct vkms_config_plane *pla= ne_cfg, + unsigned int supported_color_ranges) +{ + plane_cfg->supported_color_ranges =3D supported_color_ranges; +} + +#if IS_ENABLED(CONFIG_KUNIT) +bool vkms_config_valid_plane_color_range(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 49544839f7dd..6461cf025a27 100644 --- a/drivers/gpu/drm/vkms/vkms_plane.c +++ b/drivers/gpu/drm/vkms/vkms_plane.c @@ -239,13 +239,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)); =20 - if (vkms_config_plane_get_supported_color_encodings(plane_cfg) !=3D 0) + if (vkms_config_plane_get_supported_color_encodings(plane_cfg) !=3D 0 && + vkms_config_plane_get_supported_color_ranges(plane_cfg) !=3D 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_supported_color_ranges(plane_cfg), vkms_config_plane_get_default_color_encoding(plane_cfg), - DRM_COLOR_YCBCR_FULL_RANGE); + vkms_config_plane_get_default_color_range(plane_cfg)); =20 if (vkms_config_plane_get_default_pipeline(plane_cfg)) vkms_initialize_colorops(&plane->base); --=20 2.51.2