From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 981BACCF9E0 for ; Fri, 24 Oct 2025 15:44:17 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id ECB5110E204; Fri, 24 Oct 2025 15:44:16 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="IklG6q4h"; dkim-atps=neutral Received: from mail-wm1-f53.google.com (mail-wm1-f53.google.com [209.85.128.53]) by gabe.freedesktop.org (Postfix) with ESMTPS id C76E110E201 for ; Fri, 24 Oct 2025 15:44:14 +0000 (UTC) Received: by mail-wm1-f53.google.com with SMTP id 5b1f17b1804b1-47117e75258so16620965e9.2 for ; Fri, 24 Oct 2025 08:44:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1761320653; x=1761925453; darn=lists.freedesktop.org; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:from:to:cc:subject:date:message-id:reply-to; bh=HyFrzmD5VGIhCjgUJBbHgOpCz5hf6OpkpWtoCO82QTo=; b=IklG6q4hLglGbaC/NPf/LGOywzLjz9/DHVp3xwgdDL3pQ2N+IS3aGCrkiCekJm2cTk c3W0WeMeC3J5IhiAd6lXzNRAKVAfBJOgxGfHAPkFh2MxGEZLIJGARqrQrFT1F+JIaJrO PA+D4X22upyKxiEQ651wwJWPajR2YkN3kuR1PWdVsxonDCN49Md8/CMOZ/ilRVmDRSLF vJGk4/J58SgsAKkyJf3h26gTwZ7R0eI9XJGwVzXwoXxqCfWXs7RiJAVwuJzN46fufqQ3 tL+/Ow7K6QjYZ1H51cphtg+TwteQ9ViDXDxLqJTdhH/kCeouDm2ULOG1N9IHnpaD3UdP M3iw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1761320653; x=1761925453; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=HyFrzmD5VGIhCjgUJBbHgOpCz5hf6OpkpWtoCO82QTo=; b=tQc1UzJDcunoL5BNqSo5XR5xo4dxY6sgj4AMoCj/TVPjNxccIx9Sqj8XFYim9GgA8a nwXv+LK+aB3Gzn1HFfoEPjXqstecDftuEW2C3mvXvrSEH78tzhYgPXtvuoxyzjhobJW0 f4Mw9uX5rap224c8ElQUZN8W8YOdxxvECl+TAqRlRbu2jfMMCJkpyVxgFikfyuGduHD2 C24cTUAR4odSURAuKQxK1/xGuFMsr/jI+TYzG8uuAriFjEORkPILszfnPtAkqov93tWu t/wAQa9btnVW1sFEjK8M0nSX9aSJWyd4mI8V74BPkmSJr3+aaHgCFMoYnqD/EEVh1r/h 7xzg== X-Forwarded-Encrypted: i=1; AJvYcCXbHIBS+OlYWmIjL4KZSFebcPVjwYgXjUWS+43eVYzyUM8SRkHNaEpb1HBueaW/ICJTAk+NTnHMvr8=@lists.freedesktop.org X-Gm-Message-State: AOJu0Yw2iCZJ+ugsX1U7aFWC5be2yuw4ViT5ssKG530zKVij4Wn5IoLB ep3+3j6Q3q+0VTeZeRTj9ZxrfjE1N3Stim2HZngG0lx4jyeUzVvEjdrz X-Gm-Gg: ASbGncufN3sgCS+xsuUdaR1TE9LZWIw3DAgE0bAQWvtJMcSbEKyfoETTj1tnMRcxI2c CqBC+bcTccV5kNMX0MOJDSTUR+9hcVqC92ZLy6s+pPY0+TvHDg8epaal+s7bimhWVSe8mbYH12z C1MXS7GLDst+JYy8JUODkzSGfpDcmdDoVQCvntD/lU4xl3rmpT3GtxqMjgQGFkHGj9XZWZVg8oa Uu9jb/tqwK+K7spFMMXPcViJcaRwF8bdqvjvJUAMn1hk59EYh6NKsnUKv7EnZKD/Tz+MESQ7uZf nbjTWKlMrArrojRIibdo+JYwvZjG6vIQg6AqN1F6NANYQGMDhdzBXAzFagaSiYXUTiQjBksxOrD 7k42rp3279AENuitDDZVhs9vLlaie34fPc9tA9cdUwnDSkPPN+165XfYDwVm4jgrROuTuClC9+s w4vS5aKHIOan2w/dSO6pJp X-Google-Smtp-Source: AGHT+IEubgG8lezOHzEid79A6EvcYG46QmDmuwMeFGV3CQH5ZDkGrXl7VIXkJVqTpBwwQDK5w3yMwQ== X-Received: by 2002:a5d:64c4:0:b0:428:3cd7:a340 with SMTP id ffacd0b85a97d-4298a0a9602mr4884639f8f.35.1761320652968; Fri, 24 Oct 2025 08:44:12 -0700 (PDT) Received: from fedora ([37.29.213.75]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-429898ed13fsm9876155f8f.44.2025.10.24.08.44.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 24 Oct 2025 08:44:12 -0700 (PDT) Date: Fri, 24 Oct 2025 17:44:09 +0200 From: =?iso-8859-1?Q?Jos=E9_Exp=F3sito?= To: Louis Chauvet Cc: Haneen Mohammed , Simona Vetter , Melissa Wen , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Jonathan Corbet , victoria@system76.com, sebastian.wick@redhat.com, thomas.petazzoni@bootlin.com, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, linux-doc@vger.kernel.org Subject: Re: [PATCH 09/22] drm/vkms: Introduce config for plane format Message-ID: References: <20251018-vkms-all-config-v1-0-a7760755d92d@bootlin.com> <20251018-vkms-all-config-v1-9-a7760755d92d@bootlin.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20251018-vkms-all-config-v1-9-a7760755d92d@bootlin.com> X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" On Sat, Oct 18, 2025 at 04:01:09AM +0200, Louis Chauvet wrote: > 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 > --- > drivers/gpu/drm/vkms/vkms_config.c | 99 ++++++++++++++++++++++++++++++++++++++ > drivers/gpu/drm/vkms/vkms_config.h | 49 +++++++++++++++++++ > drivers/gpu/drm/vkms/vkms_plane.c | 39 +-------------- > 3 files changed, 150 insertions(+), 37 deletions(-) > > diff --git a/drivers/gpu/drm/vkms/vkms_config.c b/drivers/gpu/drm/vkms/vkms_config.c > index 8f00ca21ed6e..0b975a0d47aa 100644 > --- a/drivers/gpu/drm/vkms/vkms_config.c > +++ b/drivers/gpu/drm/vkms/vkms_config.c > @@ -8,6 +8,42 @@ > > #include "vkms_config.h" > > +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; > @@ -435,6 +471,11 @@ struct vkms_config_plane *vkms_config_create_plane(struct vkms_config *config) > if (!plane_cfg) > return ERR_PTR(-ENOMEM); > > + if (vkms_config_plane_add_all_formats(plane_cfg)) { > + kfree(plane_cfg); > + return ERR_PTR(-ENOMEM); > + } > + > plane_cfg->config = config; > vkms_config_plane_set_type(plane_cfg, DRM_PLANE_TYPE_OVERLAY); > vkms_config_plane_set_name(plane_cfg, NULL); > @@ -563,6 +604,64 @@ 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; > +} > + > +int __must_check vkms_config_plane_add_format(struct vkms_config_plane *plane_cfg, u32 drm_format) > +{ > + bool found = false; > + > + for (int i = 0; i < ARRAY_SIZE(vkms_supported_plane_formats); i++) { > + if (vkms_supported_plane_formats[i] == drm_format) > + found = true; Missing break? > + } > + > + if (!found) > + return -EINVAL; > + for (unsigned int i = 0; i < plane_cfg->supported_formats_count; i++) { > + if (plane_cfg->supported_formats[i] == 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; > +} > + > +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 8127e12f00dc..0b7067508e5f 100644 > --- a/drivers/gpu/drm/vkms/vkms_config.h > +++ b/drivers/gpu/drm/vkms/vkms_config.h > @@ -62,6 +62,8 @@ struct vkms_config_plane { > unsigned int supported_color_encoding; > enum drm_color_range default_color_range; > unsigned int supported_color_range; > + u32 *supported_formats; > + unsigned int supported_formats_count; > struct xarray possible_crtcs; > > /* Internal usage */ > @@ -404,6 +406,53 @@ vkms_config_plane_set_supported_color_range(struct vkms_config_plane *plane_cfg, > plane_cfg->supported_color_range = supported_color_range; > } > > +static inline u32 * > +vkms_config_plane_get_supported_formats(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, -EINVAL if the format is not supported > + * 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 to > + * @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 formast 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 ab719da2ca0b..0414865915d8 100644 > --- a/drivers/gpu/drm/vkms/vkms_plane.c > +++ b/drivers/gpu/drm/vkms/vkms_plane.c > @@ -14,42 +14,6 @@ > #include "vkms_formats.h" > #include "vkms_config.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) > { > @@ -226,7 +190,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(config), > + vkms_config_plane_get_supported_formats_count(config), > NULL, vkms_config_plane_get_type(config), > vkms_config_plane_get_name(config)); > if (IS_ERR(plane)) > > -- > 2.51.0 >