From: Daniel Vetter <daniel@ffwll.ch>
To: Thierry Reding <thierry.reding@gmail.com>
Cc: Pekka Paalanen <pekka.paalanen@collabora.com>,
Daniel Vetter <daniel.vetter@ffwll.ch>,
Intel Graphics Development <intel-gfx@lists.freedesktop.org>,
stable@vger.kernel.org, Jonathan Hunter <jonathanh@nvidia.com>,
DRI Development <dri-devel@lists.freedesktop.org>,
linux-tegra@vger.kernel.org,
Daniel Vetter <daniel.vetter@intel.com>
Subject: Re: [PATCH 10/12] drm/tegra: Don't set allow_fb_modifiers explicitly
Date: Thu, 15 Apr 2021 13:33:46 +0200 [thread overview]
Message-ID: <YHgkmgsvBmMXiHTr@phenom.ffwll.local> (raw)
In-Reply-To: <YHWCgpq5fVpSGdSN@orome.fritz.box>
On Tue, Apr 13, 2021 at 01:37:38PM +0200, Thierry Reding wrote:
> On Tue, Apr 13, 2021 at 11:49:01AM +0200, Daniel Vetter wrote:
> > Since
> >
> > commit 890880ddfdbe256083170866e49c87618b706ac7
> > Author: Paul Kocialkowski <paul.kocialkowski@bootlin.com>
> > Date: Fri Jan 4 09:56:10 2019 +0100
> >
> > drm: Auto-set allow_fb_modifiers when given modifiers at plane init
> >
> > this is done automatically as part of plane init, if drivers set the
> > modifier list correctly. Which is the case here.
> >
> > It was slightly inconsistently though, since planes with only linear
> > modifier support haven't listed that explicitly. Fix that, and cc:
> > stable to allow userspace to rely on this. Again don't backport
> > further than where Paul's patch got added.
> >
> > Cc: stable@vger.kernel.org # v5.1 +
> > Cc: Pekka Paalanen <pekka.paalanen@collabora.com>
> > Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
> > Cc: Thierry Reding <thierry.reding@gmail.com>
> > Cc: Jonathan Hunter <jonathanh@nvidia.com>
> > Cc: linux-tegra@vger.kernel.org
> > ---
> > drivers/gpu/drm/tegra/dc.c | 10 ++++++++--
> > drivers/gpu/drm/tegra/drm.c | 2 --
> > 2 files changed, 8 insertions(+), 4 deletions(-)
> >
> > diff --git a/drivers/gpu/drm/tegra/dc.c b/drivers/gpu/drm/tegra/dc.c
> > index c9385cfd0fc1..f9845a50f866 100644
> > --- a/drivers/gpu/drm/tegra/dc.c
> > +++ b/drivers/gpu/drm/tegra/dc.c
> > @@ -959,6 +959,11 @@ static const struct drm_plane_helper_funcs tegra_cursor_plane_helper_funcs = {
> > .atomic_disable = tegra_cursor_atomic_disable,
> > };
> >
> > +static const uint64_t linear_modifiers[] = {
> > + DRM_FORMAT_MOD_LINEAR,
> > + DRM_FORMAT_MOD_INVALID
> > +};
> > +
> > static struct drm_plane *tegra_dc_cursor_plane_create(struct drm_device *drm,
> > struct tegra_dc *dc)
> > {
> > @@ -987,7 +992,7 @@ static struct drm_plane *tegra_dc_cursor_plane_create(struct drm_device *drm,
> >
> > err = drm_universal_plane_init(drm, &plane->base, possible_crtcs,
> > &tegra_plane_funcs, formats,
> > - num_formats, NULL,
> > + num_formats, linear_modifiers,
> > DRM_PLANE_TYPE_CURSOR, NULL);
> > if (err < 0) {
> > kfree(plane);
> > @@ -1106,7 +1111,8 @@ static struct drm_plane *tegra_dc_overlay_plane_create(struct drm_device *drm,
> >
> > err = drm_universal_plane_init(drm, &plane->base, possible_crtcs,
> > &tegra_plane_funcs, formats,
> > - num_formats, NULL, type, NULL);
> > + num_formats, linear_modifiers,
> > + type, NULL);
>
> I think we can do better than linear_modifiers for overlay planes, but
> given that this doesn't change existing behaviour, I'll do that in a
> separate patch.
>
> Acked-by: Thierry Reding <treding@nvidia.com>
Applied to drm-misc-next, thanks for taking a look.
-Daniel
--
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
_______________________________________________
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-15 11:33 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 [this message]
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
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=YHgkmgsvBmMXiHTr@phenom.ffwll.local \
--to=daniel@ffwll.ch \
--cc=daniel.vetter@ffwll.ch \
--cc=daniel.vetter@intel.com \
--cc=dri-devel@lists.freedesktop.org \
--cc=intel-gfx@lists.freedesktop.org \
--cc=jonathanh@nvidia.com \
--cc=linux-tegra@vger.kernel.org \
--cc=pekka.paalanen@collabora.com \
--cc=stable@vger.kernel.org \
--cc=thierry.reding@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).