From mboxrd@z Thu Jan 1 00:00:00 1970 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 8ED6539C005; Wed, 22 Apr 2026 16:50:13 +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=1776876616; cv=none; b=OCq1GWdK0X4Y1MPESUVQ4J7IGCCKqIwlNfu44AqWf17nT/dfj8ZTW8fS5RcvRNI90jLZ9xk1OAlII+QKwt7N+KIENl+JCGG7Su6oO+9f63JUFxln21BbcfVveiAVl/RHdJAmVV7bgqs09xTMXRChvu6Oo2FKUjRbhN7N0uyzcn8= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776876616; c=relaxed/simple; bh=BcRTIGFB4dPO9bf/T34vAXfNiuXa2j/y3aulw7ZkMU8=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=V9O+WPj+EYKiJw5vShqS9cI/DPR8h04B5WStU4UlR2nCrk7aZZqBmepSWh7awylmSOZzEnx1lYwTNaxW0PYcSQQSvf9oXQoccG7rDRVPOz70sBK0cnu9CBJmB5mATgHV+0gMFIKKur/Cvst6b5UBQRvPXuP6hH1N3Ix2en3qrcQ= 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=CLqVdk6Q; 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="CLqVdk6Q" Received: from smtpout-01.galae.net (smtpout-01.galae.net [212.83.139.233]) by smtpout-02.galae.net (Postfix) with ESMTPS id BC8111A33AD; Wed, 22 Apr 2026 16:50:10 +0000 (UTC) Received: from mail.galae.net (mail.galae.net [212.83.136.155]) by smtpout-01.galae.net (Postfix) with ESMTPS id 929FF5FA8F; Wed, 22 Apr 2026 16:50:10 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) by localhost (Mailerdaemon) with ESMTPSA id 207BE10460C11; Wed, 22 Apr 2026 18:50:07 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bootlin.com; s=dkim; t=1776876609; h=from:subject:date:message-id:to:cc:mime-version:content-type: content-transfer-encoding:in-reply-to:references; bh=9ooDFI25Ea1vEU3XUOh8CVGo3aCzRdF+snQIqzYoJE8=; b=CLqVdk6Q0nDIeF3zoeKcGlD0dyTnJmiL5DDsHlFL1b7/kuq6ct2wQSoGq51FWkCOrTe631 wMcuE9jCFBZ8DNWNpNR162gd5py7FYFQl4R2Irmdt5EXXOzoScj9ZhpOsnl51NkTXCQyHC 0mI80rcSKvd7hdh6WAVrH7RTquEyXpbLR7CxgNL5n8HbEposgdiQ48EXyv1TTTf+arR4yM uMdEHlADjRO1ED7P2QlXbY/RYyHiX0vVo9fMUHQ/Ny6B18q9X7ls3YVRX03AnZLXoBFsSL Iua1OtOpdrG0KizWLGqjD2qFARlolrxD5wRuQMGFjYumEvkg1GfUS/3IFKn3DQ== From: Louis Chauvet Date: Wed, 22 Apr 2026 18:48:26 +0200 Subject: [PATCH v4 29/37] drm/vkms: Introduce config for connector supported colorspace Precedence: bulk X-Mailing-List: linux-doc@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20260422-vkms-all-config-v4-29-dbb52e9aadc3@bootlin.com> References: <20260422-vkms-all-config-v4-0-dbb52e9aadc3@bootlin.com> In-Reply-To: <20260422-vkms-all-config-v4-0-dbb52e9aadc3@bootlin.com> To: Haneen Mohammed , Simona Vetter , Melissa Wen , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , jose.exposito89@gmail.com, Jonathan Corbet , Shuah Khan , Miguel Ojeda , Nathan Chancellor , Nick Desaulniers , Bill Wendling , Justin Stitt 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 , llvm@lists.linux.dev, Luca Ceresoli X-Mailer: b4 0.16-dev X-Last-TLS-Session-Version: TLSv1.3 To emulate some HDR features of displays, it is required to expose some properties on HDMI, eDP and DP connectors. Reviewed-by: Luca Ceresoli Signed-off-by: Louis Chauvet --- drivers/gpu/drm/vkms/tests/vkms_config_test.c | 3 ++ drivers/gpu/drm/vkms/vkms_config.c | 5 +++ drivers/gpu/drm/vkms/vkms_config.h | 30 +++++++++++++++++ drivers/gpu/drm/vkms/vkms_connector.c | 47 +++++++++++++++++++++++++++ 4 files changed, 85 insertions(+) diff --git a/drivers/gpu/drm/vkms/tests/vkms_config_test.c b/drivers/gpu/drm/vkms/tests/vkms_config_test.c index 1900cc79db2b..a31fd230c1d4 100644 --- a/drivers/gpu/drm/vkms/tests/vkms_config_test.c +++ b/drivers/gpu/drm/vkms/tests/vkms_config_test.c @@ -215,6 +215,9 @@ static void vkms_config_test_default_config(struct kunit *test) vkms_config_for_each_connector(config, connector_cfg) { KUNIT_EXPECT_EQ(test, vkms_config_connector_get_type(connector_cfg), DRM_MODE_CONNECTOR_VIRTUAL); + KUNIT_EXPECT_EQ(test, + vkms_config_connector_get_supported_colorspaces(connector_cfg), + 0); } KUNIT_EXPECT_TRUE(test, vkms_config_is_valid(config)); diff --git a/drivers/gpu/drm/vkms/vkms_config.c b/drivers/gpu/drm/vkms/vkms_config.c index 209e5d5c3b45..b0511e6fc64d 100644 --- a/drivers/gpu/drm/vkms/vkms_config.c +++ b/drivers/gpu/drm/vkms/vkms_config.c @@ -604,6 +604,10 @@ static int vkms_config_show(struct seq_file *m, void *data) drm_get_connector_status_name(vkms_config_connector_get_status(connector_cfg))); seq_printf(m, "\ttype=%s\n", drm_get_connector_type_name(vkms_config_connector_get_type(connector_cfg))); + seq_puts(m, "\tsupported colorspaces="); + show_bitfield(m, vkms_config_connector_get_supported_colorspaces(connector_cfg), + drm_get_colorspace_name); + seq_puts(m, "\n"); } return 0; @@ -937,6 +941,7 @@ struct vkms_config_connector *vkms_config_create_connector(struct vkms_config *c connector_cfg->config = config; connector_cfg->status = connector_status_connected; vkms_config_connector_set_type(connector_cfg, DRM_MODE_CONNECTOR_VIRTUAL); + vkms_config_connector_set_supported_colorspaces(connector_cfg, 0); xa_init_flags(&connector_cfg->possible_encoders, XA_FLAGS_ALLOC); list_add_tail(&connector_cfg->link, &config->connectors); diff --git a/drivers/gpu/drm/vkms/vkms_config.h b/drivers/gpu/drm/vkms/vkms_config.h index 1f0fbd2d62eb..e62bb6603a69 100644 --- a/drivers/gpu/drm/vkms/vkms_config.h +++ b/drivers/gpu/drm/vkms/vkms_config.h @@ -132,6 +132,10 @@ struct vkms_config_encoder { * @type: Store the type of connector using DRM_MODE_CONNECTOR_* values * @config: The vkms_config this connector belongs to * @status: Status (connected, disconnected...) of the connector + * @supported_colorspaces: Bitmask of all the supported colorspaces. Values + * are the sames as ones accepted by + * drm_mode_create_hdmi_colorspace_property() and + * drm_mode_create_dp_colorspace_property() * @possible_encoders: Array of encoders that can be used with this connector * @connector: Internal usage. This pointer should never be considered as valid. * It can be used to store a temporary reference to a VKMS connector @@ -144,6 +148,7 @@ struct vkms_config_connector { int type; enum drm_connector_status status; + u32 supported_colorspaces; struct xarray possible_encoders; /* Internal usage */ @@ -243,6 +248,31 @@ struct vkms_config *vkms_config_default_create(bool enable_cursor, */ void vkms_config_destroy(struct vkms_config *config); +/** + * vkms_config_connector_set_supported_colorspaces() - Set the supported colorspaces for a connector + * @connector_cfg: Connector configuration to modify + * @supported_colorspaces: Bitmask of supported colorspaces (DRM_MODE_COLORIMETRY_*) + */ +static inline void +vkms_config_connector_set_supported_colorspaces(struct vkms_config_connector *connector_cfg, + u32 supported_colorspaces) +{ + connector_cfg->supported_colorspaces = supported_colorspaces; +} + +/** + * vkms_config_connector_get_supported_colorspaces() - Get the supported colorspaces for a connector + * @connector_cfg: Connector configuration to query + * + * Returns: + * Bitmask of supported colorspaces (DRM_MODE_COLORIMETRY_*) + */ +static inline u32 +vkms_config_connector_get_supported_colorspaces(const struct vkms_config_connector *connector_cfg) +{ + return connector_cfg->supported_colorspaces; +} + /** * vkms_config_get_device_name() - Return the name of the device * @config: Configuration to get the device name from diff --git a/drivers/gpu/drm/vkms/vkms_connector.c b/drivers/gpu/drm/vkms/vkms_connector.c index 5b29dcade7e1..a1f08167def1 100644 --- a/drivers/gpu/drm/vkms/vkms_connector.c +++ b/drivers/gpu/drm/vkms/vkms_connector.c @@ -68,6 +68,49 @@ static const struct drm_connector_helper_funcs vkms_conn_helper_funcs = { .best_encoder = vkms_conn_best_encoder, }; + +/** + * vkms_connector_init - Common initialization for all vkms connectors + * + * @connector - Already allocated connector + * @connector_cfg - Configuration to apply + * + * Returns: 0 on success, errno on error; + */ +static int __must_check vkms_connector_init(struct vkms_connector *connector, + struct vkms_config_connector *connector_cfg) +{ + int ret = 0; + + if (vkms_config_connector_get_supported_colorspaces(connector_cfg)) { + if (connector_cfg->type == DRM_MODE_CONNECTOR_HDMIA) { + ret = drm_mode_create_hdmi_colorspace_property(&connector->base, + vkms_config_connector_get_supported_colorspaces(connector_cfg)); + if (ret) + return ret; + } else if (connector_cfg->type == DRM_MODE_CONNECTOR_DisplayPort || + connector_cfg->type == DRM_MODE_CONNECTOR_eDP) { + ret = drm_mode_create_dp_colorspace_property(&connector->base, + vkms_config_connector_get_supported_colorspaces(connector_cfg)); + if (ret) + return ret; + } + + if (connector_cfg->type == DRM_MODE_CONNECTOR_HDMIA || + connector_cfg->type == DRM_MODE_CONNECTOR_DisplayPort || + connector_cfg->type == DRM_MODE_CONNECTOR_eDP) { + ret = drm_connector_attach_colorspace_property(&connector->base); + if (ret) { + drm_property_destroy(connector->base.dev, connector->base.colorspace_property); + return ret; + } + drm_connector_attach_hdr_output_metadata_property(&connector->base); + } + } + + return 0; +} + struct vkms_connector *vkms_connector_init_static(struct vkms_device *vkmsdev, struct vkms_config_connector *connector_cfg) { @@ -84,6 +127,10 @@ struct vkms_connector *vkms_connector_init_static(struct vkms_device *vkmsdev, if (ret) return ERR_PTR(ret); + ret = vkms_connector_init(connector, connector_cfg); + if (ret) + return ERR_PTR(ret); + drm_connector_helper_add(&connector->base, &vkms_conn_helper_funcs); return connector; -- 2.54.0