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 B667B2E7F28 for ; Mon, 7 Jul 2025 17:05:10 +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=1751907912; cv=none; b=JhUPoJZbE8O0G46t6zZVvkb6Dd64tdmcBhIJZ0uVzeOo3mejXIes1qTngo+ONqTCB80XiP2j05rs81LqjlGkrF4yc0quOUBHytcALAIcU4vR1qbzpNLFSUUCP8UVPfWIWEooKv5y+3HAiclVUAkgjMPXYI3i3ABKggor5T5+Z7w= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1751907912; c=relaxed/simple; bh=akBcOMf2yaT9+54T4JiDFinAfyszlhXfN+hd5VU7pxs=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=RZusYNdjdHjhKRESgpTmo6IO03zRx03ukNzgKJZRv/ZVNhaXM1Oxo/r9XgZEyQfEj2sCrMOS0fkoaz0qLtmFbr2loFd5zmpe5YQIa58pdK3YgkfGUL+3iXt9sroxFGcYA4Lji4jiG7VdMA4a6e0myuh6Gmi/iL0n+Zo20uHbJf0= 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=DSU8wyYl; 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="DSU8wyYl" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1751907909; bh=akBcOMf2yaT9+54T4JiDFinAfyszlhXfN+hd5VU7pxs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=DSU8wyYlQCn+tAXjJkoR0l9B3baQkuzMRCWFSTvbZLnJkWcQn4EMH16aRsXZHzUjY vGB9yIYtgtfr6C292lr613erbe6MiXDfHNOr5vaYShYuLNaiQceSd6bsshYP/7m8Mi HDhqmbk4dvPLZhgVQUpryMSQMpMwMft6zrIYMxAoI2EguuCGVn84skj8rTcGab0ulV XUa95uZBp58lQRRN4cmxamBonkUAZyJeMv2IZIuVZbVegk95k6+VaSRgayneK3cxre O2UqKnSOFKjU6VmAAhdAiFaNbz8otuDUFrtUHO2Uxt3sex2GhEJa4q7oPUbVlWRbR7 5zQBMdIRFVUig== 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 B8EC417E04EE; Mon, 7 Jul 2025 19:05:07 +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 5/7] drm/gpuvm: Add a flags field to drm_gpuvm_map_req/drm_gpuva_op_map Date: Mon, 7 Jul 2025 17:04:31 +0000 Message-ID: <20250707170442.1437009-6-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: Asahi Lina drm_gpuva objects have a flags field. Currently, this can be managed by drivers out-of-band, without any special handling in drm_gpuvm. To be able to introduce flags that do affect the logic in the drm_gpuvm core, we need to plumb it through the map calls. This will allow the core to check the flags on map and alter the merge/split logic depending on the requested flags and the flags of the existing drm_gpuva ranges that are being split. Signed-off-by: Asahi Lina Signed-off-by: Caterina Shablia Acked-by: Danilo Krummrich --- drivers/gpu/drm/drm_gpuvm.c | 7 +++++++ include/drm/drm_gpuvm.h | 9 +++++++++ 2 files changed, 16 insertions(+) diff --git a/drivers/gpu/drm/drm_gpuvm.c b/drivers/gpu/drm/drm_gpuvm.c index dc3c2f906400..dd949a8853b0 100644 --- a/drivers/gpu/drm/drm_gpuvm.c +++ b/drivers/gpu/drm/drm_gpuvm.c @@ -2063,6 +2063,7 @@ op_map_cb(const struct drm_gpuvm_ops *fn, void *priv, op.map.va.range =3D req->va.range; op.map.gem.obj =3D req->gem.obj; op.map.gem.offset =3D req->gem.offset; + op.map.flags =3D req->flags; =20 return fn->sm_step_map(&op, priv); } @@ -2175,6 +2176,7 @@ __drm_gpuvm_sm_map(struct drm_gpuvm *gpuvm, .va.range =3D range - req->va.range, .gem.obj =3D obj, .gem.offset =3D offset + req->va.range, + .flags =3D va->flags, }; struct drm_gpuva_op_unmap u =3D { .va =3D va, @@ -2193,6 +2195,7 @@ __drm_gpuvm_sm_map(struct drm_gpuvm *gpuvm, .va.range =3D ls_range, .gem.obj =3D obj, .gem.offset =3D offset, + .flags =3D va->flags, }; struct drm_gpuva_op_unmap u =3D { .va =3D va }; =20 @@ -2219,6 +2222,7 @@ __drm_gpuvm_sm_map(struct drm_gpuvm *gpuvm, .gem.obj =3D obj, .gem.offset =3D offset + ls_range + req->va.range, + .flags =3D va->flags, }; =20 ret =3D op_remap_cb(ops, priv, &p, &n, &u); @@ -2247,6 +2251,7 @@ __drm_gpuvm_sm_map(struct drm_gpuvm *gpuvm, .va.range =3D end - req_end, .gem.obj =3D obj, .gem.offset =3D offset + req_end - addr, + .flags =3D va->flags, }; struct drm_gpuva_op_unmap u =3D { .va =3D va, @@ -2290,6 +2295,7 @@ __drm_gpuvm_sm_unmap(struct drm_gpuvm *gpuvm, prev.va.range =3D req_addr - addr; prev.gem.obj =3D obj; prev.gem.offset =3D offset; + prev.flags =3D va->flags; =20 prev_split =3D true; } @@ -2299,6 +2305,7 @@ __drm_gpuvm_sm_unmap(struct drm_gpuvm *gpuvm, next.va.range =3D end - req_end; next.gem.obj =3D obj; next.gem.offset =3D offset + (req_end - addr); + next.flags =3D va->flags; =20 next_split =3D true; } diff --git a/include/drm/drm_gpuvm.h b/include/drm/drm_gpuvm.h index a6e6c33fc10b..f77a89e791f1 100644 --- a/include/drm/drm_gpuvm.h +++ b/include/drm/drm_gpuvm.h @@ -847,6 +847,11 @@ struct drm_gpuva_op_map { */ struct drm_gem_object *obj; } gem; + + /** + * @flags: requested flags for the &drm_gpuva for this mapping + */ + enum drm_gpuva_flags flags; }; =20 /** @@ -1074,6 +1079,9 @@ struct drm_gpuvm_map_req { /** @offset: offset in the GEM */ u64 offset; } gem; + + /** @flags: combination of DRM_GPUVA_ flags describing the mapping proper= ties. */ + enum drm_gpuva_flags flags; }; =20 struct drm_gpuva_ops * @@ -1097,6 +1105,7 @@ void drm_gpuva_ops_free(struct drm_gpuvm *gpuvm, static inline void drm_gpuva_init_from_op(struct drm_gpuva *va, struct drm_gpuva_op_map *op) { + va->flags =3D op->flags; va->va.addr =3D op->va.addr; va->va.range =3D op->va.range; va->gem.obj =3D op->gem.obj; --=20 2.47.2