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 X-Spam-Level: X-Spam-Status: No, score=-15.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 35170C4338F for ; Wed, 18 Aug 2021 17:56:57 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id E61F5610FE for ; Wed, 18 Aug 2021 17:56:56 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org E61F5610FE Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=igalia.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 3948D895B2; Wed, 18 Aug 2021 17:56:56 +0000 (UTC) Received: from fanzine.igalia.com (fanzine.igalia.com [178.60.130.6]) by gabe.freedesktop.org (Postfix) with ESMTPS id 0D041895B2 for ; Wed, 18 Aug 2021 17:56:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=igalia.com; s=20170329; h=In-Reply-To:Content-Type:MIME-Version:References:Message-ID:Subject:Cc:To:From:Date; bh=65ZE3Kg0CYdLgKCqe+2lK/4xlKf8K3/EvWOcDZCEuIE=; b=iKd9D6EnhND29Js6vJKYLjuE00i2bzQ/AfSH2s6Pvxf3bEPtc9NmpJ7U/3Kt+FTaUFuns1s4yKMWyeQ3oM1saAJdsSMLkUfCpw23VHYg1oMy/qs3GQISP9RyaZDlbGyUbYUiPelRLpl+VIQmMBtWSwtg91nHQERQzBlBzz2c83GPYS9fEvms9r7bitf3uHx29SVZIh6b6VWEtlpEFazQfUJLwRlH3xiDqn7AoXC4irPoD01g1cgIqb6FIrBJGKXS/W2puIfpv7noWSLTGyL5xzlKpKvfqBq7BMkdz+SuDP2ol10OomovMCD0wPaAAg8W9znpK8g8klRUjNHwRumJYA==; Received: from a95-92-181-29.cpe.netcabo.pt ([95.92.181.29] helo=mail.igalia.com) by fanzine.igalia.com with esmtpsa (Cipher TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim) id 1mGPo4-0005dk-QH; Wed, 18 Aug 2021 19:56:52 +0200 Date: Wed, 18 Aug 2021 18:56:41 +0100 From: Melissa Wen To: dri-devel@lists.freedesktop.org Cc: Emma Anholt , David Airlie , Daniel Vetter , Maxime Ripard , Boris Brezillon Subject: [PATCH 2/3] drm/v3d: add generic ioctl extension Message-ID: References: MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="e7o52kmvipydvzgl" Content-Disposition: inline In-Reply-To: X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" --e7o52kmvipydvzgl Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Add support to attach generic extensions on job submission. This patch is a second prep work to enable multiple syncobjs on job submission. With this work, when the job submission interface needs to be extended to accomodate a new feature, we will use a generic extension struct where an id determines the data type to be pointed. The first application is to enable multiples in/out syncobj (next patch), but the base is already done for future features. Signed-off-by: Melissa Wen --- drivers/gpu/drm/v3d/v3d_drv.c | 4 +- drivers/gpu/drm/v3d/v3d_gem.c | 80 ++++++++++++++++++++++++++++++++--- include/uapi/drm/v3d_drm.h | 38 ++++++++++++++++- 3 files changed, 113 insertions(+), 9 deletions(-) diff --git a/drivers/gpu/drm/v3d/v3d_drv.c b/drivers/gpu/drm/v3d/v3d_drv.c index 9403c3b36aca..6a0516160bb2 100644 --- a/drivers/gpu/drm/v3d/v3d_drv.c +++ b/drivers/gpu/drm/v3d/v3d_drv.c @@ -83,7 +83,6 @@ static int v3d_get_param_ioctl(struct drm_device *dev, vo= id *data, return 0; } =20 - switch (args->param) { case DRM_V3D_PARAM_SUPPORTS_TFU: args->value =3D 1; @@ -147,7 +146,7 @@ v3d_postclose(struct drm_device *dev, struct drm_file *= file) DEFINE_DRM_GEM_FOPS(v3d_drm_fops); =20 /* DRM_AUTH is required on SUBMIT_CL for now, while we don't have GMP - * protection between clients. Note that render nodes would be be + * protection between clients. Note that render nodes would be * able to submit CLs that could access BOs from clients authenticated * with the master node. The TFU doesn't use the GMP, so it would * need to stay DRM_AUTH until we do buffer size/offset validation. @@ -222,7 +221,6 @@ static int v3d_platform_drm_probe(struct platform_devic= e *pdev) u32 mmu_debug; u32 ident1; =20 - v3d =3D devm_drm_dev_alloc(dev, &v3d_drm_driver, struct v3d_dev, drm); if (IS_ERR(v3d)) return PTR_ERR(v3d); diff --git a/drivers/gpu/drm/v3d/v3d_gem.c b/drivers/gpu/drm/v3d/v3d_gem.c index 593ed2206d74..e254919b6c5e 100644 --- a/drivers/gpu/drm/v3d/v3d_gem.c +++ b/drivers/gpu/drm/v3d/v3d_gem.c @@ -521,6 +521,38 @@ v3d_attach_fences_and_unlock_reservation(struct drm_fi= le *file_priv, } } =20 +static int +v3d_get_extensions(struct drm_file *file_priv, + u32 ext_count, u64 ext_handles) +{ + int i; + struct drm_v3d_extension __user *handles; + + if (!ext_count) + return 0; + + handles =3D u64_to_user_ptr(ext_handles); + for (i =3D 0; i < ext_count; i++) { + struct drm_v3d_extension ext; + + if (copy_from_user(&ext, handles, sizeof(ext))) { + DRM_DEBUG("Failed to copy submit extension\n"); + return -EFAULT; + } + + switch (ext.id) { + case 0: + default: + DRM_DEBUG_DRIVER("Unknown extension id: %d\n", ext.id); + return -EINVAL; + } + + handles =3D u64_to_user_ptr(ext.next); + } + + return 0; +} + /** * v3d_submit_cl_ioctl() - Submits a job (frame) to the V3D. * @dev: DRM device @@ -549,15 +581,23 @@ v3d_submit_cl_ioctl(struct drm_device *dev, void *dat= a, =20 trace_v3d_submit_cl_ioctl(&v3d->drm, args->rcl_start, args->rcl_end); =20 - if (args->pad !=3D 0) - return -EINVAL; - - if (args->flags !=3D 0 && - args->flags !=3D DRM_V3D_SUBMIT_CL_FLUSH_CACHE) { + if (args->flags && + args->flags & ~(DRM_V3D_SUBMIT_CL_FLUSH_CACHE | + DRM_V3D_SUBMIT_EXTENSION)) { DRM_INFO("invalid flags: %d\n", args->flags); return -EINVAL; } =20 + if (args->flags & DRM_V3D_SUBMIT_EXTENSION) { + ret =3D v3d_get_extensions(file_priv, + args->extension_count, + args->extensions); + if (ret) { + DRM_DEBUG("Failed to get extensions.\n"); + return ret; + } + } + render =3D kcalloc(1, sizeof(*render), GFP_KERNEL); if (!render) return -ENOMEM; @@ -711,6 +751,21 @@ v3d_submit_tfu_ioctl(struct drm_device *dev, void *dat= a, =20 trace_v3d_submit_tfu_ioctl(&v3d->drm, args->iia); =20 + if (args->flags && !(args->flags & DRM_V3D_SUBMIT_EXTENSION)) { + DRM_DEBUG("invalid flags: %d\n", args->flags); + return -EINVAL; + } + + if (args->flags & DRM_V3D_SUBMIT_EXTENSION) { + ret =3D v3d_get_extensions(file_priv, + args->extension_count, + args->extensions); + if (ret) { + DRM_DEBUG("Failed to get extensions.\n"); + return ret; + } + } + job =3D kcalloc(1, sizeof(*job), GFP_KERNEL); if (!job) return -ENOMEM; @@ -806,6 +861,21 @@ v3d_submit_csd_ioctl(struct drm_device *dev, void *dat= a, return -EINVAL; } =20 + if (args->flags && !(args->flags & DRM_V3D_SUBMIT_EXTENSION)) { + DRM_DEBUG("Invalid flags: %d\n", args->flags); + return -EINVAL; + } + + if (args->flags & DRM_V3D_SUBMIT_EXTENSION) { + ret =3D v3d_get_extensions(file_priv, + args->extension_count, + args->extensions); + if (ret) { + DRM_DEBUG("Failed to get extensions.\n"); + return ret; + } + } + job =3D kcalloc(1, sizeof(*job), GFP_KERNEL); if (!job) return -ENOMEM; diff --git a/include/uapi/drm/v3d_drm.h b/include/uapi/drm/v3d_drm.h index 4104f22fb3d3..1f4706010eb5 100644 --- a/include/uapi/drm/v3d_drm.h +++ b/include/uapi/drm/v3d_drm.h @@ -58,6 +58,19 @@ extern "C" { struct drm_v3d_perfmon_get_values) =20 #define DRM_V3D_SUBMIT_CL_FLUSH_CACHE 0x01 +#define DRM_V3D_SUBMIT_EXTENSION 0x02 + +/* struct drm_v3d_extension - ioctl extensions + * + * Linked-list of generic extensions where the id identify which struct is + * pointed by ext_data. Therefore, DRM_V3D_EXT_ID_* is used on id to ident= ify + * the extension type. + */ +struct drm_v3d_extension { + __u64 next; + __u64 ext_data; + __u32 id; +}; =20 /** * struct drm_v3d_submit_cl - ioctl argument for submitting commands to th= e 3D @@ -135,12 +148,17 @@ struct drm_v3d_submit_cl { /* Number of BO handles passed in (size is that times 4). */ __u32 bo_handle_count; =20 + /* DRM_V3D_SUBMIT_* properties */ __u32 flags; =20 /* ID of the perfmon to attach to this job. 0 means no perfmon. */ __u32 perfmon_id; =20 - __u32 pad; + /* Number of extensions*/ + __u32 extension_count; + + /* Pointer to a list of ioctl extensions*/ + __u64 extensions; }; =20 /** @@ -248,6 +266,15 @@ struct drm_v3d_submit_tfu { __u32 in_sync; /* Sync object to signal when the TFU job is done. */ __u32 out_sync; + + /* Number of extensions*/ + __u32 extension_count; + + /* Pointer to an array of ioctl extensions*/ + __u64 extensions; + + /* DRM_V3D_SUBMIT_* properties */ + __u32 flags; }; =20 /* Submits a compute shader for dispatch. This job will block on any @@ -276,6 +303,15 @@ struct drm_v3d_submit_csd { =20 /* ID of the perfmon to attach to this job. 0 means no perfmon. */ __u32 perfmon_id; + + /* DRM_V3D_SUBMIT_* properties */ + __u32 flags; + + /* Number of extensions*/ + __u32 extension_count; + + /* Pointer to a list of ioctl extensions*/ + __u64 extensions; }; =20 enum { --=20 2.30.2 --e7o52kmvipydvzgl Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAABCgAdFiEEd8WOo/JViG+Tu+XIwqF3j0dLehwFAmEdSdgACgkQwqF3j0dL ehwiQRAAukjAKMISFSCQyviSZOURnMCTITsLnj0GkjOCBn577aI+tUBVkNXAe9JY 7e7k+NqXGlgR2u061nhnrFtHWOQbDLWH2A+4CNkKVJhbb9sXMvO9qOzQO9yY8uL8 Wggc1swYxoV3MRlg2nudr8zWQqapD0OX0L166nvqsPBwPsieC17lZLuA7sUdzNbb o15YO3/V6wNpK+F6VXS9r7EbWalnO6vNJcrPCo6S7fjWKXlJHs38VLV5xdvdQPBU iiZXdq29U/rIcgoqbYJlTF86p2kgLD+gKIL4LW6k/Zm9c6I0Sw08FQ5iuQ1MBm5V lsWp3D7NbOzrTU8DAp2V+VNvR3VvhPmod1x+kIDGUFntfR6k41YJD1mGu3PmpEOB gaPqJtS91NOYLUITd0ts5XzbhWa6vxNtir44C7/ST5Nc0WQpMcU9TXxM/lAdXbw+ 4XT6jiSaqbvYcLiATMeHbEfEkMI9/xCSKASEKF34ZI0pplEpuFXCRxU9QswMNZtc kjw/ljyUULiput3VCRrBA/rRbQc84wsAZjaSQJEcgXPSAu/w2Y5BzwaoSpy99M3i Wdu9tBrT7OJKK5GC7/Vd2qlUZwAe0VAQjakM2DlZC6WT0bVm90CnBSJPQyDOekf3 pl5OBTcIzlB8a4mRo8HRqR7Y/XkwPNT0+Cpdr2VuoCFx8vtjL/A= =ObCk -----END PGP SIGNATURE----- --e7o52kmvipydvzgl--