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 gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 95F00C36008 for ; Wed, 26 Mar 2025 17:23:38 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 4FAC610E792; Wed, 26 Mar 2025 17:23:38 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.b="FsZVRkXU"; dkim-atps=neutral Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.19]) by gabe.freedesktop.org (Postfix) with ESMTPS id BF71110E777; Wed, 26 Mar 2025 17:23:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1743009817; x=1774545817; h=date:from:to:cc:subject:message-id:references: mime-version:content-transfer-encoding:in-reply-to; bh=hM/8v4HaejGrdJDEBsLuAUtYdW5d+YsUoEJbJM6jlb8=; b=FsZVRkXUI3IH8trJLCFa2oaMnA02xRVVIJoFe4h3cgcA4snhjQMGLZQx 1O+Pvm9c6onmFhrsB55EaQNl2w112R8RJPNqjzm/0BRmk/AHViPRJ+b8a /Wx7ceLsTghYGeJZ1Gp2loYO2FosUP8H2exzvQF43/8DrSN4vWyR3doNu NVJMJ2tGj9mScoLnJYRuTfKmTaYPDtWKZ++VP7uRpTd7ZkoF+PES1Hrvv /RStb8BDvszUK5zgzBDqVNIkWsLoOnC1NfJIFWuFtDJgq2TJnDLySjhMt GHYpD1G3dY4tovWOMMAcIwNvsFj3PWm8zT2OsH4waenwbsEP+bsOiIkzx g==; X-CSE-ConnectionGUID: j6UvLgdXTfWg8e9qbJuDnQ== X-CSE-MsgGUID: eDQ/mOtMTp6qLR9Mj6dpUw== X-IronPort-AV: E=McAfee;i="6700,10204,11385"; a="44203573" X-IronPort-AV: E=Sophos;i="6.14,278,1736841600"; d="scan'208";a="44203573" Received: from orviesa005.jf.intel.com ([10.64.159.145]) by orvoesa111.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 26 Mar 2025 10:23:37 -0700 X-CSE-ConnectionGUID: /5Qe5ssHQ++DLGpAar8I8Q== X-CSE-MsgGUID: C4DgKIZARlmmIkhBH4LyWw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.14,278,1736841600"; d="scan'208";a="130037008" Received: from stinkpipe.fi.intel.com (HELO stinkbox) ([10.237.72.74]) by orviesa005.jf.intel.com with SMTP; 26 Mar 2025 10:23:33 -0700 Received: by stinkbox (sSMTP sendmail emulation); Wed, 26 Mar 2025 19:23:32 +0200 Date: Wed, 26 Mar 2025 19:23:32 +0200 From: Ville =?iso-8859-1?Q?Syrj=E4l=E4?= To: Arun R Murthy Cc: dri-devel@lists.freedesktop.org, intel-gfx@lists.freedesktop.org, intel-xe@lists.freedesktop.org, chaitanya.kumar.borah@intel.com, Naveen Kumar Subject: Re: [PATCH v9 2/3] drm/plane: modify create_in_formats to accommodate async Message-ID: References: <20250319-asyn-v9-0-629d1ece63e7@intel.com> <20250319-asyn-v9-2-629d1ece63e7@intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <20250319-asyn-v9-2-629d1ece63e7@intel.com> X-Patchwork-Hint: comment X-BeenThere: intel-xe@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Intel Xe graphics driver List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-xe-bounces@lists.freedesktop.org Sender: "Intel-xe" On Wed, Mar 19, 2025 at 04:02:16PM +0530, Arun R Murthy wrote: > create_in_formats creates the list of supported format/modifiers for > synchronous flips, modify the same function so as to take the > format_mod_supported as argument and create list of format/modifier for > async as well. > > v5: create_in_formats can return -ve value in failure case, correct the > if condition to check the creation of blob > Dont add the modifier for which none of the formats is not supported. > v6: Remove the code for masking the unsupported modifiers as UMD can > leave with it. (Naveen/Chaitanya) > v7: Retain the unsupported modifiers, userspace should have no > impact, return pointer to blob instead of blob_id(Ville) > > Signed-off-by: Arun R Murthy > Reviewed-by: Chaitanya Kumar Borah > Tested-by: Naveen Kumar > --- > drivers/gpu/drm/drm_plane.c | 44 +++++++++++++++++++++++++++++++------------- > 1 file changed, 31 insertions(+), 13 deletions(-) > > diff --git a/drivers/gpu/drm/drm_plane.c b/drivers/gpu/drm/drm_plane.c > index fe181c1002171acc68d3054c2d178f9b9f501fe2..5cd3956caf414fa72432f9d23fa289ec266408ce 100644 > --- a/drivers/gpu/drm/drm_plane.c > +++ b/drivers/gpu/drm/drm_plane.c > @@ -193,9 +193,13 @@ modifiers_ptr(struct drm_format_modifier_blob *blob) > return (struct drm_format_modifier *)(((char *)blob) + blob->modifiers_offset); > } > > -static int create_in_format_blob(struct drm_device *dev, struct drm_plane *plane) > +static struct drm_property_blob *create_in_format_blob(struct drm_device *dev, > + struct drm_plane *plane, > + bool (*format_mod_supported) > + (struct drm_plane *plane, > + u32 format, > + u64 modifier)) Indentation looks wonky here. Apart from that Reviewed-by: Ville Syrjälä > { > - const struct drm_mode_config *config = &dev->mode_config; > struct drm_property_blob *blob; > struct drm_format_modifier *mod; > size_t blob_size, formats_size, modifiers_size; > @@ -221,7 +225,7 @@ static int create_in_format_blob(struct drm_device *dev, struct drm_plane *plane > > blob = drm_property_create_blob(dev, blob_size, NULL); > if (IS_ERR(blob)) > - return -1; > + return PTR_ERR(blob); > > blob_data = blob->data; > blob_data->version = FORMAT_BLOB_CURRENT; > @@ -237,10 +241,10 @@ static int create_in_format_blob(struct drm_device *dev, struct drm_plane *plane > 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->funcs->format_mod_supported(plane, > - plane->format_types[j], > - plane->modifiers[i])) { > + if (!format_mod_supported || > + format_mod_supported(plane, > + plane->format_types[j], > + plane->modifiers[i])) { > mod->formats |= 1ULL << j; > } > } > @@ -251,10 +255,7 @@ static int create_in_format_blob(struct drm_device *dev, struct drm_plane *plane > mod++; > } > > - drm_object_attach_property(&plane->base, config->modifiers_property, > - blob->base.id); > - > - return 0; > + return blob; > } > > /** > @@ -366,6 +367,7 @@ static int __drm_universal_plane_init(struct drm_device *dev, > const char *name, va_list ap) > { > struct drm_mode_config *config = &dev->mode_config; > + struct drm_property_blob *blob; > static const uint64_t default_modifiers[] = { > DRM_FORMAT_MOD_LINEAR, > }; > @@ -477,8 +479,24 @@ static int __drm_universal_plane_init(struct drm_device *dev, > drm_plane_create_hotspot_properties(plane); > } > > - if (format_modifier_count) > - create_in_format_blob(dev, plane); > + if (format_modifier_count) { > + blob = create_in_format_blob(dev, plane, > + plane->funcs->format_mod_supported); > + if (!IS_ERR(blob)) > + drm_object_attach_property(&plane->base, > + config->modifiers_property, > + blob->base.id); > + } > + > + if (plane->funcs->format_mod_supported_async) { > + blob = create_in_format_blob(dev, plane, > + plane->funcs->format_mod_supported_async); > + if (!IS_ERR(blob)) > + drm_object_attach_property(&plane->base, > + config->async_modifiers_property, > + blob->base.id); > + } > + > > return 0; > } > > -- > 2.25.1 -- Ville Syrjälä Intel