From: "José Expósito" <jose.exposito89@gmail.com>
To: rodrigosiqueiramelo@gmail.com
Cc: melissa.srw@gmail.com, hamohammed.sa@gmail.com, daniel@ffwll.ch,
airlied@linux.ie, dri-devel@lists.freedesktop.org,
linux-kernel@vger.kernel.org, cphealy@gmail.com,
contact@emersion.fr, "José Expósito" <jose.exposito89@gmail.com>
Subject: [PATCH v2 2/2] drm/vkms: set plane modifiers
Date: Thu, 16 Dec 2021 18:01:40 +0100 [thread overview]
Message-ID: <20211216170140.15803-2-jose.exposito89@gmail.com> (raw)
In-Reply-To: <20211216170140.15803-1-jose.exposito89@gmail.com>
Where no modifiers are exposed, usually linear modifier is assumed.
However, userspace code is starting to expect IN_FORMATS even when the
only supported modifiers are linear [1].
To avoid possible issues, explicitly set the DRM_FORMAT_MOD_LINEAR
modifier.
[1] https://gitlab.freedesktop.org/wayland/weston/-/merge_requests/599/diffs?commit_id=5aea1bc522f0874e6cc07f5120fbcf1736706536
Suggested-by: Chris Healy <cphealy@gmail.com>
Signed-off-by: José Expósito <jose.exposito89@gmail.com>
---
v2: Implement format_mod_supported (Simon Ser)
---
drivers/gpu/drm/vkms/vkms_plane.c | 34 ++++++++++++++++++++++++++++++-
1 file changed, 33 insertions(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/vkms/vkms_plane.c b/drivers/gpu/drm/vkms/vkms_plane.c
index 76a06dd92ac1..7e0d021494c3 100644
--- a/drivers/gpu/drm/vkms/vkms_plane.c
+++ b/drivers/gpu/drm/vkms/vkms_plane.c
@@ -20,6 +20,11 @@ static const u32 vkms_plane_formats[] = {
DRM_FORMAT_XRGB8888
};
+static const u64 vkms_plane_modifiers[] = {
+ DRM_FORMAT_MOD_LINEAR,
+ DRM_FORMAT_MOD_INVALID
+};
+
static struct drm_plane_state *
vkms_plane_duplicate_state(struct drm_plane *plane)
{
@@ -100,12 +105,39 @@ static void vkms_formats_for_plane_type(enum drm_plane_type type,
}
}
+static bool vkms_format_mod_supported(struct drm_plane *plane, u32 format,
+ u64 modifier)
+{
+ bool modifier_found = false;
+ unsigned int i;
+ const u32 *formats;
+ int nformats;
+
+ for (i = 0; i < ARRAY_SIZE(vkms_plane_modifiers) - 1; i++) {
+ if (vkms_plane_modifiers[i] == modifier)
+ modifier_found = true;
+ }
+
+ if (!modifier_found)
+ return false;
+
+ vkms_formats_for_plane_type(plane->type, &formats, &nformats);
+
+ for (i = 0; i < nformats; i++) {
+ if (formats[i] == format)
+ return true;
+ }
+
+ return false;
+}
+
static const struct drm_plane_funcs vkms_plane_funcs = {
.update_plane = drm_atomic_helper_update_plane,
.disable_plane = drm_atomic_helper_disable_plane,
.reset = vkms_plane_reset,
.atomic_duplicate_state = vkms_plane_duplicate_state,
.atomic_destroy_state = vkms_plane_destroy_state,
+ .format_mod_supported = vkms_format_mod_supported,
};
static void vkms_plane_atomic_update(struct drm_plane *plane,
@@ -190,7 +222,7 @@ struct vkms_plane *vkms_plane_init(struct vkms_device *vkmsdev,
plane = drmm_universal_plane_alloc(dev, struct vkms_plane, base, 1 << index,
&vkms_plane_funcs,
formats, nformats,
- NULL, type, NULL);
+ vkms_plane_modifiers, type, NULL);
if (IS_ERR(plane))
return plane;
--
2.25.1
next prev parent reply other threads:[~2021-12-16 17:02 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-12-16 17:01 [PATCH v2 1/2] drm/vkms: add function to get plane formats José Expósito
2021-12-16 17:01 ` José Expósito [this message]
2021-12-21 10:39 ` [PATCH v2 2/2] drm/vkms: set plane modifiers 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=20211216170140.15803-2-jose.exposito89@gmail.com \
--to=jose.exposito89@gmail.com \
--cc=airlied@linux.ie \
--cc=contact@emersion.fr \
--cc=cphealy@gmail.com \
--cc=daniel@ffwll.ch \
--cc=dri-devel@lists.freedesktop.org \
--cc=hamohammed.sa@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=melissa.srw@gmail.com \
--cc=rodrigosiqueiramelo@gmail.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;
as well as URLs for NNTP newsgroup(s).