From: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
To: Tomohito Esaki <etom@igel.co.jp>
Cc: dri-devel@lists.freedesktop.org,
"Alex Deucher" <alexander.deucher@amd.com>,
"Christian König" <christian.koenig@amd.com>,
"Pan, Xinhui" <Xinhui.Pan@amd.com>,
"David Airlie" <airlied@linux.ie>,
"Daniel Vetter" <daniel@ffwll.ch>,
"Maarten Lankhorst" <maarten.lankhorst@linux.intel.com>,
"Maxime Ripard" <mripard@kernel.org>,
"Thomas Zimmermann" <tzimmermann@suse.de>,
"Ben Skeggs" <bskeggs@redhat.com>,
"Michel Dänzer" <mdaenzer@redhat.com>,
"Simon Ser" <contact@emersion.fr>,
"Qingqing Zhuo" <qingqing.zhuo@amd.com>,
"Bas Nieuwenhuizen" <bas@basnieuwenhuizen.nl>,
"Mark Yacoub" <markyacoub@chromium.org>,
"Sean Paul" <seanpaul@chromium.org>,
"Evan Quan" <evan.quan@amd.com>,
"Andy Shevchenko" <andriy.shevchenko@linux.intel.com>,
"Petr Mladek" <pmladek@suse.com>,
"Sakari Ailus" <sakari.ailus@linux.intel.com>,
"Lee Jones" <lee.jones@linaro.org>,
"Abhinav Kumar" <abhinavk@codeaurora.org>,
"Dmitry Baryshkov" <dmitry.baryshkov@linaro.org>,
"Rob Clark" <robdclark@chromium.org>,
amd-gfx@lists.freedesktop.org, linux-kernel@vger.kernel.org,
nouveau@lists.freedesktop.org,
"Daniel Stone" <daniel@fooishbar.org>,
"Damian Hobson-Garcia" <dhobsong@igel.co.jp>,
"Takanari Hayama" <taki@igel.co.jp>
Subject: Re: [RFC PATCH v3 2/3] drm: add support modifiers for drivers whose planes only support linear layout
Date: Mon, 24 Jan 2022 00:37:39 +0200 [thread overview]
Message-ID: <Ye3Ys5cToECCazq2@pendragon.ideasonboard.com> (raw)
In-Reply-To: <20220114101753.24996-3-etom@igel.co.jp>
Hello Esaki-san,
Thank you for the patch.
On Fri, Jan 14, 2022 at 07:17:52PM +0900, Tomohito Esaki wrote:
> The LINEAR modifier is advertised as default if a driver doesn't specify
> modifiers.
>
> Signed-off-by: Tomohito Esaki <etom@igel.co.jp>
> ---
> drivers/gpu/drm/drm_plane.c | 15 ++++++++++++---
> include/drm/drm_plane.h | 3 +++
> 2 files changed, 15 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/gpu/drm/drm_plane.c b/drivers/gpu/drm/drm_plane.c
> index deeec60a3315..5aa7e241971e 100644
> --- a/drivers/gpu/drm/drm_plane.c
> +++ b/drivers/gpu/drm/drm_plane.c
> @@ -237,6 +237,10 @@ static int __drm_universal_plane_init(struct drm_device *dev,
> const char *name, va_list ap)
> {
> struct drm_mode_config *config = &dev->mode_config;
> + const uint64_t default_modifiers[] = {
This can be static.
> + DRM_FORMAT_MOD_LINEAR,
> + DRM_FORMAT_MOD_INVALID
No need for a terminator here. The terminator is needed in the
format_modifiers array passed to this function, to count the number of
elements, but the default_modifiers is used with a hard-coded count.
> + };
> unsigned int format_modifier_count = 0;
> int ret;
>
> @@ -277,6 +281,11 @@ static int __drm_universal_plane_init(struct drm_device *dev,
>
> while (*temp_modifiers++ != DRM_FORMAT_MOD_INVALID)
> format_modifier_count++;
> + } else {
> + if (!dev->mode_config.fb_modifiers_not_supported) {
> + format_modifiers = default_modifiers;
> + format_modifier_count = 1;
You can use
format_modifier_count = ARRAY_SIZE(default_modifiers);
> + }
> }
>
> /* autoset the cap and check for consistency across all planes */
> @@ -341,7 +350,7 @@ static int __drm_universal_plane_init(struct drm_device *dev,
> drm_object_attach_property(&plane->base, config->prop_src_h, 0);
> }
>
> - if (config->allow_fb_modifiers)
> + if (format_modifier_count)
> create_in_format_blob(dev, plane);
>
> return 0;
> @@ -368,8 +377,8 @@ 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.
> + * For drivers supporting modifiers, all planes will advertise
> + * DRM_FORMAT_MOD_LINEAR support, if @format_modifiers is not set.
I'd write this a bit differently:
* Drivers that only support the DRM_FORMAT_MOD_LINEAR modifier support may set
* @format_modifiers to NULL. The plane will advertise the linear modifier.
As fb_modifiers_not_supported is only for a few legacy drivers, I
wouldn't even mention it here, it would only obfuscate things.
> *
> * Returns:
> * Zero on success, error code on failure.
> diff --git a/include/drm/drm_plane.h b/include/drm/drm_plane.h
> index 0c1102dc4d88..cad641b1f797 100644
> --- a/include/drm/drm_plane.h
> +++ b/include/drm/drm_plane.h
> @@ -803,6 +803,9 @@ void *__drmm_universal_plane_alloc(struct drm_device *dev,
> *
> * The @drm_plane_funcs.destroy hook must be NULL.
> *
> + * For drivers supporting modifiers, all planes will advertise
> + * DRM_FORMAT_MOD_LINEAR support, if @format_modifiers is not set.
Same here.
With these small issues addressed,
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
> + *
> * Returns:
> * Pointer to new plane, or ERR_PTR on failure.
> */
--
Regards,
Laurent Pinchart
next prev parent reply other threads:[~2022-01-23 22:38 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-01-14 10:17 [RFC PATCH v3 0/3] Add support modifiers for drivers whose planes only support linear layout Tomohito Esaki
2022-01-14 10:17 ` [RFC PATCH v3 1/3] drm: introduce fb_modifiers_not_supported flag in mode_config Tomohito Esaki
2022-01-14 14:43 ` Harry Wentland
2022-01-23 22:50 ` Laurent Pinchart
2022-01-25 5:19 ` Esaki Tomohito
2022-01-14 10:17 ` [RFC PATCH v3 2/3] drm: add support modifiers for drivers whose planes only support linear layout Tomohito Esaki
2022-01-14 14:16 ` Andy Shevchenko
2022-01-14 15:07 ` Simon Ser
2022-01-14 15:17 ` Andy Shevchenko
2022-01-14 15:42 ` Simon Ser
2022-01-14 16:06 ` Andy Shevchenko
2022-01-17 5:15 ` Esaki Tomohito
2022-01-18 9:53 ` Andy Shevchenko
2022-01-19 2:35 ` Esaki Tomohito
2022-01-19 19:17 ` Andy Shevchenko
2022-01-23 22:37 ` Laurent Pinchart [this message]
2022-01-14 10:17 ` [RFC PATCH v3 3/3] drm: remove allow_fb_modifiers Tomohito Esaki
2022-01-23 22:44 ` Laurent Pinchart
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=Ye3Ys5cToECCazq2@pendragon.ideasonboard.com \
--to=laurent.pinchart@ideasonboard.com \
--cc=Xinhui.Pan@amd.com \
--cc=abhinavk@codeaurora.org \
--cc=airlied@linux.ie \
--cc=alexander.deucher@amd.com \
--cc=amd-gfx@lists.freedesktop.org \
--cc=andriy.shevchenko@linux.intel.com \
--cc=bas@basnieuwenhuizen.nl \
--cc=bskeggs@redhat.com \
--cc=christian.koenig@amd.com \
--cc=contact@emersion.fr \
--cc=daniel@ffwll.ch \
--cc=daniel@fooishbar.org \
--cc=dhobsong@igel.co.jp \
--cc=dmitry.baryshkov@linaro.org \
--cc=dri-devel@lists.freedesktop.org \
--cc=etom@igel.co.jp \
--cc=evan.quan@amd.com \
--cc=lee.jones@linaro.org \
--cc=linux-kernel@vger.kernel.org \
--cc=maarten.lankhorst@linux.intel.com \
--cc=markyacoub@chromium.org \
--cc=mdaenzer@redhat.com \
--cc=mripard@kernel.org \
--cc=nouveau@lists.freedesktop.org \
--cc=pmladek@suse.com \
--cc=qingqing.zhuo@amd.com \
--cc=robdclark@chromium.org \
--cc=sakari.ailus@linux.intel.com \
--cc=seanpaul@chromium.org \
--cc=taki@igel.co.jp \
--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).