From: Tomohito Esaki <etom@igel.co.jp>
To: dri-devel@lists.freedesktop.org
Cc: "David Airlie" <airlied@linux.ie>,
nouveau@lists.freedesktop.org,
"Michel Dänzer" <mdaenzer@redhat.com>,
"Daniel Stone" <daniel@fooishbar.org>,
"Lee Jones" <lee.jones@linaro.org>,
"Tomohito Esaki" <etom@igel.co.jp>,
"Rob Clark" <robdclark@chromium.org>,
"Evan Quan" <evan.quan@amd.com>,
amd-gfx@lists.freedesktop.org, "Ben Skeggs" <bskeggs@redhat.com>,
"Petr Mladek" <pmladek@suse.com>,
"Sakari Ailus" <sakari.ailus@linux.intel.com>,
"Bas Nieuwenhuizen" <bas@basnieuwenhuizen.nl>,
"Maarten Lankhorst" <maarten.lankhorst@linux.intel.com>,
"Abhinav Kumar" <abhinavk@codeaurora.org>,
"Dmitry Baryshkov" <dmitry.baryshkov@linaro.org>,
"Takanari Hayama" <taki@igel.co.jp>,
"Sean Paul" <seanpaul@chromium.org>,
"Maxime Ripard" <mripard@kernel.org>,
"Daniel Vetter" <daniel@ffwll.ch>,
"Andy Shevchenko" <andriy.shevchenko@linux.intel.com>,
"Mark Yacoub" <markyacoub@chromium.org>,
"Qingqing Zhuo" <qingqing.zhuo@amd.com>,
"Pan, Xinhui" <Xinhui.Pan@amd.com>,
linux-kernel@vger.kernel.org, "Simon Ser" <contact@emersion.fr>,
"Alex Deucher" <alexander.deucher@amd.com>,
"Damian Hobson-Garcia" <dhobsong@igel.co.jp>,
"Christian König" <christian.koenig@amd.com>,
"Laurent Pinchart" <laurent.pinchart@ideasonboard.com>
Subject: [Nouveau] [RFC PATCH v4 2/3] drm: add support modifiers for drivers whose planes only support linear layout
Date: Tue, 18 Jan 2022 17:36:51 +0900 [thread overview]
Message-ID: <20220118083652.16335-3-etom@igel.co.jp> (raw)
In-Reply-To: <20220118083652.16335-1-etom@igel.co.jp>
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[] = {
+ DRM_FORMAT_MOD_LINEAR,
+ DRM_FORMAT_MOD_INVALID
+ };
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;
+ }
}
/* 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.
*
* 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.
+ *
* Returns:
* Pointer to new plane, or ERR_PTR on failure.
*/
--
2.25.1
next prev parent reply other threads:[~2022-01-18 20:08 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-01-18 8:36 [Nouveau] [RFC PATCH v4 0/3] Add support modifiers for drivers whose planes only support linear layout Tomohito Esaki
2022-01-18 8:36 ` [Nouveau] [RFC PATCH v4 1/3] drm: introduce fb_modifiers_not_supported flag in mode_config Tomohito Esaki
2022-01-18 8:36 ` Tomohito Esaki [this message]
2022-01-18 8:36 ` [Nouveau] [RFC PATCH v4 3/3] drm: remove allow_fb_modifiers Tomohito Esaki
2022-01-18 9:45 ` [Nouveau] [RFC PATCH v4 0/3] Add support modifiers for drivers whose planes only support linear layout Andy Shevchenko
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=20220118083652.16335-3-etom@igel.co.jp \
--to=etom@igel.co.jp \
--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=evan.quan@amd.com \
--cc=laurent.pinchart@ideasonboard.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 \
/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).