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 42C39C3DA4A for ; Wed, 14 May 2025 17:56:28 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 9721E10E6E2; Wed, 14 May 2025 17:56:27 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="Pj093xbv"; dkim-atps=neutral Received: from mail-pg1-f177.google.com (mail-pg1-f177.google.com [209.85.215.177]) by gabe.freedesktop.org (Postfix) with ESMTPS id 2C2C310E6DF; Wed, 14 May 2025 17:56:25 +0000 (UTC) Received: by mail-pg1-f177.google.com with SMTP id 41be03b00d2f7-b1ffeda9363so2253a12.1; Wed, 14 May 2025 10:56:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1747245384; x=1747850184; darn=lists.freedesktop.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=9ZJAaoLVx59vP6ayQOWcOdWbgIttwlPWjJpDsI8g2BE=; b=Pj093xbvSfKl4yxHl241P9ATdaO98qS/I9Hfh0DBUXw3qxwGC8Z08TNztloVaT44pF I1T5Ey8OQ0KKZupx85saKTsgYMiqUuK6sQJcVtLpzep1e/oz00cijSMC2cFE4SfZtfrj eDi+n1k1JKxw5vqNnab/INMvX8QxEbexV/r5mapa3ldiYpf2Crq1/k52s6jo5sXLqjDU VpkJBITccEe1+iraQJHD31HQK45Ax3HHeDxSTsjVlSFEA4hdPSx0s4v02mzUqjCa7tsp dV5WDGnSaSE5+ZCr+3WYl/CsikroxMNTt+h8U1JoRZhpQ2sHl5AMkl3aeYkhRZ769V62 nivw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1747245384; x=1747850184; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=9ZJAaoLVx59vP6ayQOWcOdWbgIttwlPWjJpDsI8g2BE=; b=CTC9wUtOB2hELyMlEDog36O6X77oLRCxZqCb5uO+pvqYGBLH27Z2N9JE2+VbR7VHNz QoDns1OkPLNGIe1MT9t94FeOsmfKSeFM0Pdn5aQ4BfmhbNP/DdLL+2leRgwUUt0cERcv bb9kE2XGxQacso6QRY5P20L1/y/omd3YuiBmP+vkskjBzcswxENdR0bbivjoibtx51vl PNFbe5OPasIr90uEaAGZmOLzy4nvM7l1eqDmiO5pPd0Flm7gh+wshbfIRFC88C7i3yL6 qrCDCI7oRiCRzUVFaCwnDeOR2+bS/+sNaTA00AkcaSYpot5rc6Nti4I/niHtFqTbVQnT TRAA== X-Gm-Message-State: AOJu0YyO3XhCcCXpVP8oXIjEkuAknfV4rSLSpd8uxS0xxrUO3jrbnDZ6 ls54nKXcBN0mI0Ge1vbE19LlgyzszO7XVzJ9vrYsAO1mRYfhrb9+jiWA1g== X-Gm-Gg: ASbGncvg3Mck4+SkFQHXapfJ4l4iqpMd79921TjN9nfCu3awdi5kAqVm8y0iZo6grlJ 6Gobd/edqJl+Uz+jZJi4mR76HdIIYZ+Lj5H/JI6W3pcMk4OJOyVjdZxtuoqkP6Pf9x3MY0AjLSC pFoWfP1T0LQAQnzgdHsJvA8WHVgXvOWu+YBG0J6q5V+8zQ/2p0V4YUbojAHLUxkaGmrnI7pcDl6 Nl/xKHxNv/n0Mm2W/l7OnMygT8x96Fw3m9XxwmxoQdr5oAq8VrswYIDr/eIE+vn8CPndmlOfcyL jmfRv9pGaBxZMaHDPCSgF+lm2FDMz0qdRZmF1HSAQE/3VL/iQA5Y7hnC1LjiKyhRp0ELjFzETV/ mz9Cnz7NUOJ5SWgcnHXWJgag0Nw== X-Google-Smtp-Source: AGHT+IHZvBZD3lCV1dVLdZ4bhFoWCcdh4ODc0Xqd3DT1ypEQbe11NO4rlWbxF5S9AjJRi8mVKUo7JA== X-Received: by 2002:a17:902:e5cc:b0:22e:1a41:a6de with SMTP id d9443c01a7336-231981a2d96mr66019365ad.32.1747245383959; Wed, 14 May 2025 10:56:23 -0700 (PDT) Received: from localhost ([2a00:79e0:3e00:2601:3afc:446b:f0df:eadc]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-22fc75490f8sm101786445ad.42.2025.05.14.10.56.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 14 May 2025 10:56:23 -0700 (PDT) From: Rob Clark To: dri-devel@lists.freedesktop.org Cc: freedreno@lists.freedesktop.org, linux-arm-msm@vger.kernel.org, Connor Abbott , Rob Clark , Rob Clark , Abhinav Kumar , Dmitry Baryshkov , Sean Paul , Marijn Suijten , David Airlie , Simona Vetter , linux-kernel@vger.kernel.org (open list) Subject: [PATCH v4 10/40] drm/msm: Collapse vma allocation and initialization Date: Wed, 14 May 2025 10:53:24 -0700 Message-ID: <20250514175527.42488-11-robdclark@gmail.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250514175527.42488-1-robdclark@gmail.com> References: <20250514175527.42488-1-robdclark@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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" From: Rob Clark Now that we've dropped vram carveout support, we can collapse vma allocation and initialization. This better matches how things work with drm_gpuvm. Signed-off-by: Rob Clark --- drivers/gpu/drm/msm/msm_gem.c | 30 +++----------------------- drivers/gpu/drm/msm/msm_gem.h | 4 ++-- drivers/gpu/drm/msm/msm_gem_vma.c | 36 +++++++++++++------------------ 3 files changed, 20 insertions(+), 50 deletions(-) diff --git a/drivers/gpu/drm/msm/msm_gem.c b/drivers/gpu/drm/msm/msm_gem.c index 621fb4e17a2e..29247911f048 100644 --- a/drivers/gpu/drm/msm/msm_gem.c +++ b/drivers/gpu/drm/msm/msm_gem.c @@ -337,23 +337,6 @@ uint64_t msm_gem_mmap_offset(struct drm_gem_object *obj) return offset; } -static struct msm_gem_vma *add_vma(struct drm_gem_object *obj, - struct msm_gem_vm *vm) -{ - struct msm_gem_object *msm_obj = to_msm_bo(obj); - struct msm_gem_vma *vma; - - msm_gem_assert_locked(obj); - - vma = msm_gem_vma_new(vm); - if (!vma) - return ERR_PTR(-ENOMEM); - - list_add_tail(&vma->list, &msm_obj->vmas); - - return vma; -} - static struct msm_gem_vma *lookup_vma(struct drm_gem_object *obj, struct msm_gem_vm *vm) { @@ -420,6 +403,7 @@ static struct msm_gem_vma *get_vma_locked(struct drm_gem_object *obj, struct msm_gem_vm *vm, u64 range_start, u64 range_end) { + struct msm_gem_object *msm_obj = to_msm_bo(obj); struct msm_gem_vma *vma; msm_gem_assert_locked(obj); @@ -427,18 +411,10 @@ static struct msm_gem_vma *get_vma_locked(struct drm_gem_object *obj, vma = lookup_vma(obj, vm); if (!vma) { - int ret; - - vma = add_vma(obj, vm); + vma = msm_gem_vma_new(vm, obj, range_start, range_end); if (IS_ERR(vma)) return vma; - - ret = msm_gem_vma_init(vma, obj->size, - range_start, range_end); - if (ret) { - del_vma(vma); - return ERR_PTR(ret); - } + list_add_tail(&vma->list, &msm_obj->vmas); } else { GEM_WARN_ON(vma->iova < range_start); GEM_WARN_ON((vma->iova + obj->size) > range_end); diff --git a/drivers/gpu/drm/msm/msm_gem.h b/drivers/gpu/drm/msm/msm_gem.h index c16b11182831..9bd78642671c 100644 --- a/drivers/gpu/drm/msm/msm_gem.h +++ b/drivers/gpu/drm/msm/msm_gem.h @@ -66,8 +66,8 @@ struct msm_gem_vma { bool mapped; }; -struct msm_gem_vma *msm_gem_vma_new(struct msm_gem_vm *vm); -int msm_gem_vma_init(struct msm_gem_vma *vma, int size, +struct msm_gem_vma * +msm_gem_vma_new(struct msm_gem_vm *vm, struct drm_gem_object *obj, u64 range_start, u64 range_end); void msm_gem_vma_purge(struct msm_gem_vma *vma); int msm_gem_vma_map(struct msm_gem_vma *vma, int prot, struct sg_table *sgt, int size); diff --git a/drivers/gpu/drm/msm/msm_gem_vma.c b/drivers/gpu/drm/msm/msm_gem_vma.c index 9419692f0cc8..6d18364f321c 100644 --- a/drivers/gpu/drm/msm/msm_gem_vma.c +++ b/drivers/gpu/drm/msm/msm_gem_vma.c @@ -106,47 +106,41 @@ void msm_gem_vma_close(struct msm_gem_vma *vma) msm_gem_vm_put(vm); } -struct msm_gem_vma *msm_gem_vma_new(struct msm_gem_vm *vm) +/* Create a new vma and allocate an iova for it */ +struct msm_gem_vma * +msm_gem_vma_new(struct msm_gem_vm *vm, struct drm_gem_object *obj, + u64 range_start, u64 range_end) { struct msm_gem_vma *vma; + int ret; vma = kzalloc(sizeof(*vma), GFP_KERNEL); if (!vma) - return NULL; + return ERR_PTR(-ENOMEM); vma->vm = vm; - return vma; -} - -/* Initialize a new vma and allocate an iova for it */ -int msm_gem_vma_init(struct msm_gem_vma *vma, int size, - u64 range_start, u64 range_end) -{ - struct msm_gem_vm *vm = vma->vm; - int ret; - - if (GEM_WARN_ON(!vm)) - return -EINVAL; - - if (GEM_WARN_ON(vma->iova)) - return -EBUSY; - spin_lock(&vm->lock); ret = drm_mm_insert_node_in_range(&vm->mm, &vma->node, - size, PAGE_SIZE, 0, + obj->size, PAGE_SIZE, 0, range_start, range_end, 0); spin_unlock(&vm->lock); if (ret) - return ret; + goto err_free_vma; vma->iova = vma->node.start; vma->mapped = false; + INIT_LIST_HEAD(&vma->list); + kref_get(&vm->kref); - return 0; + return vma; + +err_free_vma: + kfree(vma); + return ERR_PTR(ret); } struct msm_gem_vm * -- 2.49.0