From: Louis Chauvet <louis.chauvet@bootlin.com>
To: "Haneen Mohammed" <hamohammed.sa@gmail.com>,
"Simona Vetter" <simona@ffwll.ch>,
"Melissa Wen" <melissa.srw@gmail.com>,
"Maarten Lankhorst" <maarten.lankhorst@linux.intel.com>,
"Maxime Ripard" <mripard@kernel.org>,
"Thomas Zimmermann" <tzimmermann@suse.de>,
"David Airlie" <airlied@gmail.com>,
jose.exposito89@gmail.com, "Jonathan Corbet" <corbet@lwn.net>,
"Oarora Etimis" <oaroraetimis@gmail.com>,
"Harry Wentland" <harry.wentland@amd.com>,
"Lucas De Marchi" <demarchi@kernel.org>,
"Ville Syrjälä" <ville.syrjala@linux.intel.com>,
"Randy Dunlap" <rdunlap@infradead.org>,
"Nick Desaulniers" <ndesaulniers@google.com>,
"Louis Chauvet" <louis.chauvet@bootlin.com>,
"Shuah Khan" <skhan@linuxfoundation.org>,
"Miguel Ojeda" <ojeda@kernel.org>,
"Nathan Chancellor" <nathan@kernel.org>,
"Nick Desaulniers" <nick.desaulniers+lkml@gmail.com>,
"Bill Wendling" <morbo@google.com>,
"Justin Stitt" <justinstitt@google.com>
Cc: Luca Ceresoli <luca.ceresoli@bootlin.com>,
Kory Maincent <kory.maincent@bootlin.com>,
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 <simona.vetter@ffwll.ch>,
llvm@lists.linux.dev
Subject: [PATCH v6 26/43] drm/vkms: Introduce config for plane format
Date: Fri, 20 Nov 2026 18:59:08 +0100 [thread overview]
Message-ID: <20261120-vkms-all-config-v6-26-78ace90f4fc1@bootlin.com> (raw)
In-Reply-To: <20261120-vkms-all-config-v6-0-78ace90f4fc1@bootlin.com>
VKMS driver supports all the pixel formats for planes, but for testing it
can be useful to only advertise few of them. This new configuration
interface will allow configuring the pixel format per planes.
Signed-off-by: Louis Chauvet <louis.chauvet@bootlin.com>
---
drivers/gpu/drm/vkms/vkms_config.c | 140 +++++++++++++++++++++++++++++++++++++
drivers/gpu/drm/vkms/vkms_config.h | 51 ++++++++++++++
drivers/gpu/drm/vkms/vkms_plane.c | 39 +----------
3 files changed, 193 insertions(+), 37 deletions(-)
diff --git a/drivers/gpu/drm/vkms/vkms_config.c b/drivers/gpu/drm/vkms/vkms_config.c
index b33760692ba9..5286363f80f7 100644
--- a/drivers/gpu/drm/vkms/vkms_config.c
+++ b/drivers/gpu/drm/vkms/vkms_config.c
@@ -15,6 +15,42 @@
static void vkms_config_connector_release(struct kref *ref);
+static const u32 vkms_supported_plane_formats[] = {
+ DRM_FORMAT_ARGB8888,
+ DRM_FORMAT_ABGR8888,
+ DRM_FORMAT_BGRA8888,
+ DRM_FORMAT_RGBA8888,
+ DRM_FORMAT_XRGB8888,
+ DRM_FORMAT_XBGR8888,
+ DRM_FORMAT_RGB888,
+ DRM_FORMAT_BGR888,
+ DRM_FORMAT_XRGB16161616,
+ DRM_FORMAT_XBGR16161616,
+ DRM_FORMAT_ARGB16161616,
+ DRM_FORMAT_ABGR16161616,
+ DRM_FORMAT_RGB565,
+ DRM_FORMAT_BGR565,
+ DRM_FORMAT_NV12,
+ DRM_FORMAT_NV16,
+ DRM_FORMAT_NV24,
+ DRM_FORMAT_NV21,
+ DRM_FORMAT_NV61,
+ DRM_FORMAT_NV42,
+ DRM_FORMAT_YUV420,
+ DRM_FORMAT_YUV422,
+ DRM_FORMAT_YUV444,
+ DRM_FORMAT_YVU420,
+ DRM_FORMAT_YVU422,
+ DRM_FORMAT_YVU444,
+ DRM_FORMAT_P010,
+ DRM_FORMAT_P012,
+ DRM_FORMAT_P016,
+ DRM_FORMAT_R1,
+ DRM_FORMAT_R2,
+ DRM_FORMAT_R4,
+ DRM_FORMAT_R8,
+};
+
struct vkms_config *vkms_config_create(const char *dev_name)
{
struct vkms_config *config;
@@ -411,6 +447,17 @@ bool vkms_config_is_valid(const struct vkms_config *config)
struct vkms_config_plane *plane_cfg;
vkms_config_for_each_plane(config, plane_cfg) {
+ if (vkms_config_plane_get_supported_formats_count(plane_cfg) == 0) {
+ drm_info(dev, "Plane must have at least one supported format.\n");
+ return false;
+ }
+
+ if (vkms_config_plane_get_supported_formats_count(plane_cfg) >
+ ARRAY_SIZE(vkms_supported_plane_formats)) {
+ drm_info(dev, "Plane has too much formats.\n");
+ return false;
+ }
+
if (!vkms_config_valid_plane_rotation(config, plane_cfg))
return false;
@@ -474,6 +521,15 @@ static __nocfi void show_bitfield(struct seq_file *m, uint32_t value, const char
}
}
+static void show_formats(struct seq_file *m, u32 *formats, size_t formats_count)
+{
+ for (int i = 0; i < formats_count; i++) {
+ seq_printf(m, "%p4cc", &formats[i]);
+ if (i != formats_count - 1)
+ seq_puts(m, ", ");
+ }
+}
+
static int vkms_config_show(struct seq_file *m, void *data)
{
struct drm_debugfs_entry *entry = m->private;
@@ -519,6 +575,10 @@ static int vkms_config_show(struct seq_file *m, void *data)
seq_puts(m, "\n");
seq_printf(m, "\tdefault color range=%s\n",
drm_get_color_range_name(vkms_config_plane_get_default_color_range(plane_cfg)));
+ seq_puts(m, "\tsupported formats=");
+ show_formats(m, vkms_config_plane_get_supported_formats(plane_cfg),
+ vkms_config_plane_get_supported_formats_count(plane_cfg));
+ seq_puts(m, "\n");
}
vkms_config_for_each_crtc(vkmsdev->config, crtc_cfg) {
@@ -569,6 +629,10 @@ struct vkms_config_plane __must_check *vkms_config_create_plane(struct vkms_conf
if (ret)
goto cleanup_plane_cfg;
+ ret = vkms_config_plane_add_all_formats(plane_cfg);
+ if (ret)
+ goto cleanup_plane_cfg;
+
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);
@@ -587,6 +651,7 @@ struct vkms_config_plane __must_check *vkms_config_create_plane(struct vkms_conf
return plane_cfg;
cleanup_plane_cfg:
+ kfree(plane_cfg->supported_formats);
kfree(plane_cfg);
fail:
return ERR_PTR(ret);
@@ -596,6 +661,7 @@ EXPORT_SYMBOL_IF_KUNIT(vkms_config_create_plane);
void vkms_config_destroy_plane(struct vkms_config_plane *plane_cfg)
{
xa_destroy(&plane_cfg->possible_crtcs);
+ kfree(plane_cfg->supported_formats);
list_del(&plane_cfg->link);
kfree(plane_cfg->name);
kfree(plane_cfg);
@@ -700,6 +766,80 @@ static struct vkms_config_plane *vkms_config_crtc_get_plane(const struct vkms_co
return NULL;
}
+int __must_check vkms_config_plane_add_all_formats(struct vkms_config_plane *plane_cfg)
+{
+ u32 *ret = krealloc_array(plane_cfg->supported_formats,
+ ARRAY_SIZE(vkms_supported_plane_formats),
+ sizeof(uint32_t), GFP_KERNEL);
+ if (!ret)
+ return -ENOMEM;
+ plane_cfg->supported_formats = ret;
+
+ memcpy(plane_cfg->supported_formats, vkms_supported_plane_formats,
+ sizeof(vkms_supported_plane_formats));
+ plane_cfg->supported_formats_count = ARRAY_SIZE(vkms_supported_plane_formats);
+ return 0;
+}
+
+static bool is_supported_format(u32 drm_format)
+{
+ for (int i = 0; i < ARRAY_SIZE(vkms_supported_plane_formats); i++) {
+ if (vkms_supported_plane_formats[i] == drm_format)
+ return true;
+ }
+
+ return false;
+}
+
+static bool vkms_config_plane_has_format(struct vkms_config_plane *plane_cfg, u32 drm_format)
+{
+ for (unsigned int i = 0; i < plane_cfg->supported_formats_count; i++) {
+ if (plane_cfg->supported_formats[i] == drm_format)
+ return true;
+ }
+ return false;
+}
+
+int __must_check vkms_config_plane_add_format(struct vkms_config_plane *plane_cfg, u32 drm_format)
+{
+ if (!is_supported_format(drm_format))
+ return -EINVAL;
+
+ if (vkms_config_plane_has_format(plane_cfg, drm_format))
+ return 0;
+
+ u32 *new_ptr = krealloc_array(plane_cfg->supported_formats,
+ plane_cfg->supported_formats_count + 1,
+ sizeof(*plane_cfg->supported_formats), GFP_KERNEL);
+ if (!new_ptr)
+ return -ENOMEM;
+
+ plane_cfg->supported_formats = new_ptr;
+ plane_cfg->supported_formats[plane_cfg->supported_formats_count] = drm_format;
+ plane_cfg->supported_formats_count++;
+
+ return 0;
+}
+
+void vkms_config_plane_remove_all_formats(struct vkms_config_plane *plane_cfg)
+{
+ plane_cfg->supported_formats_count = 0;
+ kfree(plane_cfg->supported_formats);
+ plane_cfg->supported_formats = NULL;
+}
+
+void vkms_config_plane_remove_format(struct vkms_config_plane *plane_cfg, u32 drm_format)
+{
+ for (unsigned int i = 0; i < plane_cfg->supported_formats_count; i++) {
+ if (plane_cfg->supported_formats[i] == drm_format) {
+ plane_cfg->supported_formats[i] =
+ plane_cfg->supported_formats[plane_cfg->supported_formats_count -
+ 1];
+ plane_cfg->supported_formats_count--;
+ }
+ }
+}
+
struct vkms_config_plane *vkms_config_crtc_primary_plane(const struct vkms_config *config,
struct vkms_config_crtc *crtc_cfg)
{
diff --git a/drivers/gpu/drm/vkms/vkms_config.h b/drivers/gpu/drm/vkms/vkms_config.h
index 827f1b3023aa..7488a17aee8d 100644
--- a/drivers/gpu/drm/vkms/vkms_config.h
+++ b/drivers/gpu/drm/vkms/vkms_config.h
@@ -58,6 +58,8 @@ struct vkms_config {
* @supported_color_encodings: Color encodings that this plane will support
* @default_color_range: Default color range that should be used by this plane
* @supported_color_ranges: Color ranges that this plane will support
+ * @supported_formats: List of supported formats
+ * @supported_formats_count: Length of @supported_formats
*/
struct vkms_config_plane {
struct list_head link;
@@ -71,6 +73,8 @@ struct vkms_config_plane {
unsigned int supported_color_encodings;
enum drm_color_range default_color_range;
unsigned int supported_color_ranges;
+ u32 *supported_formats;
+ unsigned int supported_formats_count;
struct xarray possible_crtcs;
bool default_pipeline;
@@ -502,6 +506,53 @@ bool vkms_config_valid_plane_color_range(const struct vkms_config *config,
const struct vkms_config_plane *plane_cfg);
#endif
+static inline u32 *
+vkms_config_plane_get_supported_formats(const struct vkms_config_plane *plane_cfg)
+{
+ return plane_cfg->supported_formats;
+}
+
+static inline unsigned int
+vkms_config_plane_get_supported_formats_count(struct vkms_config_plane *plane_cfg)
+{
+ return plane_cfg->supported_formats_count;
+}
+
+/** vkms_config_plane_add_format - Add a format to the list of supported format of a plane
+ *
+ * The passed drm_format can already be present in the list. This may fail if the allocation of a
+ * bigger array fails.
+ *
+ * @plane_cfg: Plane to add the format to
+ * @drm_format: Format to add to this plane
+ *
+ * Returns: 0 on success, -ENOMEM if array allocation fails, -EINVAL if the format is not supported
+ * by VKMS
+ */
+int __must_check vkms_config_plane_add_format(struct vkms_config_plane *plane_cfg, u32 drm_format);
+
+/**
+ * vkms_config_plane_add_all_formats - Helper to quickly add all the supported formats
+ * @plane_cfg: Plane to add the formats to
+ *
+ * Returns: 0 on success, -ENOMEM if array allocation fails
+ * by VKMS
+ */
+int __must_check vkms_config_plane_add_all_formats(struct vkms_config_plane *plane_cfg);
+
+/**
+ * vkms_config_plane_remove_format - Remove a specific format from a plane
+ * @plane_cfg: Plane to remove the format from
+ * @drm_format: Format to remove
+ */
+void vkms_config_plane_remove_format(struct vkms_config_plane *plane_cfg, u32 drm_format);
+
+/**
+ * vkms_config_plane_remove_all_formats - Remove all formats from a plane
+ * @plane_cfg: Plane to remove the formats from
+ */
+void vkms_config_plane_remove_all_formats(struct vkms_config_plane *plane_cfg);
+
/**
* 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 d7bbcaea6351..e028c39b0c81 100644
--- a/drivers/gpu/drm/vkms/vkms_plane.c
+++ b/drivers/gpu/drm/vkms/vkms_plane.c
@@ -16,42 +16,6 @@
#include "vkms_drv.h"
#include "vkms_formats.h"
-static const u32 vkms_formats[] = {
- DRM_FORMAT_ARGB8888,
- DRM_FORMAT_ABGR8888,
- DRM_FORMAT_BGRA8888,
- DRM_FORMAT_RGBA8888,
- DRM_FORMAT_XRGB8888,
- DRM_FORMAT_XBGR8888,
- DRM_FORMAT_RGB888,
- DRM_FORMAT_BGR888,
- DRM_FORMAT_XRGB16161616,
- DRM_FORMAT_XBGR16161616,
- DRM_FORMAT_ARGB16161616,
- DRM_FORMAT_ABGR16161616,
- DRM_FORMAT_RGB565,
- DRM_FORMAT_BGR565,
- DRM_FORMAT_NV12,
- DRM_FORMAT_NV16,
- DRM_FORMAT_NV24,
- DRM_FORMAT_NV21,
- DRM_FORMAT_NV61,
- DRM_FORMAT_NV42,
- DRM_FORMAT_YUV420,
- DRM_FORMAT_YUV422,
- DRM_FORMAT_YUV444,
- DRM_FORMAT_YVU420,
- DRM_FORMAT_YVU422,
- DRM_FORMAT_YVU444,
- DRM_FORMAT_P010,
- DRM_FORMAT_P012,
- DRM_FORMAT_P016,
- DRM_FORMAT_R1,
- DRM_FORMAT_R2,
- DRM_FORMAT_R4,
- DRM_FORMAT_R8,
-};
-
static struct drm_plane_state *
vkms_plane_duplicate_state(struct drm_plane *plane)
{
@@ -264,7 +228,8 @@ struct vkms_plane *vkms_plane_init(struct vkms_device *vkmsdev,
plane = drmm_universal_plane_alloc(dev, struct vkms_plane, base, 0,
&vkms_plane_funcs,
- vkms_formats, ARRAY_SIZE(vkms_formats),
+ vkms_config_plane_get_supported_formats(plane_cfg),
+ vkms_config_plane_get_supported_formats_count(plane_cfg),
NULL, vkms_config_plane_get_type(plane_cfg),
"%s", vkms_config_plane_get_name(plane_cfg));
if (IS_ERR(plane))
--
2.56.0
next prev parent reply other threads:[~2026-11-20 18:04 UTC|newest]
Thread overview: 36+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-11-20 17:58 [PATCH v6 00/43] VKMS: Introduce multiple configFS attributes Louis Chauvet
2026-11-20 17:58 ` [PATCH v6 01/43] drm/vkms: Explicitly display connector status Louis Chauvet
2026-11-20 17:58 ` [PATCH v6 02/43] drm/vkms: Lock the config dump against concurrent configfs changes Louis Chauvet
2026-11-20 17:58 ` [PATCH v6 03/43] drm/vkms: Add new lines for configfs attributes Louis Chauvet
2026-11-20 17:58 ` [PATCH v6 04/43] drm/drm_mode_config: Add helper to get plane type name Louis Chauvet
2026-11-20 17:58 ` [PATCH v6 05/43] drm/blend: Get a rotation name from its bitfield Louis Chauvet
2026-11-20 17:58 ` [PATCH v6 06/43] drm/tests: Add test cases for DRM rotation name Louis Chauvet
2026-11-20 17:58 ` [PATCH v6 07/43] drm/drm_color_mgmt: Expose drm_get_color_encoding_name Louis Chauvet
2026-11-20 17:58 ` [PATCH v6 08/43] drm/drm_color_mgmt: Expose drm_get_color_range_name Louis Chauvet
2026-11-20 17:58 ` [PATCH v6 09/43] drm/connector: Export drm_get_colorspace_name Louis Chauvet
2026-11-20 17:58 ` [PATCH v6 10/43] drm/drm_atomic_state_helper: Properly load default value for rotation Louis Chauvet
2026-11-20 17:58 ` [PATCH v6 11/43] Documentation: ABI: vkms: Add current VKMS ABI documentation Louis Chauvet
2026-11-20 17:58 ` [PATCH v6 12/43] drm/vkms: Reference-count vkms_config and vkms_config_connector Louis Chauvet
2026-11-20 17:58 ` [PATCH v6 13/43] drm/vkms: Add KUnit test for device lifecycle Louis Chauvet
2026-11-20 17:58 ` [PATCH v6 14/43] drm/vkms: Add error handling in plane config creation Louis Chauvet
2026-11-20 17:58 ` [PATCH v6 15/43] drm/vkms: Simplify plane_release code Louis Chauvet
2026-11-20 17:58 ` [PATCH v6 16/43] drm/vkms: Explicitly display plane type Louis Chauvet
2026-11-20 17:58 ` [PATCH v6 17/43] drm/vkms: Use enabled/disabled instead of 1/0 for debug Louis Chauvet
2026-11-20 17:59 ` [PATCH v6 18/43] drm/vkms: Introduce config for plane name Louis Chauvet
2026-11-20 17:59 ` [PATCH v6 19/43] drm/vkms: Use plane folder name as " Louis Chauvet
2026-11-20 17:59 ` [PATCH v6 20/43] drm/vkms: Introduce config for plane rotation Louis Chauvet
2026-11-20 17:59 ` [PATCH v6 21/43] drm/vkms: Introduce configfs " Louis Chauvet
2026-11-20 17:59 ` [PATCH v6 22/43] drm/vkms: Introduce config for plane color encoding Louis Chauvet
2026-11-20 17:59 ` [PATCH v6 23/43] drm/vkms: Introduce configfs " Louis Chauvet
2026-11-20 17:59 ` [PATCH v6 24/43] drm/vkms: Introduce config for plane color range Louis Chauvet
2026-11-20 17:59 ` [PATCH v6 25/43] drm/vkms: Introduce configfs " Louis Chauvet
2026-11-20 17:59 ` Louis Chauvet [this message]
2026-11-20 17:59 ` [PATCH v6 27/43] drm/vkms: Introduce configfs for plane format Louis Chauvet
2026-11-20 17:59 ` [PATCH v6 28/43] drm/vkms: Properly render plane using their zpos Louis Chauvet
2026-11-20 17:59 ` [PATCH v6 29/43] drm/vkms: Introduce config for plane zpos property Louis Chauvet
2026-11-20 17:59 ` [PATCH v6 30/43] drm/vkms: Introduce configfs " Louis Chauvet
2026-11-20 17:59 ` [PATCH v6 31/43] drm/vkms: Introduce back pointer to connector Louis Chauvet
2026-11-20 17:59 ` [PATCH v6 32/43] drm/vkms: Introduce connector type Louis Chauvet
2026-11-20 17:59 ` [PATCH v6 33/43] drm/vkms: Introduce configfs for " Louis Chauvet
2026-11-20 17:59 ` [PATCH v6 34/43] drm/vkms: Rename vkms_connector_init to vkms_connector_init_static Louis Chauvet
2026-11-20 17:59 ` [PATCH v6 35/43] drm/vkms: Introduce config for connector supported colorspace Louis Chauvet
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20261120-vkms-all-config-v6-26-78ace90f4fc1@bootlin.com \
--to=louis.chauvet@bootlin.com \
--cc=airlied@gmail.com \
--cc=corbet@lwn.net \
--cc=demarchi@kernel.org \
--cc=dri-devel@lists.freedesktop.org \
--cc=hamohammed.sa@gmail.com \
--cc=harry.wentland@amd.com \
--cc=jose.exposito89@gmail.com \
--cc=justinstitt@google.com \
--cc=kory.maincent@bootlin.com \
--cc=linux-doc@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=llvm@lists.linux.dev \
--cc=luca.ceresoli@bootlin.com \
--cc=maarten.lankhorst@linux.intel.com \
--cc=melissa.srw@gmail.com \
--cc=morbo@google.com \
--cc=mripard@kernel.org \
--cc=nathan@kernel.org \
--cc=ndesaulniers@google.com \
--cc=nick.desaulniers+lkml@gmail.com \
--cc=oaroraetimis@gmail.com \
--cc=ojeda@kernel.org \
--cc=rdunlap@infradead.org \
--cc=sebastian.wick@redhat.com \
--cc=simona.vetter@ffwll.ch \
--cc=simona@ffwll.ch \
--cc=skhan@linuxfoundation.org \
--cc=thomas.petazzoni@bootlin.com \
--cc=tzimmermann@suse.de \
--cc=victoria@system76.com \
--cc=ville.syrjala@linux.intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®