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 8EDC83A256C; Wed, 22 Apr 2026 16:50:20 +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=1776876623; cv=none; b=GyqCFbgxIphP8FeSUlWj7h6pACDhlVfb//0b58oCqmY8shAzuG00lR25EhYHKD1cB8CJDcH537sg+5sMZA0nYRGB+bU71yd8uYykbHT7137OyVZW7xa15aRbU3UjTIzhSLeXXn5vAtICS3rIexZBWEs9NnWVZePtf/4vV6SZDEE= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776876623; c=relaxed/simple; bh=Bp7zg8wFejLIYIcoYDjGj7I7yfTf15VjJK04bFMpaxY=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=EExqRYuBMA9hHn8RImn/bjJAva6buzmTVPk8tovqbH4YLYtH/mG7flP9yE/jUprYzVYcUf8ACDFCJdDd4EEsATBp0qmszNNkobQ+CjIsH8T9IIkjtrMa2bk6bB15PW8lHmtcmbP7BQUwCQf1d1FVOdwNF87V6UFBlOzLfM+ECkk= 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=tmLbR+CQ; 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="tmLbR+CQ" Received: from smtpout-01.galae.net (smtpout-01.galae.net [212.83.139.233]) by smtpout-02.galae.net (Postfix) with ESMTPS id 6F4C51A33AE; Wed, 22 Apr 2026 16:50:18 +0000 (UTC) Received: from mail.galae.net (mail.galae.net [212.83.136.155]) by smtpout-01.galae.net (Postfix) with ESMTPS id 44CBA5FA8F; Wed, 22 Apr 2026 16:50:18 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) by localhost (Mailerdaemon) with ESMTPSA id C242A104608C5; Wed, 22 Apr 2026 18:50:14 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bootlin.com; s=dkim; t=1776876617; h=from:subject:date:message-id:to:cc:mime-version:content-type: content-transfer-encoding:in-reply-to:references; bh=CVm2US2YikdjjWnXYblQtsIZi/0+X18/ld7I2byi9/A=; b=tmLbR+CQLNKjgs6p1dTGI8OGP4wX01bCGsQuS7pILLGLvqCw+FbH5pFEhxN1HK6jLNatH9 hlJANBuNuVHfjB8ltFDvKYaaZz2t3v1a0I2AvPCtDVkmLBf8Fjnj+oMDWhwFuGPlfKabTy VgvW3yQGmMUpXf32y+1I9pxybqr3rp5XQFDWnvlgy3uoKmmcub/dpeIyOJJB6sc0B4pBDa 630gFMH8lzuRFtqpasDA1alY6QBO3m38W0ju1p4DRE9HPSZOGWd563QzECcgEhQF7YSt1w mP8wJxwS+IqEY/9VDSNwIRmSaHtUIS4+GNPtxVW8wf/r5FI1Q/N+CQdY3D7DyQ== From: Louis Chauvet Date: Wed, 22 Apr 2026 18:48:29 +0200 Subject: [PATCH v4 32/37] drm/vkms: Introduce configfs for connector EDID 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-32-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 Introduce new attributes to configure EDID of a connector: - edid_enable - chose if the connector will have an EDID or not - edid - raw edid content Due to limitation of ConfigFS, the max len of EDID is PAGE_SIZE (4kB on x86), it should be sufficient for many tests. One possible evolution is using a ConfigFS blob to allow bigger EDID. Reviewed-by: Luca Ceresoli Signed-off-by: Louis Chauvet --- Documentation/ABI/testing/configfs-vkms | 14 ++++++ Documentation/gpu/vkms.rst | 5 ++- drivers/gpu/drm/vkms/vkms_configfs.c | 80 +++++++++++++++++++++++++++++++++ drivers/gpu/drm/vkms/vkms_connector.c | 3 ++ 4 files changed, 101 insertions(+), 1 deletion(-) diff --git a/Documentation/ABI/testing/configfs-vkms b/Documentation/ABI/testing/configfs-vkms index 1b80ad111a04..8215cd3ff466 100644 --- a/Documentation/ABI/testing/configfs-vkms +++ b/Documentation/ABI/testing/configfs-vkms @@ -48,6 +48,20 @@ Description: Value is a bitfield, where 0x1 = NO_DATA, 0x2 = SMPTE_170M_YCC, etc. See enum drm_colorspace for full list. +What: /sys/kernel/config/vkms//connectors//edid_enabled +Date: Nov 2025 +Contact: dri-devel@lists.freedesktop.org +Description: + Enable or disable EDID for this connector. Value: + 1 - enabled, 0 - disabled. + +What: /sys/kernel/config/vkms//connectors//edid +Date: Nov 2025 +Contact: dri-devel@lists.freedesktop.org +Description: + Content of the EDID for this connector. Ignored if + edid_enabled is not set. + What: /sys/kernel/config/vkms//connectors//possible_encoders Date: Nov 2025 Contact: dri-devel@lists.freedesktop.org diff --git a/Documentation/gpu/vkms.rst b/Documentation/gpu/vkms.rst index a6215bbe1c52..a7d6a4a3b53b 100644 --- a/Documentation/gpu/vkms.rst +++ b/Documentation/gpu/vkms.rst @@ -138,7 +138,7 @@ Last but not least, create one or more connectors:: sudo mkdir /config/vkms/my-vkms/connectors/connector0 -Connectors have 3 configurable attribute: +Connectors have 5 configurable attribute: - status: Connection status: 1 connected, 2 disconnected, 3 unknown (same values as those exposed by the "status" property of a connector) @@ -147,6 +147,9 @@ Connectors have 3 configurable attribute: If supported_colorspaces is not 0, the HDR_OUTPUT_METADATA will also be created. Value is a bitfield, 0x1 = NO_DATA, 0x2 = SMPTE_170M_YCC... see enum drm_colorspace for full list. +- edid_enabled: Enable or not EDID for this connector. Some connectors may not have an + EDID but just a list of modes, this attribute allows to disable EDID property. +- edid: Content of the EDID. Ignored if edid_enabled is not set To finish the configuration, link the different pipeline items:: diff --git a/drivers/gpu/drm/vkms/vkms_configfs.c b/drivers/gpu/drm/vkms/vkms_configfs.c index 5994b9a999b1..cf388851910b 100644 --- a/drivers/gpu/drm/vkms/vkms_configfs.c +++ b/drivers/gpu/drm/vkms/vkms_configfs.c @@ -1274,14 +1274,94 @@ static ssize_t connector_supported_colorspaces_store(struct config_item *item, return count; } +static ssize_t connector_edid_enabled_show(struct config_item *item, char *page) +{ + struct vkms_configfs_connector *connector; + bool enabled; + + connector = connector_item_to_vkms_configfs_connector(item); + + scoped_guard(mutex, &connector->dev->lock) + enabled = vkms_config_connector_get_edid_enabled(connector->config); + + return sprintf(page, "%d\n", enabled); +} + +static ssize_t connector_edid_enabled_store(struct config_item *item, + const char *page, size_t count) +{ + struct vkms_configfs_connector *connector; + struct vkms_config_connector *connector_cfg; + bool enabled; + + connector = connector_item_to_vkms_configfs_connector(item); + connector_cfg = connector->config; + + if (kstrtobool(page, &enabled)) + return -EINVAL; + + scoped_guard(mutex, &connector->dev->lock) + { + vkms_config_connector_set_edid_enabled(connector_cfg, enabled); + + if (connector->dev->enabled && + vkms_config_connector_get_status(connector_cfg) != + connector_status_disconnected) + vkms_trigger_connector_hotplug(connector->dev->config->dev); + } + return count; +} + +static ssize_t connector_edid_show(struct config_item *item, char *page) +{ + struct vkms_configfs_connector *connector; + + connector = connector_item_to_vkms_configfs_connector(item); + + scoped_guard(mutex, &connector->dev->lock) + { + unsigned int len = 0; + const u8 *edid = vkms_config_connector_get_edid(connector->config, &len); + + memcpy(page, edid, min(len, PAGE_SIZE)); + return min(len, PAGE_SIZE); + } + + return -EINVAL; +} + +static ssize_t connector_edid_store(struct config_item *item, + const char *page, size_t count) +{ + struct vkms_configfs_connector *connector; + + connector = connector_item_to_vkms_configfs_connector(item); + + scoped_guard(mutex, &connector->dev->lock) + { + vkms_config_connector_set_edid(connector->config, page, count); + + if (connector->dev->enabled && + vkms_config_connector_get_status(connector->config) != + connector_status_disconnected) + vkms_trigger_connector_hotplug(connector->dev->config->dev); + } + + return count; +} + CONFIGFS_ATTR(connector_, status); CONFIGFS_ATTR(connector_, type); CONFIGFS_ATTR(connector_, supported_colorspaces); +CONFIGFS_ATTR(connector_, edid_enabled); +CONFIGFS_ATTR(connector_, edid); static struct configfs_attribute *connector_item_attrs[] = { &connector_attr_status, &connector_attr_type, &connector_attr_supported_colorspaces, + &connector_attr_edid_enabled, + &connector_attr_edid, NULL, }; diff --git a/drivers/gpu/drm/vkms/vkms_connector.c b/drivers/gpu/drm/vkms/vkms_connector.c index fe42ab2ba7b1..f726c7995524 100644 --- a/drivers/gpu/drm/vkms/vkms_connector.c +++ b/drivers/gpu/drm/vkms/vkms_connector.c @@ -175,6 +175,9 @@ struct vkms_connector *vkms_connector_init_static(struct vkms_device *vkmsdev, drm_connector_helper_add(&connector->base, &vkms_conn_helper_funcs); + if (vkms_config_connector_get_edid_enabled(connector_cfg)) + drm_connector_attach_edid_property(&connector->base); + return connector; } -- 2.54.0