From nobody Tue Oct 7 20:10:12 2025 Received: from bali.collaboradmins.com (bali.collaboradmins.com [148.251.105.195]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 3F1592E92DC for ; Mon, 7 Jul 2025 17:05:16 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=148.251.105.195 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1751907918; cv=none; b=awklF5CniZwWMgGupz6eaSeUr9Xf8ONZzg/KxtCXR6ZXORYcMFGhE2KRUt37meGxmaVMWU8XKcSjXjZyhEVsLyMgiChjW1KZTAa3PYprrPdMQNLPQ8g5j8NARK4w6ta4cIc5yKpFL8gNdGlOrnL1zg29aRSG+z9T7F3G/4SjnoY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1751907918; c=relaxed/simple; bh=4ZCZQkyTb+SlHV2coiacmUH1fpzz9WLEXU3y+sU4p2k=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=MV8SmWYRD+uKD52LhguEbYkGqA739JvsFQrBNpBpE+EY+pr3HCE9mAnug5NuJBo62/PLfofT9D/Y31NlAbMYsAQtFumo1cE7cMWEcaX4s1MxD8MASxWHgHV0oloqwhTCQcI0Acuh9TiwpqStT2lQ8YgoXRvg37n1tZOT/PR7Pmo= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=collabora.com; spf=pass smtp.mailfrom=collabora.com; dkim=pass (2048-bit key) header.d=collabora.com header.i=@collabora.com header.b=ghNAlyIp; arc=none smtp.client-ip=148.251.105.195 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=collabora.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=collabora.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=collabora.com header.i=@collabora.com header.b="ghNAlyIp" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1751907914; bh=4ZCZQkyTb+SlHV2coiacmUH1fpzz9WLEXU3y+sU4p2k=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ghNAlyIpJPqzidm+VRdktp31HxW+FbhFfOzT2HhW3mZPBgDUzJjtuw5vDHjexhz3Y FcXFTslLzvUBTL5snHlOeWmfZg6rypsgTDzY15qxQedxwSfya2yAwqaTvwkJdcVFoJ xVlM3PVSHK2Ih2AlRa6MQawtZ15RpLsYAi1120CEkBZ7aO3EuShDix1Goa8wm/J7Wz qMaeyrQTK15i65KLQav6MZTyACKcwAPxpf3/oG/mGpy76wiIfkFcBoBanaQZw0nlFX kZBrZjfhSE9MfbuXuDGRTAZt7qK343QCgPRBVIrQTdzCAwdwTIfXb3xfEkkZOFXPZE v0yr1l/7hlYtQ== Received: from debian-rockchip-rock5b-rk3588.. (unknown [90.168.160.154]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: nanokatze) by bali.collaboradmins.com (Postfix) with ESMTPSA id 6A7EE17E046D; Mon, 7 Jul 2025 19:05:13 +0200 (CEST) From: Caterina Shablia To: "Maarten Lankhorst" , "Maxime Ripard" , "Thomas Zimmermann" , "David Airlie" , "Simona Vetter" , "Frank Binns" , "Matt Coster" , "Karol Herbst" , "Lyude Paul" , "Danilo Krummrich" , "Boris Brezillon" , "Steven Price" , "Liviu Dudau" , "Lucas De Marchi" , =?UTF-8?q?Thomas=20Hellstr=C3=B6m?= , "Rodrigo Vivi" Cc: dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, nouveau@lists.freedesktop.org, intel-xe@lists.freedesktop.org, asahi@lists.linux.dev, Asahi Lina , Caterina Shablia Subject: [PATCH v4 7/7] drm/panthor: Add support for repeated mappings Date: Mon, 7 Jul 2025 17:04:33 +0000 Message-ID: <20250707170442.1437009-8-caterina.shablia@collabora.com> X-Mailer: git-send-email 2.47.2 In-Reply-To: <20250707170442.1437009-1-caterina.shablia@collabora.com> References: <20250707170442.1437009-1-caterina.shablia@collabora.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Boris Brezillon This allows us to optimize mapping of a relatively small portion of a BO over and over in a large VA range, which is useful to support Vulkan sparse bindings in an efficient way. Signed-off-by: Boris Brezillon Co-developed-by: Caterina Shablia Signed-off-by: Caterina Shablia --- drivers/gpu/drm/panthor/panthor_drv.c | 3 +- drivers/gpu/drm/panthor/panthor_mmu.c | 78 ++++++++++++++++++++++++--- include/uapi/drm/panthor_drm.h | 23 ++++++++ 3 files changed, 95 insertions(+), 9 deletions(-) diff --git a/drivers/gpu/drm/panthor/panthor_drv.c b/drivers/gpu/drm/pantho= r/panthor_drv.c index 1116f2d2826e..585c07b07c42 100644 --- a/drivers/gpu/drm/panthor/panthor_drv.c +++ b/drivers/gpu/drm/panthor/panthor_drv.c @@ -1608,6 +1608,7 @@ static void panthor_debugfs_init(struct drm_minor *mi= nor) * - 1.3 - adds DRM_PANTHOR_GROUP_STATE_INNOCENT flag * - 1.4 - adds DRM_IOCTL_PANTHOR_BO_SET_LABEL ioctl * - 1.5 - adds DRM_PANTHOR_SET_USER_MMIO_OFFSET ioctl + * - 1.6 - adds DRM_PANTHOR_VM_BIND_OP_MAP_REPEAT flag */ static const struct drm_driver panthor_drm_driver =3D { .driver_features =3D DRIVER_RENDER | DRIVER_GEM | DRIVER_SYNCOBJ | @@ -1621,7 +1622,7 @@ static const struct drm_driver panthor_drm_driver =3D= { .name =3D "panthor", .desc =3D "Panthor DRM driver", .major =3D 1, - .minor =3D 5, + .minor =3D 6, =20 .gem_create_object =3D panthor_gem_create_object, .gem_prime_import_sg_table =3D drm_gem_shmem_prime_import_sg_table, diff --git a/drivers/gpu/drm/panthor/panthor_mmu.c b/drivers/gpu/drm/pantho= r/panthor_mmu.c index f0a22b775958..4ce9fff67d69 100644 --- a/drivers/gpu/drm/panthor/panthor_mmu.c +++ b/drivers/gpu/drm/panthor/panthor_mmu.c @@ -202,6 +202,9 @@ struct panthor_vm_op_ctx { /** @map.bo_offset: Offset in the buffer object. */ u64 bo_offset; =20 + /** @map.bo_repeat_range: Repeated BO range. */ + u32 bo_repeat_range; + /** * @map.sgt: sg-table pointing to pages backing the GEM object. * @@ -1007,6 +1010,26 @@ panthor_vm_map_pages(struct panthor_vm *vm, u64 iova= , int prot, return 0; } =20 +static int +panthor_vm_repeated_map_pages(struct panthor_vm *vm, u64 iova, int prot, + struct sg_table *sgt, u64 offset, u64 size, + u64 count) +{ + /* FIXME: we really need to optimize this at the io_pgtable level. */ + for (u64 i =3D 0; i < count; i++) { + int ret; + + ret =3D panthor_vm_map_pages(vm, iova + (size * i), prot, + sgt, offset, size); + if (ret) { + panthor_vm_unmap_pages(vm, iova, size * (i - 1)); + return ret; + } + } + + return 0; +} + static int flags_to_prot(u32 flags) { int prot =3D 0; @@ -1203,12 +1226,14 @@ panthor_vm_op_ctx_prealloc_vmas(struct panthor_vm_o= p_ctx *op_ctx) (DRM_PANTHOR_VM_BIND_OP_MAP_READONLY | \ DRM_PANTHOR_VM_BIND_OP_MAP_NOEXEC | \ DRM_PANTHOR_VM_BIND_OP_MAP_UNCACHED | \ + DRM_PANTHOR_VM_BIND_OP_MAP_REPEAT | \ DRM_PANTHOR_VM_BIND_OP_TYPE_MASK) =20 static int panthor_vm_prepare_map_op_ctx(struct panthor_vm_op_ctx *op_ctx, struct panthor_vm *vm, struct panthor_gem_object *bo, u64 offset, + u32 repeat_range, u64 size, u64 va, u32 flags) { @@ -1224,9 +1249,22 @@ static int panthor_vm_prepare_map_op_ctx(struct pant= hor_vm_op_ctx *op_ctx, (flags & DRM_PANTHOR_VM_BIND_OP_TYPE_MASK) !=3D DRM_PANTHOR_VM_BIND_O= P_TYPE_MAP) return -EINVAL; =20 - /* Make sure the VA and size are aligned and in-bounds. */ - if (size > bo->base.base.size || offset > bo->base.base.size - size) - return -EINVAL; + if (!(flags & DRM_PANTHOR_VM_BIND_OP_MAP_REPEAT)) { + /* Make sure the VA and size are in-bounds. */ + if (size > bo->base.base.size || offset > bo->base.base.size - size) + return -EINVAL; + } else { + /* Make sure the repeat_range is in-bounds. */ + if (repeat_range > bo->base.base.size || offset > bo->base.base.size - r= epeat_range) + return -EINVAL; + + /* Make sure size is a multiple of repeat_range */ + + u64 repeat_count =3D size; + + if (do_div(repeat_count, repeat_range)) + return -EINVAL; + } =20 /* If the BO has an exclusive VM attached, it can't be mapped to other VM= s. */ if (bo->exclusive_vm_root_gem && @@ -1295,6 +1333,7 @@ static int panthor_vm_prepare_map_op_ctx(struct panth= or_vm_op_ctx *op_ctx, drm_gem_shmem_unpin(&bo->base); =20 op_ctx->map.bo_offset =3D offset; + op_ctx->map.bo_repeat_range =3D repeat_range; =20 /* L1, L2 and L3 page tables. * We could optimize L3 allocation by iterating over the sgt and merging @@ -2112,9 +2151,22 @@ static int panthor_gpuva_sm_step_map(struct drm_gpuv= a_op *op, void *priv) =20 panthor_vma_init(vma, op_ctx->flags & PANTHOR_VM_MAP_FLAGS); =20 - ret =3D panthor_vm_map_pages(vm, op->map.va.addr, flags_to_prot(vma->flag= s), - op_ctx->map.sgt, op->map.gem.offset, - op->map.va.range); + if (op_ctx->flags & DRM_PANTHOR_VM_BIND_OP_MAP_REPEAT) { + u64 repeat_count =3D op->map.va.range; + + do_div(repeat_count, op->map.gem.range); + ret =3D panthor_vm_repeated_map_pages(vm, op->map.va.addr, + flags_to_prot(vma->flags), + op_ctx->map.sgt, + op->map.gem.offset, + op->map.gem.range, + repeat_count); + } else { + ret =3D panthor_vm_map_pages(vm, op->map.va.addr, + flags_to_prot(vma->flags), + op_ctx->map.sgt, op->map.gem.offset, + op->map.va.range); + } if (ret) return ret; =20 @@ -2237,7 +2289,7 @@ panthor_vm_exec_op(struct panthor_vm *vm, struct pant= hor_vm_op_ctx *op, =20 switch (op_type) { case DRM_PANTHOR_VM_BIND_OP_TYPE_MAP: { - const struct drm_gpuvm_map_req map_req =3D { + struct drm_gpuvm_map_req map_req =3D { .va.addr =3D op->va.addr, .va.range =3D op->va.range, .gem.obj =3D op->map.vm_bo->obj, @@ -2249,6 +2301,11 @@ panthor_vm_exec_op(struct panthor_vm *vm, struct pan= thor_vm_op_ctx *op, break; } =20 + if (op->flags & DRM_PANTHOR_VM_BIND_OP_MAP_REPEAT) { + map_req.flags |=3D DRM_GPUVA_REPEAT; + map_req.gem.range =3D op->map.bo_repeat_range; + } + ret =3D drm_gpuvm_sm_map(&vm->base, vm, &map_req); break; } @@ -2497,6 +2554,7 @@ panthor_vm_bind_prepare_op_ctx(struct drm_file *file, ret =3D panthor_vm_prepare_map_op_ctx(op_ctx, vm, gem ? to_panthor_bo(gem) : NULL, op->bo_offset, + op->bo_repeat_range, op->size, op->va, op->flags); @@ -2698,7 +2756,11 @@ int panthor_vm_map_bo_range(struct panthor_vm *vm, s= truct panthor_gem_object *bo struct panthor_vm_op_ctx op_ctx; int ret; =20 - ret =3D panthor_vm_prepare_map_op_ctx(&op_ctx, vm, bo, offset, size, va, = flags); + /* TODO: would be nice to replace with assert instead */ + if (flags & DRM_PANTHOR_VM_BIND_OP_MAP_REPEAT) + return -EINVAL; + + ret =3D panthor_vm_prepare_map_op_ctx(&op_ctx, vm, bo, offset, 0, size, v= a, flags); if (ret) return ret; =20 diff --git a/include/uapi/drm/panthor_drm.h b/include/uapi/drm/panthor_drm.h index e1f43deb7eca..ad278bc234b0 100644 --- a/include/uapi/drm/panthor_drm.h +++ b/include/uapi/drm/panthor_drm.h @@ -496,6 +496,17 @@ enum drm_panthor_vm_bind_op_flags { */ DRM_PANTHOR_VM_BIND_OP_MAP_UNCACHED =3D 1 << 2, =20 + /** + * @DRM_PANTHOR_VM_BIND_OP_MAP_REPEAT: Repeat a BO range + * + * Only valid with DRM_PANTHOR_VM_BIND_OP_TYPE_MAP. + * + * When this is set, a BO range is repeated over the VA range. + * drm_panthor_vm_bind_op::bo_repeat_range defines the size of the + * BO range to repeat. + */ + DRM_PANTHOR_VM_BIND_OP_MAP_REPEAT =3D 1 << 3, + /** * @DRM_PANTHOR_VM_BIND_OP_TYPE_MASK: Mask used to determine the type of = operation. */ @@ -560,6 +571,18 @@ struct drm_panthor_vm_bind_op { */ struct drm_panthor_obj_array syncs; =20 + /** + * @bo_repeat_range: The size of the range to be repeated. + * + * Must be zero if DRM_PANTHOR_VM_BIND_OP_MAP_REPEAT is not set in + * flags. + * + * Size must be a multiple of bo_repeat_range. + */ + __u32 bo_repeat_range; + + /** @pad: Padding field. MBZ. */ + __u32 pad; }; =20 /** --=20 2.47.2