From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id CC6F2C433FE for ; Fri, 14 Jan 2022 16:50:18 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S243594AbiANQuR (ORCPT ); Fri, 14 Jan 2022 11:50:17 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55936 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S243583AbiANQuQ (ORCPT ); Fri, 14 Jan 2022 11:50:16 -0500 Received: from mail-wr1-x433.google.com (mail-wr1-x433.google.com [IPv6:2a00:1450:4864:20::433]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 21A4EC06161C for ; Fri, 14 Jan 2022 08:50:16 -0800 (PST) Received: by mail-wr1-x433.google.com with SMTP id e9so16642019wra.2 for ; Fri, 14 Jan 2022 08:50:16 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ffwll.ch; s=google; h=date:from:to:cc:subject:message-id:mail-followup-to:references :mime-version:content-disposition:in-reply-to; bh=VEOOxhr/Qwdhz6jGRXCfn43YOQWOPX+v7bNM1lLXnMs=; b=GQYnWMHTELRAX6IxEgSqmKjWAnpubD1b5rEvbvgGfNtDbs7tQuSCh/OrJmX7kDVK8z rPdvpyBfW761Oyb3/+SC3o/9fHqJEKGv83GhHHBQM/aW0ZBAtayMSxhfItAzaxMYLRRt 5CZsm6e0kddTqky4BUZbuj+6wzRBrVNehO/QQ= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:from:to:cc:subject:message-id :mail-followup-to:references:mime-version:content-disposition :in-reply-to; bh=VEOOxhr/Qwdhz6jGRXCfn43YOQWOPX+v7bNM1lLXnMs=; b=bqTlFNI+WOHqhx6jPrLf+IDvmSc09jzl/lJlzKG7mmUFSJZcGW5Nwh+v21srq0wvlt ljC3ZjU5FvFX2rLz2T7Z88kSJHihkqoCGwuD4xBQWdl1Mp8h+QaT7pXs3giklTUG9Ht4 E8hrS6MLIEvFQFB97IiiGsS5XgIOXWKXXSUY28xirRhGen7DDvhrVYLMTHrtrzURvu8J n6tK7OgFlYxmM8ScE8e4IpMog4OW/eU4z93vDACy/DgbMXTXfpXffPONnbUheEBeYfwD bOaP2aQqaRVOxOJFYqSjguGCQRqq7YdZyVWGbASNVtH2eqxW59XJaloe7Ryw8OLlGAvG SHjQ== X-Gm-Message-State: AOAM533ZnxKOZcfvim4cP8ATx0EFG28xtwvaZ0tm5AXTheOHqpREBevN 5WSE0JHwUnWcF1Pv/ceFpN7zUw== X-Google-Smtp-Source: ABdhPJwz9kukA9QNeawPcf2CaPxbGlOu7bGLv961X6bi262Yhbg82aYRWaL5DsXL4YUvYSzxOtsv8Q== X-Received: by 2002:a05:6000:1845:: with SMTP id c5mr2499147wri.350.1642179014678; Fri, 14 Jan 2022 08:50:14 -0800 (PST) Received: from phenom.ffwll.local ([2a02:168:57f4:0:efd0:b9e5:5ae6:c2fa]) by smtp.gmail.com with ESMTPSA id l6sm9036159wry.18.2022.01.14.08.50.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 14 Jan 2022 08:50:14 -0800 (PST) Date: Fri, 14 Jan 2022 17:50:11 +0100 From: Daniel Vetter To: Tomohito Esaki Cc: dri-devel@lists.freedesktop.org, Alex Deucher , Christian =?iso-8859-1?Q?K=F6nig?= , "Pan, Xinhui" , David Airlie , Daniel Vetter , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , Ben Skeggs , Michel =?iso-8859-1?Q?D=E4nzer?= , Simon Ser , Qingqing Zhuo , Bas Nieuwenhuizen , Mark Yacoub , Sean Paul , Evan Quan , Andy Shevchenko , Petr Mladek , Sakari Ailus , Lee Jones , Abhinav Kumar , Dmitry Baryshkov , Rob Clark , amd-gfx@lists.freedesktop.org, linux-kernel@vger.kernel.org, nouveau@lists.freedesktop.org, Damian Hobson-Garcia , Takanari Hayama Subject: Re: [RFC PATH 1/3] drm: add support modifiers for drivers whose planes only support linear layout Message-ID: Mail-Followup-To: Tomohito Esaki , dri-devel@lists.freedesktop.org, Alex Deucher , Christian =?iso-8859-1?Q?K=F6nig?= , "Pan, Xinhui" , David Airlie , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , Ben Skeggs , Michel =?iso-8859-1?Q?D=E4nzer?= , Simon Ser , Qingqing Zhuo , Bas Nieuwenhuizen , Mark Yacoub , Sean Paul , Evan Quan , Andy Shevchenko , Petr Mladek , Sakari Ailus , Lee Jones , Abhinav Kumar , Dmitry Baryshkov , Rob Clark , amd-gfx@lists.freedesktop.org, linux-kernel@vger.kernel.org, nouveau@lists.freedesktop.org, Damian Hobson-Garcia , Takanari Hayama References: <20211222052727.19725-1-etom@igel.co.jp> <20211222052727.19725-2-etom@igel.co.jp> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20211222052727.19725-2-etom@igel.co.jp> X-Operating-System: Linux phenom 5.10.0-8-amd64 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Wed, Dec 22, 2021 at 02:27:25PM +0900, Tomohito Esaki wrote: > The LINEAR modifier is advertised as default if a driver doesn't specify > modifiers. However, there are legacy drivers such as radeon that do not > support modifiers but infer the actual layout of the underlying buffer. > Therefore, a new flag not_support_fb_modifires is introduced for these > legacy drivers. Allow_fb_modifiers will be replaced with this new flag. > > Signed-off-by: Tomohito Esaki > --- > drivers/gpu/drm/drm_plane.c | 34 ++++++++++++++++++++++++++-------- > include/drm/drm_mode_config.h | 10 ++++++++++ > include/drm/drm_plane.h | 3 +++ > 3 files changed, 39 insertions(+), 8 deletions(-) > > diff --git a/drivers/gpu/drm/drm_plane.c b/drivers/gpu/drm/drm_plane.c > index 82afb854141b..75308ee240c0 100644 > --- a/drivers/gpu/drm/drm_plane.c > +++ b/drivers/gpu/drm/drm_plane.c > @@ -161,6 +161,16 @@ modifiers_ptr(struct drm_format_modifier_blob *blob) > return (struct drm_format_modifier *)(((char *)blob) + blob->modifiers_offset); > } > > +static bool check_format_modifier(struct drm_plane *plane, uint32_t format, > + uint64_t modifier) > +{ > + if (plane->funcs->format_mod_supported) > + return plane->funcs->format_mod_supported(plane, format, > + modifier); > + > + return modifier == DRM_FORMAT_MOD_LINEAR; > +} > + > static int create_in_format_blob(struct drm_device *dev, struct drm_plane *plane) > { > const struct drm_mode_config *config = &dev->mode_config; > @@ -203,16 +213,15 @@ static int create_in_format_blob(struct drm_device *dev, struct drm_plane *plane > memcpy(formats_ptr(blob_data), plane->format_types, formats_size); > > /* If we can't determine support, just bail */ > - if (!plane->funcs->format_mod_supported) > + if (config->fb_modifiers_not_supported) > goto done; > > mod = modifiers_ptr(blob_data); > for (i = 0; i < plane->modifier_count; i++) { > for (j = 0; j < plane->format_count; j++) { > - if (plane->funcs->format_mod_supported(plane, > - plane->format_types[j], > - plane->modifiers[i])) { > - > + if (check_format_modifier(plane, > + plane->format_types[j], > + plane->modifiers[i])) { > mod->formats |= 1ULL << j; > } > } > @@ -242,6 +251,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; > > @@ -282,6 +295,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 */ > @@ -346,7 +364,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; > @@ -373,8 +391,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_mode_config.h b/include/drm/drm_mode_config.h > index 48b7de80daf5..c56f298c55bd 100644 > --- a/include/drm/drm_mode_config.h > +++ b/include/drm/drm_mode_config.h > @@ -920,6 +920,16 @@ struct drm_mode_config { > */ > bool allow_fb_modifiers; > > + /** > + * @fb_modifiers_not_supported: > + * > + * This flag is for legacy drivers such as radeon that do not support Maybe don't put specific driver names into kerneldoc (in commit message to motivate your changes it's fine). It's unlikely radeon ever changes on this, but also no one will update this in the docs if we ever do that. Perhaps also add that new driver should never set this, just to hammer it home that modifiers really should work everywhere. Otherwise I think this series is the right thing to do. -Daniel > + * modifiers but infer the actual layout of the underlying buffer. > + * Generally, each drivers must support modifiers, this flag should not > + * be set. > + */ > + bool fb_modifiers_not_supported; > + > /** > * @normalize_zpos: > * > 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.17.1 > -- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch