From nobody Wed Oct 8 19:24:30 2025 Received: from mx0a-0031df01.pphosted.com (mx0a-0031df01.pphosted.com [205.220.168.131]) (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 AE7292DBF66 for ; Wed, 25 Jun 2025 18:58:28 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=205.220.168.131 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750877910; cv=none; b=KHvdQaA0c6XsPPNSoBTsFg+XlCcXJj2VR5nAjyWVSlljN0ypWY9E27u3rCAFGFgSTm7sQgkRMQml+xyUMZO4uPTJylIyxH0zK+GuRSaMbMwfJ76Re28zZiYNm9MjlSm0viLA8zoWVOxjb+t9wMERGNzjyqwSYgICpwPphANfamI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750877910; c=relaxed/simple; bh=x6l1U8SQbNXar2T+nKC44CZbNnCrpWZd9rRpAvG91aA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=u0mkZOq395NcCEP0Ft/KjIe5bbaAtyoVdMdE2sAL+H5R38mM6p+cXVTVDZZCPyBGUd2srLrIALqV+DCr5rnA+Hi89AjCimQoCdvuq/5XYhT2Hv+4Q0U8Xxv9fth3catf86/rdqUR3HtG4Jof4uJCYDY1Qh2KRcu86KYapoWk59Y= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oss.qualcomm.com; spf=pass smtp.mailfrom=oss.qualcomm.com; dkim=pass (2048-bit key) header.d=qualcomm.com header.i=@qualcomm.com header.b=WovWfke8; arc=none smtp.client-ip=205.220.168.131 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oss.qualcomm.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=oss.qualcomm.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=qualcomm.com header.i=@qualcomm.com header.b="WovWfke8" Received: from pps.filterd (m0279866.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 55PBvDw3011924 for ; Wed, 25 Jun 2025 18:58:28 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qualcomm.com; h= cc:content-transfer-encoding:date:from:in-reply-to:message-id :mime-version:references:subject:to; s=qcppdkim1; bh=BHyE+ROYmr1 BYZwR3C+QXhzqfJ1dS+58uUEwZ+AZnWU=; b=WovWfke8x2POZSi4XbGmSzoYY7r OJuPg4AxkbaNSEDy4W9A/qIvRpSjsPBtHFLNfg2eAF7LchS0j2rSUJZNSxecTKhR ZSd88/qdk1s4I+A+WGSbtG91p+FaLHyyCB7THVOZyDPRfH7EpACjmmePFE8utNH5 31zjC90lH2xfh/5MvanjaDhKs2YgMalBEDZZfXUtj1gAB+Za/nwOp3miOitMZUFb qFjPLR3wD/j+IlOVshFrvlhITG4lP1LYb1b7L7szhnPuDzcPsTxCn0zCCRo5ANL2 MO91QPqTho0c7/OFx7yG4eJmt5++tQrfLcIuoHCovxInXdp2sZFW6EXzsiA== Received: from mail-pl1-f200.google.com (mail-pl1-f200.google.com [209.85.214.200]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 47ec26b651-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Wed, 25 Jun 2025 18:58:27 +0000 (GMT) Received: by mail-pl1-f200.google.com with SMTP id d9443c01a7336-234fedd3e51so1839915ad.1 for ; Wed, 25 Jun 2025 11:58:27 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1750877907; x=1751482707; 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=BHyE+ROYmr1BYZwR3C+QXhzqfJ1dS+58uUEwZ+AZnWU=; b=ANBjY7rzg3RSf9xPemSGsSEoZx0LDzSSsJOGhTY25ARtpQKhm2bI0+gTXXLeY1ZBPa zi0LtUZq9LyfKmQtgpT285RdcRbvCSaYKc7wMbtJUUgb2R6VyOKpM8uF7D2RwPik5SGx cn46af5AGa2Dgi6lbGNtmZ8o3FQTdtKbS64cuLRJhsO8PQM4l+yHsjd0A5Bcudgg8vdf Z9Ky1OOLw3tttzVz6/aDQRA5MFa1Iso26r41ms+c2vKVU8BgeVnzBx2LegdfcO1HLRiy jxoOsxB96OjhVe2bZEWzo5dUOgW7v/hl33GSyuJzrpJ4GdacLxk088gj73retl0t/9T6 +aYw== X-Forwarded-Encrypted: i=1; AJvYcCVgZXCGnnWEW0QDSqoz/fx2RXaaRF3QXmVizLChbL0xmGmjMChv9gSpXNPztZhjpqqzhkp8H8URy1dgFLE=@vger.kernel.org X-Gm-Message-State: AOJu0YxQilpJjmbMr6cu8NHzYBaFjaNT9C2BjYs5V+TxeYqPgh0zlwG+ 1bvw/urjDYOYPZZ1qZnVUjmkz9Cc/SAGdAQFOfst8ypmFy8vl33TP17YXm0Smg169VLRi4CXeRS z6AoEQsJXQUNQb0Dhkkg66naGBUuvK5dW8tUaIpAAEzU/86yK3O6u4AVnuuXt4PvS1zk= X-Gm-Gg: ASbGncvdOPWs/jDIsX+3ihLh3koeNsFYxcB+Jwysd1xvQymet6d2oVfUz7BapR86Rvd CBiiDEjk8HjrCOdHji0d5WxgF7ngaf1M4iZfwkO57SmsrjreQAapA9M5fQqd/IFIVPeKlFoOx/i Ks45Lr/bsbHJsW5cz2Qffh7sficmQZmdyp1kzaw+seG2+iKaFHbaX2wpxliOfL7dBez9nxK5Mvl 3yla5oJ5fbR7Pu9I3h7fUIq78npgPcQaPGedz62PNgitYl3Uk+bh/dDg/TF0PuBSagaFtCFjpEy txIFQuTe92YQjoWfgRZ1XMy6zNzOk5/l X-Received: by 2002:a17:902:ce06:b0:235:eca0:12d4 with SMTP id d9443c01a7336-23824095671mr80469685ad.53.1750877906901; Wed, 25 Jun 2025 11:58:26 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEfOU8b5xN3DBcrI0SlkS8W7vOGGlK3RW15375C9lfmS207Fy10Dze1XSZd5UHnBi7y5LdHyA== X-Received: by 2002:a17:902:ce06:b0:235:eca0:12d4 with SMTP id d9443c01a7336-23824095671mr80469315ad.53.1750877906514; Wed, 25 Jun 2025 11:58:26 -0700 (PDT) Received: from localhost ([2601:1c0:5000:d5c:5b3e:de60:4fda:e7b1]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-237d868f878sm144055785ad.184.2025.06.25.11.58.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 25 Jun 2025 11:58:26 -0700 (PDT) From: Rob Clark To: dri-devel@lists.freedesktop.org Cc: linux-arm-msm@vger.kernel.org, freedreno@lists.freedesktop.org, Connor Abbott , Antonino Maniscalco , Rob Clark , 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 v7 08/42] drm/msm: Collapse vma allocation and initialization Date: Wed, 25 Jun 2025 11:47:01 -0700 Message-ID: <20250625184918.124608-9-robin.clark@oss.qualcomm.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250625184918.124608-1-robin.clark@oss.qualcomm.com> References: <20250625184918.124608-1-robin.clark@oss.qualcomm.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 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwNjI1MDE0MyBTYWx0ZWRfX8QH3VFkVb9xD dBHm2IbccDsACFV+LxXx9tVvgD6NcWqUjLNoRZJnamdYnKlADyUxy59N/8lvh/uYgCzdIFAFruv c8gFIZnyRdKhm92yTVP2YeOg4xgAbWnOPny/14UVCi8kOltgipPZCbUWVwQU3PVx/S+WfDMX1+Y Ym5uxh3SZ1euVxVd0i2Xc+2XSGO+1v5bqdBdRgvoWYkBxWhrY6Xaqu5EtPJWhmExAsvB1NHfRm3 CP6pAegkg/KnkZpZ7uXdF0P9Zvfr3mTt3BOzk+J0grchzgaGJK5geX6Q1VCtXHO+Xea0FhV5wOW 9nFHg0vxZzwcwy6V/SUZp5uLA5WSqLdPU9Ry0hKmcy9LX2Mnw76hZHkYnWHnGlD+j7YctK5EXCm omWdyHx8TzPTJZD4lAC8eeSQsZ6Uy4ZG0omHdGheg7Ttnx9SisjCvBA8sPj982WuOcq2+zJg X-Authority-Analysis: v=2.4 cv=XPQwSRhE c=1 sm=1 tr=0 ts=685c46d3 cx=c_pps a=IZJwPbhc+fLeJZngyXXI0A==:117 a=xqWC_Br6kY4A:10 a=6IFa9wvqVegA:10 a=cm27Pg_UAAAA:8 a=EUspDBNiAAAA:8 a=Fs5xBETKxiRrdmql5B8A:9 a=uG9DUKGECoFWVXl0Dc02:22 X-Proofpoint-GUID: xNemKAqan5336AYeZkxlGXz_5HE0jAg7 X-Proofpoint-ORIG-GUID: xNemKAqan5336AYeZkxlGXz_5HE0jAg7 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1099,Hydra:6.1.7,FMLib:17.12.80.40 definitions=2025-06-25_06,2025-06-25_01,2025-03-28_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 lowpriorityscore=0 impostorscore=0 clxscore=1015 suspectscore=0 mlxscore=0 spamscore=0 phishscore=0 malwarescore=0 mlxlogscore=999 bulkscore=0 priorityscore=1501 adultscore=0 classifier=spam authscore=0 authtc=n/a authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.19.0-2505280000 definitions=main-2506250143 Content-Type: text/plain; charset="utf-8" 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 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 *ob= j) return offset; } =20 -static struct msm_gem_vma *add_vma(struct drm_gem_object *obj, - struct msm_gem_vm *vm) -{ - struct msm_gem_object *msm_obj =3D to_msm_bo(obj); - struct msm_gem_vma *vma; - - msm_gem_assert_locked(obj); - - vma =3D 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_ge= m_object *obj, struct msm_gem_vm *vm, u64 range_start, u64 range_end) { + struct msm_gem_object *msm_obj =3D to_msm_bo(obj); struct msm_gem_vma *vma; =20 msm_gem_assert_locked(obj); @@ -427,18 +411,10 @@ static struct msm_gem_vma *get_vma_locked(struct drm_= gem_object *obj, vma =3D lookup_vma(obj, vm); =20 if (!vma) { - int ret; - - vma =3D add_vma(obj, vm); + vma =3D msm_gem_vma_new(vm, obj, range_start, range_end); if (IS_ERR(vma)) return vma; - - ret =3D 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; }; =20 -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 *sg= t, int size); diff --git a/drivers/gpu/drm/msm/msm_gem_vma.c b/drivers/gpu/drm/msm/msm_ge= m_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); } =20 -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; =20 vma =3D kzalloc(sizeof(*vma), GFP_KERNEL); if (!vma) - return NULL; + return ERR_PTR(-ENOMEM); =20 vma->vm =3D vm; =20 - 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 =3D vma->vm; - int ret; - - if (GEM_WARN_ON(!vm)) - return -EINVAL; - - if (GEM_WARN_ON(vma->iova)) - return -EBUSY; - spin_lock(&vm->lock); ret =3D 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); =20 if (ret) - return ret; + goto err_free_vma; =20 vma->iova =3D vma->node.start; vma->mapped =3D false; =20 + INIT_LIST_HEAD(&vma->list); + kref_get(&vm->kref); =20 - return 0; + return vma; + +err_free_vma: + kfree(vma); + return ERR_PTR(ret); } =20 struct msm_gem_vm * --=20 2.49.0