On Sat, Oct 18, 2025 at 04:01:07AM +0200, Louis Chauvet wrote:
> 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.
>
> Signed-off-by: Louis Chauvet <louis.chauvet@bootlin.com>
> ---
> drivers/gpu/drm/vkms/vkms_config.c | 14 ++++++++++++++
> drivers/gpu/drm/vkms/vkms_config.h | 30 ++++++++++++++++++++++++++++++
> drivers/gpu/drm/vkms/vkms_plane.c | 5 ++---
> 3 files changed, 46 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/gpu/drm/vkms/vkms_config.c b/drivers/gpu/drm/vkms/vkms_config.c
> index 5353719a476d..8f00ca21ed6e 100644
> --- a/drivers/gpu/drm/vkms/vkms_config.c
> +++ b/drivers/gpu/drm/vkms/vkms_config.c
> @@ -163,6 +163,13 @@ static bool valid_plane_properties(const struct vkms_config *config)
> drm_info(dev, "Configured default color encoding is not supported by the plane\n");
> return false;
> }
> +
> + if ((BIT(vkms_config_plane_get_default_color_range(plane_cfg)) &
> + vkms_config_plane_get_supported_color_range(plane_cfg)) !=
> + BIT(vkms_config_plane_get_default_color_range(plane_cfg))) {
> + drm_info(dev, "Configured default color range is not supported by the plane\n");
> + return false;
> + }
> }
> return true;
> }
> @@ -386,6 +393,10 @@ static int vkms_config_show(struct seq_file *m, void *data)
> vkms_config_plane_get_supported_color_encoding(plane_cfg));
> seq_printf(m, "\tdefault color encoding: %d\n",
> vkms_config_plane_get_default_color_encoding(plane_cfg));
> + seq_printf(m, "\tsupported color range: 0x%x\n",
> + vkms_config_plane_get_supported_color_range(plane_cfg));
> + seq_printf(m, "\tdefault color range: %d\n",
> + vkms_config_plane_get_default_color_range(plane_cfg));
> }
>
> vkms_config_for_each_crtc(vkmsdev->config, crtc_cfg) {
> @@ -433,6 +444,9 @@ struct vkms_config_plane *vkms_config_create_plane(struct 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_BT601);
> + vkms_config_plane_set_supported_color_range(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);
>
> 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 11160c3c13bc..8127e12f00dc 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_encoding: Color encoding that this plane will support
> + * @default_color_range: Default color range that should be used by this plane
> + * @supported_color_range: Color range that this plane will support
Similar comment about using plural or singular in supported_*
properties.
> */
> 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_encoding;
> + enum drm_color_range default_color_range;
> + unsigned int supported_color_range;
> struct xarray possible_crtcs;
>
> /* Internal usage */
> @@ -374,6 +378,32 @@ vkms_config_plane_set_supported_color_encoding(struct vkms_config_plane *plane_c
> plane_cfg->supported_color_encoding = supported_color_encoding;
> }
>
> +static inline enum drm_color_range
> +vkms_config_plane_get_default_color_range(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 = default_color_range;
> +}
> +
> +static inline unsigned int
> +vkms_config_plane_get_supported_color_range(struct vkms_config_plane *plane_cfg)
> +{
> + return plane_cfg->supported_color_range;
> +}
> +
> +static inline void
> +vkms_config_plane_set_supported_color_range(struct vkms_config_plane *plane_cfg,
> + unsigned int supported_color_range)
> +{
> + plane_cfg->supported_color_range = supported_color_range;
> +}
> +
> /**
> * 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 5869000415e4..ab719da2ca0b 100644
> --- a/drivers/gpu/drm/vkms/vkms_plane.c
> +++ b/drivers/gpu/drm/vkms/vkms_plane.c
> @@ -240,10 +240,9 @@ struct vkms_plane *vkms_plane_init(struct vkms_device *vkmsdev,
>
> drm_plane_create_color_properties(&plane->base,
> vkms_config_plane_get_supported_color_encoding(config),
> - BIT(DRM_COLOR_YCBCR_LIMITED_RANGE) |
> - BIT(DRM_COLOR_YCBCR_FULL_RANGE),
> + vkms_config_plane_get_supported_color_range(config),
> vkms_config_plane_get_default_color_encoding(config),
> - DRM_COLOR_YCBCR_FULL_RANGE);
> + vkms_config_plane_get_default_color_range(config));
>
> return plane;
> }
>
> --
> 2.51.0
>