[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <20210715182513.526263732@linuxfoundation.org>
Date: Thu, 15 Jul 2021 20:38:52 +0200
From: Greg Kroah-Hartman <gregkh@...uxfoundation.org>
To: linux-kernel@...r.kernel.org
Cc: Greg Kroah-Hartman <gregkh@...uxfoundation.org>,
stable@...r.kernel.org, Liviu Dudau <liviu.dudau@....com>,
Pekka Paalanen <pekka.paalanen@...labora.com>,
Lyude Paul <lyude@...hat.com>,
Brian Starkey <brian.starkey@....com>,
Daniel Vetter <daniel.vetter@...el.com>
Subject: [PATCH 5.4 085/122] drm/arm/malidp: Always list modifiers
From: Daniel Vetter <daniel.vetter@...ll.ch>
commit 26c3e7fd5a3499e408915dadae5d5360790aae9a upstream.
Even when all we support is linear, make that explicit. Otherwise the
uapi is rather confusing.
Acked-by: Liviu Dudau <liviu.dudau@....com>
Acked-by: Pekka Paalanen <pekka.paalanen@...labora.com>
Reviewed-by: Lyude Paul <lyude@...hat.com>
Cc: stable@...r.kernel.org
Cc: Pekka Paalanen <pekka.paalanen@...labora.com>
Cc: Liviu Dudau <liviu.dudau@....com>
Cc: Brian Starkey <brian.starkey@....com>
Signed-off-by: Daniel Vetter <daniel.vetter@...el.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20210427092018.832258-2-daniel.vetter@ffwll.ch
Signed-off-by: Greg Kroah-Hartman <gregkh@...uxfoundation.org>
---
drivers/gpu/drm/arm/malidp_planes.c | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
--- a/drivers/gpu/drm/arm/malidp_planes.c
+++ b/drivers/gpu/drm/arm/malidp_planes.c
@@ -922,6 +922,11 @@ static const struct drm_plane_helper_fun
.atomic_disable = malidp_de_plane_disable,
};
+static const uint64_t linear_only_modifiers[] = {
+ DRM_FORMAT_MOD_LINEAR,
+ DRM_FORMAT_MOD_INVALID
+};
+
int malidp_de_planes_init(struct drm_device *drm)
{
struct malidp_drm *malidp = drm->dev_private;
@@ -985,8 +990,8 @@ int malidp_de_planes_init(struct drm_dev
*/
ret = drm_universal_plane_init(drm, &plane->base, crtcs,
&malidp_de_plane_funcs, formats, n,
- (id == DE_SMART) ? NULL : modifiers, plane_type,
- NULL);
+ (id == DE_SMART) ? linear_only_modifiers : modifiers,
+ plane_type, NULL);
if (ret < 0)
goto cleanup;
Powered by blists - more mailing lists