From nobody Tue Apr 7 12:53:40 2026 Received: from sender4-pp-f112.zoho.com (sender4-pp-f112.zoho.com [136.143.188.112]) (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 BBB8D3B8926 for ; Fri, 13 Mar 2026 15:11:35 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=pass smtp.client-ip=136.143.188.112 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773414696; cv=pass; b=s0hr9QJHkejQMVsF7UBYHBsK6ISo1umT/Uuf/gqE4oJvNFdHSOEtied0NEQFSyDPWafXBYZABVuWZWfdqX0bGSfJiwnQu2zbylKnoz0Muh71wO4M+yb1vZhpZctfsGIOIct+aNZhCl0mP+Ntk5Q2TDbVuKuXsbO36I6kuDshST8= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773414696; c=relaxed/simple; bh=pjpTEjGtPplEo+D4i8ene5pq8OSkVvPBu77xoyw5QQA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=Ed+zxhJkOvV5ZiaSibodVkGgUz3Y1j77PQ3oDt16vGIzq89j5TQnm+RbD+/GZRXDlszQm8TFMNlPUMv8ctCjU/ievCfYTBAcmLUrtCDsDxgWPEbiVrgtvbuUgJuTfc2cf8/KwDKJOY+kMoYRCYe71WuG36z3ItA0q6qC70+nGqY= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=collabora.com; spf=pass smtp.mailfrom=collabora.com; dkim=pass (1024-bit key) header.d=collabora.com header.i=adrian.larumbe@collabora.com header.b=Mv7vOoaE; arc=pass smtp.client-ip=136.143.188.112 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 (1024-bit key) header.d=collabora.com header.i=adrian.larumbe@collabora.com header.b="Mv7vOoaE" ARC-Seal: i=1; a=rsa-sha256; t=1773414680; cv=none; d=zohomail.com; s=zohoarc; b=UV3yL518arnR0/TjctHYyB0rzN/vQblVHEmQ1s1j0n09hdcsqPhORPAr43cFUZ4DSusB6EiWv14VRqh4ErSwmU6ZHqUTogoUEWCtjgkTmOYbjhTNttojjgqECb73QNwZtMJh20LsfE2RhUI2egmr4d3A9ZwtMyUMsQZ8SCTGuX4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1773414680; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:Subject:To:To:Message-Id:Reply-To; bh=SdVZB9xAx6kDE71K2UbMTmPRTxksVaVSVA3Iu9cKNPk=; b=QaH/pWzQskk9ajUlqyjqrz36awrtv3pmNqIYIo/owLPHN7+pnbTAAgIlbh2FooLV5Nr8KnCSFKm3CwfD7fIrn2l9ixKzF8ysghPtDeNnTAPpgHxmiyyYIevieV6BYXRr+UxERbW6Cbh7VuYo1rutZynhAnrgVHWvARTSRwJKvyQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass header.i=collabora.com; spf=pass smtp.mailfrom=adrian.larumbe@collabora.com; dmarc=pass header.from= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; t=1773414680; s=zohomail; d=collabora.com; i=adrian.larumbe@collabora.com; h=From:From:To:To:Cc:Cc:Subject:Subject:Date:Date:Message-ID:In-Reply-To:References:MIME-Version:Content-Type:Content-Transfer-Encoding:Message-Id:Reply-To; bh=SdVZB9xAx6kDE71K2UbMTmPRTxksVaVSVA3Iu9cKNPk=; b=Mv7vOoaEkTKPFo6XUHzvZnHNHqjfnpUX8ErMTabRCH/TTGSCDE8IfYTKnx76+24P u/QzDS7GtpEOrSk3JQSDn2JWVXTi/V2ON/4CQ5szdxPTUuWkv4E8w2QNAgSJBmpf/Jk El5gup6wYr2yPgOLxvmFHbh4xhzwv1bcpiz5cHAs= Received: by mx.zohomail.com with SMTPS id 1773414678777968.1023471391474; Fri, 13 Mar 2026 08:11:18 -0700 (PDT) From: =?UTF-8?q?Adri=C3=A1n=20Larumbe?= To: linux-kernel@vger.kernel.org Cc: dri-devel@lists.freedesktop.org, Steven Price , Boris Brezillon , Janne Grunau , kernel@collabora.com, =?UTF-8?q?Adri=C3=A1n=20Larumbe?= , Liviu Dudau , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Simona Vetter Subject: [PATCH v5 09/11] drm/panthor: Handle remap case for repeated mappings Date: Fri, 13 Mar 2026 15:09:46 +0000 Message-ID: <20260313150956.1618635-10-adrian.larumbe@collabora.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260313150956.1618635-1-adrian.larumbe@collabora.com> References: <20260313150956.1618635-1-adrian.larumbe@collabora.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable When a GPUVA remap is triggered as a consequence of a VM operation insersecting with existing VAs, when mapping the split VAs one must take into account whether they were repeat-mapped. Signed-off-by: Adri=C3=A1n Larumbe --- drivers/gpu/drm/panthor/panthor_mmu.c | 63 +++++++++++++++++---------- 1 file changed, 39 insertions(+), 24 deletions(-) diff --git a/drivers/gpu/drm/panthor/panthor_mmu.c b/drivers/gpu/drm/pantho= r/panthor_mmu.c index a357063bb9f6..ba322e2029b9 100644 --- a/drivers/gpu/drm/panthor/panthor_mmu.c +++ b/drivers/gpu/drm/panthor/panthor_mmu.c @@ -2124,41 +2124,52 @@ static void panthor_vma_init(struct panthor_vma *vm= a, u32 flags) DRM_PANTHOR_VM_BIND_OP_MAP_NOEXEC | \ DRM_PANTHOR_VM_BIND_OP_MAP_UNCACHED) =20 -static int panthor_gpuva_sm_step_map(struct drm_gpuva_op *op, void *priv) +static int +panthor_vm_map_range(struct panthor_vm *vm, bool repeat, struct sg_table *= sgt, + u64 addr, u64 offset, u64 size, u32 repeat_range, int prot) { - struct panthor_vm *vm =3D priv; - struct panthor_vm_op_ctx *op_ctx =3D vm->op_ctx; - struct panthor_vma *vma =3D panthor_vm_op_ctx_get_vma(op_ctx); int ret; =20 - if (!vma) - return -EINVAL; - - panthor_vma_init(vma, op_ctx->flags & PANTHOR_VM_MAP_FLAGS); + if (!size) + return 0; =20 - if (op_ctx->flags & DRM_PANTHOR_VM_BIND_OP_MAP_REPEAT) { - u64 repeat_count =3D op->map.va.range; + if (repeat) { + u64 repeat_count =3D size; =20 - do_div(repeat_count, op->map.gem.repeat_range); + do_div(repeat_count, repeat_range); =20 if (drm_WARN_ON(&vm->ptdev->base, !repeat_count)) return -EINVAL; =20 - 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.repeat_range, + ret =3D panthor_vm_repeated_map_pages(vm, addr, prot, sgt, + offset, repeat_range, repeat_count); if (!ret) vm->base.flags |=3D DRM_GPUVM_HAS_REPEAT_MAPS; } 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); + ret =3D panthor_vm_map_pages(vm, addr, prot, sgt, + offset, size); } =20 + return ret; +} + +static int panthor_gpuva_sm_step_map(struct drm_gpuva_op *op, void *priv) +{ + struct panthor_vm *vm =3D priv; + struct panthor_vm_op_ctx *op_ctx =3D vm->op_ctx; + struct panthor_vma *vma =3D panthor_vm_op_ctx_get_vma(op_ctx); + int ret; + + if (!vma) + return -EINVAL; + + panthor_vma_init(vma, op_ctx->flags & PANTHOR_VM_MAP_FLAGS); + + ret =3D panthor_vm_map_range(vm, op_ctx->flags & DRM_PANTHOR_VM_BIND_OP_M= AP_REPEAT, + op_ctx->map.sgt, op->map.va.addr, op->map.gem.offset, + op->map.va.range, op->map.gem.repeat_range, + flags_to_prot(vma->flags)); if (ret) { panthor_vm_op_ctx_return_vma(op_ctx, vma); return ret; @@ -2262,8 +2273,10 @@ static int panthor_gpuva_sm_step_remap(struct drm_gp= uva_op *op, u64 offset =3D op->remap.prev->gem.offset + unmap_start - op->remap.prev= ->va.addr; u64 size =3D op->remap.prev->va.addr + op->remap.prev->va.range - unmap_= start; =20 - ret =3D panthor_vm_map_pages(vm, unmap_start, flags_to_prot(unmap_vma->f= lags), - bo->base.sgt, offset, size); + ret =3D panthor_vm_map_range(vm, op->remap.prev->flags & DRM_GPUVA_REPEA= T, + bo->base.sgt, op->remap.prev->va.addr, offset, + size, op->remap.prev->gem.repeat_range, + flags_to_prot(unmap_vma->flags)); if (ret) return ret; =20 @@ -2276,8 +2289,10 @@ static int panthor_gpuva_sm_step_remap(struct drm_gp= uva_op *op, u64 addr =3D op->remap.next->va.addr; u64 size =3D unmap_start + unmap_range - op->remap.next->va.addr; =20 - ret =3D panthor_vm_map_pages(vm, addr, flags_to_prot(unmap_vma->flags), - bo->base.sgt, op->remap.next->gem.offset, size); + ret =3D panthor_vm_map_range(vm, op->remap.next->flags & DRM_GPUVA_REPEA= T, + bo->base.sgt, addr, op->remap.next->gem.offset, + size, op->remap.next->gem.repeat_range, + flags_to_prot(unmap_vma->flags)); if (ret) return ret; =20 --=20 2.53.0