From: Lucas Stach <l.stach@pengutronix.de>
To: Daniel Vetter <daniel.vetter@ffwll.ch>,
DRI Development <dri-devel@lists.freedesktop.org>
Cc: David Airlie <airlied@linux.ie>,
Daniel Vetter <daniel.vetter@intel.com>,
Intel Graphics Development <intel-gfx@lists.freedesktop.org>,
Pekka Paalanen <pekka.paalanen@collabora.com>,
Thomas Zimmermann <tzimmermann@suse.de>
Subject: Re: [PATCH 12/12] drm/modifiers: Enforce consistency between the cap an IN_FORMATS
Date: Tue, 13 Apr 2021 13:54:00 +0200 [thread overview]
Message-ID: <bea01abded059c00de330fbc154ee0db7378d58e.camel@pengutronix.de> (raw)
In-Reply-To: <20210413094904.3736372-12-daniel.vetter@ffwll.ch>
Am Dienstag, dem 13.04.2021 um 11:49 +0200 schrieb Daniel Vetter:
> It's very confusing for userspace to have to deal with inconsistencies
> here, and some drivers screwed this up a bit. Most just ommitted the
> format list when they meant to say that only linear modifier is
> allowed, but some also meant that only implied modifiers are
> acceptable (because actually none of the planes registered supported
> modifiers).
For a lot of the embedded display drivers that never had any out-of-
band tiling meta shared with the GPU part, the implied modifier is
actually DRM_FORMAT_MOD_LINEAR, so maybe that's where some of the
confusion about needing to specify the modifier list comes from.
> Now that this is all done consistently across all drivers, document
> the rules and enforce it in the drm core.
This clarification looks good to me.
Reviewed-by: Lucas Stach <l.stach@pengutronix.de>
> Cc: Pekka Paalanen <pekka.paalanen@collabora.com>
> Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
> Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
> Cc: Maxime Ripard <mripard@kernel.org>
> Cc: Thomas Zimmermann <tzimmermann@suse.de>
> Cc: David Airlie <airlied@linux.ie>
> Cc: Daniel Vetter <daniel@ffwll.ch>
> ---
> drivers/gpu/drm/drm_plane.c | 16 +++++++++++++++-
> include/drm/drm_mode_config.h | 2 ++
> 2 files changed, 17 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/drm_plane.c b/drivers/gpu/drm/drm_plane.c
> index 0dd43882fe7c..16a7e3e57f7f 100644
> --- a/drivers/gpu/drm/drm_plane.c
> +++ b/drivers/gpu/drm/drm_plane.c
> @@ -128,6 +128,11 @@
> * pairs supported by this plane. The blob is a struct
> * drm_format_modifier_blob. Without this property the plane doesn't
> * support buffers with modifiers. Userspace cannot change this property.
> + *
> + * Note that userspace can check the DRM_CAP_ADDFB2_MODIFIERS driver
> + * capability for general modifier support. If this flag is set then every
> + * plane will have the IN_FORMATS property, even when it only supports
> + * DRM_FORMAT_MOD_LINEAR.
> */
>
>
>
>
>
>
>
>
> static unsigned int drm_num_planes(struct drm_device *dev)
> @@ -277,8 +282,14 @@ static int __drm_universal_plane_init(struct drm_device *dev,
> format_modifier_count++;
> }
>
>
>
>
>
>
>
>
> - if (format_modifier_count)
> + /* autoset the cap and check for consistency across all planes */
> + if (format_modifier_count) {
> + WARN_ON(!config->allow_fb_modifiers &&
> + !list_empty(&config->plane_list));
> config->allow_fb_modifiers = true;
> + } else {
> + WARN_ON(config->allow_fb_modifiers);
> + }
>
>
>
>
>
>
>
>
> plane->modifier_count = format_modifier_count;
> plane->modifiers = kmalloc_array(format_modifier_count,
> @@ -360,6 +371,9 @@ static int __drm_universal_plane_init(struct drm_device *dev,
> * drm_universal_plane_init() to let the DRM managed resource infrastructure
> * take care of cleanup and deallocation.
> *
> + * Drivers supporting modifiers must set @format_modifiers on all their planes,
> + * even those that only support DRM_FORMAT_MOD_LINEAR.
> + *
> * Returns:
> * Zero on success, error code on failure.
> */
> diff --git a/include/drm/drm_mode_config.h b/include/drm/drm_mode_config.h
> index ab424ddd7665..1ddf7783fdf7 100644
> --- a/include/drm/drm_mode_config.h
> +++ b/include/drm/drm_mode_config.h
> @@ -909,6 +909,8 @@ struct drm_mode_config {
> * @allow_fb_modifiers:
> *
> * Whether the driver supports fb modifiers in the ADDFB2.1 ioctl call.
> + * Note that drivers should not set this directly, it is automatically
> + * set in drm_universal_plane_init().
> *
> * IMPORTANT:
> *
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
next prev parent reply other threads:[~2021-04-13 11:54 UTC|newest]
Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-04-13 9:48 [PATCH 01/12] drm/arm: Don't set allow_fb_modifiers explicitly Daniel Vetter
2021-04-13 9:48 ` [PATCH 02/12] drm/arm/malidp: Always list modifiers Daniel Vetter
2021-04-13 9:48 ` [PATCH 03/12] drm/exynos: Don't set allow_fb_modifiers explicitly Daniel Vetter
2021-04-20 6:31 ` Inki Dae
2021-04-20 8:41 ` Daniel Vetter
2021-04-13 9:48 ` [PATCH 04/12] drm/i915: " Daniel Vetter
2021-04-13 9:48 ` [PATCH 05/12] drm/imx: " Daniel Vetter
2021-04-13 11:47 ` Lucas Stach
2021-04-13 14:04 ` Daniel Vetter
2021-04-13 14:14 ` Lucas Stach
2021-04-14 2:24 ` Liu Ying
2021-04-14 9:10 ` Daniel Vetter
2021-04-15 11:35 ` Daniel Vetter
2021-04-13 9:48 ` [PATCH 06/12] drm/msm/dpu1: " Daniel Vetter
2021-04-13 9:48 ` [PATCH 07/12] drm/msm/mdp4: Fix modifier support enabling Daniel Vetter
2021-04-13 9:48 ` [PATCH 08/12] drm/nouveau: Don't set allow_fb_modifiers explicitly Daniel Vetter
2021-04-13 9:49 ` [PATCH 09/12] drm/stm: " Daniel Vetter
2021-04-13 9:49 ` [PATCH 10/12] drm/tegra: " Daniel Vetter
2021-04-13 11:37 ` Thierry Reding
2021-04-15 11:33 ` Daniel Vetter
2021-04-13 9:49 ` [PATCH 11/12] drm/vc4: " Daniel Vetter
2021-04-14 8:51 ` Maxime Ripard
2021-04-13 9:49 ` [PATCH 12/12] drm/modifiers: Enforce consistency between the cap an IN_FORMATS Daniel Vetter
2021-04-13 11:54 ` Lucas Stach [this message]
2021-04-13 14:17 ` Daniel Vetter
2021-04-13 11:56 ` Pekka Paalanen
2021-04-13 14:11 ` Daniel Vetter
2021-04-13 14:19 ` Daniel Vetter
2021-04-14 7:45 ` Pekka Paalanen
2021-04-13 15:22 ` Simon Ser
2021-04-14 8:52 ` Maxime Ripard
2021-04-14 9:08 ` [PATCH] " Daniel Vetter
2021-04-14 12:14 ` Pekka Paalanen
2021-04-16 6:30 ` Simon Ser
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=bea01abded059c00de330fbc154ee0db7378d58e.camel@pengutronix.de \
--to=l.stach@pengutronix.de \
--cc=airlied@linux.ie \
--cc=daniel.vetter@ffwll.ch \
--cc=daniel.vetter@intel.com \
--cc=dri-devel@lists.freedesktop.org \
--cc=intel-gfx@lists.freedesktop.org \
--cc=pekka.paalanen@collabora.com \
--cc=tzimmermann@suse.de \
/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;
as well as URLs for NNTP newsgroup(s).