From mboxrd@z Thu Jan 1 00:00:00 1970 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 08194368D4C for ; Sat, 26 Sep 2026 18:32:02 +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=1790447527; cv=none; b=ISWe8lcRV84uvtH0z+9vXHSzPuSox6/g8BWrXVMl3UHZkc1zq1Ot35dN8v1PNwLQsyxsWV1dYMPqtAeaA4cGJ+8PrzjgExbco8pNFdKbAd9wj9QPJp/KnFsIhz47ueWaGqU7kfATuEDUe0EVJWo0osjyudLqguS8rpgRZ11IoJs= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1790447527; c=relaxed/simple; bh=9xokjdYF+P3Ji/omAWmaL77GOLG2q85QI277l5/br8s=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=e5HnzOirHKfVZetqpdquCfRfJgc9J1l/8DxZs1oSFZKCwE4Sf9yUnBVu8M9+Z1f2FasEWrDw0Qzc7ZJ+HW+n1+cS+yDxczUnyIHedjSSKRiVXSFQ55kHXmo8LPniGRSuK3p2H1E4G5yYf7nNvpr7nuZSNElLPGyMXF0dWm+oHw4= 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=PVb86tYh; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b=IJauMvFs; 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="PVb86tYh"; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="IJauMvFs" Received: from pps.filterd (m0279862.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 68QGxRtd4013829 for ; Sat, 26 Sep 2026 18:32:02 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=N6Sk/qPpTb8 0sqKVTmQiXDBsrY1jdpSDdOhKqhp6i50=; b=PVb86tYhihJaM2VR2lRViZcLDqw aNChzCaDeuAsn+oGyBLRjv6D928o8OgHdIbv9zebBAiKNi8zYw6uhZDvYsjUOeOM rV0XSCDJRC/LWC6CY5mTtKGepqGLxL/JKglnmcgjNvKBrm6QISzDcJAxVOWEg4am vTk4CJvQS4FUo5tFXoZpLSvsrL/bhXjNtccHe5nMaQLlWabiZ7TjxDgFBD9SBz9v oM/pI5JDlpxQH6i4Cq7rhY5Soeo14A8iEWcuvPSk4IsWRlXHN3hwCcp3XthwY40F 3qgIf37dEpfVEOulX3sbkMH5m9WP5Gjrhvqy85nfq6XbsyLpOSu0ObRQcZg== Received: from mail-pl1-f199.google.com (mail-pl1-f199.google.com [209.85.214.199]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4gx6tehdha-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Sat, 26 Sep 2026 18:32:02 +0000 (GMT) Received: by mail-pl1-f199.google.com with SMTP id d9443c01a7336-2db8c152622so11910045ad.2 for ; Sat, 26 Sep 2026 11:32:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1790447521; x=1791052321; darn=vger.kernel.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:content-type; bh=N6Sk/qPpTb80sqKVTmQiXDBsrY1jdpSDdOhKqhp6i50=; b=IJauMvFsFvo//dR7a/GYNJAWMr2QoKu41ff/NZJBFwclpxZLdrcjmn+aZxuFXOVf1K v4IC7tag9bBhtKWhoWe9r7mKhBYCQKAwQToSdiQdYwM5CMABibqjEq6NCfGMGrtViaVe U4NIh7v+LZSvp/ACvSEIXTzbPyDU48xw+InHOJa+jdBEyWNGakMf7t5x2FGJkC5JznK9 wf/rDSg9Zlkqns2SS90nnIwG6SzI22tOqtoBk+2BAUPNpQBacimqswg7uPobH9RMJCLl pZq/52yQYTS5mmJCH7sLfPGi4O+u4DjEi4hwprZr3OBfmd0YCbwkJOQlKmAF/09JwTt3 miWA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1790447521; x=1791052321; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to:content-type; bh=N6Sk/qPpTb80sqKVTmQiXDBsrY1jdpSDdOhKqhp6i50=; b=NNtcRlLbHcxhXpCaTpqy0tvIg8Dbk4ViOzxMux4eevNvWbdRBAGt+N5o5JxsUB2wx7 jM8oOus2N7SqU9I9mTSl1MoG0nOfSJ/mOcMghXki5fBO2tm+oZVxq+9jraO/uxyhDrNG KQVEGooC+TNRHyDAnXGwFRyLv/ypUOF75kudEASdN8oKkFgfEHFHsU8hyZthw9s2PFe5 qAA8m2GbSq+byz8G69e14imgecO4rzUjd7cDHJL9GuCsgYcc9PI6Gp7D3/pzP0v9vpRn sAqblX4W3pZm3knpuCqe46o0HYghDOGja+pTi00ejX7k4hm7MHZ7FnfPw2hkYHvpgT+H ThYg== X-Forwarded-Encrypted: i=1; AKwUvByEHRsWK6gZfme5iYjAai0eR/lymrbd944nqLqSZnoHa4ktMUJGoenXiv7+5L9+MtenZQUQJdDQnHCWtCg=@vger.kernel.org X-Gm-Message-State: AFuF++k+BvEa6H/oQBGHlIIPlZNTUWvsrKyHMs9QGRjggieDuLwAobWq 7Pe7uUiqNJfwapkAvuwBeSI3M8Z+8B2fhRONrkmvNs7+1y5nrqisKFDuDkm1spmCgTi26PlAjf9 sR9v97ASJsVTo2xgvQ9wbQUZa+t/Iyzyyr7TOg5jVGRP1l9Mp6WtHXxZa/64vDdZ0T4w= X-Gm-Gg: AYBFou0LYYzyBaML9zx8U9wU6CT0h2xGXiCR6fQgZNNBiwkb4BXmI771f5F8VM3zKkH dwDI/AWkfkavsX7YeBfOAcAyQY6MsC2L9/isAge5e341TzTTM2eeSNbnKbr3n8J+nuNCrqMZ9UN sD4VxHznFogG8LqOZg39nLkumnPevwrEn785SxCY1FVpWHYoTE4JAw8dR+B32e0wlRaKm51QyzT snK6PVICvVM21Xx4R3bBW0YzAWFh2Xv89MHanrXLKJ4aylxi8qpuIrTszpBI8HvWV3cLC/5BmRS RxIlC7Yktwjf47IUXVRJxzYZ7uWi546e3yz7suCyl4UAx7yVaViPypyrR7qo86LPzn05BhY8vC9 3FkVXD1jMXmd7/CXLb7/AycLnp9WSJMzOnaY6Xm9d3x+O6Q== X-Received: by 2002:a05:6a20:d49b:b0:3d3:af85:eb98 with SMTP id adf61e73a8af0-3de0e790e6emr8061659637.26.1790447521330; Sat, 26 Sep 2026 11:32:01 -0700 (PDT) X-Received: by 2002:a05:6a20:d49b:b0:3d3:af85:eb98 with SMTP id adf61e73a8af0-3de0e790e6emr8061643637.26.1790447520870; Sat, 26 Sep 2026 11:32:00 -0700 (PDT) Received: from localhost (c-73-37-105-206.hsd1.or.comcast.net. [73.37.105.206]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-cc794ef8befsm1768841a12.12.2026.09.26.11.31.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 26 Sep 2026 11:31:59 -0700 (PDT) From: Rob Clark To: dri-devel@lists.freedesktop.org Cc: linux-arm-msm@vger.kernel.org, freedreno@lists.freedesktop.org, Jianfeng Liu , =?UTF-8?q?Christian=20K=C3=B6nig?= , Rob Clark , Dmitry Baryshkov , Abhinav Kumar , Jessica Zhang , Sean Paul , Marijn Suijten , David Airlie , Simona Vetter , linux-kernel@vger.kernel.org (open list) Subject: [PATCH 6/6] drm/msm/gem: Drop use of drm_prime_sg_to_page_array() Date: Sat, 26 Sep 2026 11:30:46 -0700 Message-ID: <20260926183051.25754-7-robin.clark@oss.qualcomm.com> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260926183051.25754-1-robin.clark@oss.qualcomm.com> References: <20260926183051.25754-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: 8bit X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwOTI2MDA3MyBTYWx0ZWRfX7vGFK+qOSIA4 zwHjc0w8ENMUYz42/ahUalPq9hQCaqrrnPAPhCouPQYBTTS4h059/zJa+x5+GNkPYcMJc4dGJfP bfktjZdyiSP1KYR7AiM8TbWBFRP7S6JPi+v4mw1r/XrhMEdWhnX5c26lZSXnEBOPDbM6pvc+d9w i63TU/dHnP8fGlYxo98aqBDrpuE/tUn5JmScPvXaGNXRBHYOV6414NiF083z1jklKwvf/SelW4R N7+z4I3gMtfc8XF6ARAMzCEc8VUdnKG4YcE8Yhyn8AOMe9sior9c3psQYrcyUMpPs99WHgu4Dq5 ond8cq7A0b6uhuDl1Iu721vDjAqWfxn8f9m2pdsATgY/xjVI/iy8B+TfiJ5ipoGDTXvkZ5BHF8X 7rIEK+wIygbJ9gt4eUQx0qDT2iRYwJWnmabm2SDL0GXl0S3krLBvKNitpEHqxqj7ayL2ZqC/dgl MFfYjMt+osQUPezbo2A== X-Proofpoint-Spam-Info: AW1haW4tMjYwOTI2MDA3MyBTYWx0ZWRfX3V/JwvWln9NV BDqm3mClb26YChKJ+dxDxdONiF7WVkbh9TnVs1pti5WwYH+rkDdtAjNkzx6DQ5J/OHlZu9pEXKK OMMMoZX8i61fmkkyg55i9QFcf3oGIic= X-Proofpoint-ORIG-GUID: BP_TBE0O_ZODpofYYntChYEQqDVTEmXp X-Authority-Analysis: v=2.4 cv=X9LHu2Te c=1 sm=1 tr=0 ts=6ab80fa2 cx=c_pps a=JL+w9abYAAE89/QcEU+0QA==:117 a=19Wyn7e3V/0aNffMjNCMQw==:17 a=VdqzKS8jKosA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=_K5XuSEh1TEqbUxoQ0s3:22 a=EUspDBNiAAAA:8 a=VGg0XEsK77xSs33O3y8A:9 a=324X-CrmTo6CU4MGRt3R:22 X-Proofpoint-GUID: BP_TBE0O_ZODpofYYntChYEQqDVTEmXp X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1176,Hydra:6.1.134,FMLib:17.12.100.49 definitions=2026-09-26_05,2026-09-21_02,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 phishscore=0 priorityscore=1501 malwarescore=0 clxscore=1015 adultscore=0 lowpriorityscore=0 spamscore=0 suspectscore=0 bulkscore=0 impostorscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2609040000 definitions=main-2609260073 Now that we've removed any use of the page array outside of paths that are restricted to native (non-imported) objs, we can remove use of the deprecated function and allow msm_obj->pages to be NULL for imported dma-bufs. Signed-off-by: Rob Clark --- drivers/gpu/drm/msm/msm_gem.c | 27 ++------------------------- 1 file changed, 2 insertions(+), 25 deletions(-) diff --git a/drivers/gpu/drm/msm/msm_gem.c b/drivers/gpu/drm/msm/msm_gem.c index 3111d7389572..130ae27ee00b 100644 --- a/drivers/gpu/drm/msm/msm_gem.c +++ b/drivers/gpu/drm/msm/msm_gem.c @@ -1116,11 +1116,6 @@ static void msm_gem_free_object(struct drm_gem_object *obj) if (drm_gem_is_imported(obj)) { GEM_WARN_ON(msm_obj->vaddr); - /* Don't drop the pages for imported dmabuf, as they are not - * ours, just free the array we allocated: - */ - kvfree(msm_obj->pages); - /* In msm_gem_import() error path, sgt won't be set yet: */ if (msm_obj->sgt) drm_prime_gem_destroy(obj, msm_obj->sgt); @@ -1350,14 +1345,10 @@ struct drm_gem_object *msm_gem_import(struct drm_device *dev, struct dma_buf_attachment *attach, struct sg_table *sgt) { - struct msm_gem_object *msm_obj; struct drm_gem_object *obj; struct dma_buf *dmabuf = attach->dmabuf; - size_t size, npages; int ret; - size = PAGE_ALIGN(dmabuf->size); - ret = msm_gem_new_impl(dev, MSM_BO_WC, &obj); if (ret) return ERR_PTR(ret); @@ -1368,28 +1359,14 @@ struct drm_gem_object *msm_gem_import(struct drm_device *dev, */ obj->import_attach = attach; obj->resv = dmabuf->resv; - drm_gem_private_object_init(dev, obj, size); - - npages = size / PAGE_SIZE; - - msm_obj = to_msm_bo(obj); - msm_obj->pages = kvmalloc_objs(struct page *, npages); - if (!msm_obj->pages) { - ret = -ENOMEM; - goto fail; - } - - ret = drm_prime_sg_to_page_array(sgt, msm_obj->pages, npages); - if (ret) { - goto fail; - } + drm_gem_private_object_init(dev, obj, PAGE_ALIGN(dmabuf->size)); ret = msm_gem_init_bookkeeping(obj); if (ret) goto fail; /* Now that we are past potential failure points, set sgt: */ - msm_obj->sgt = sgt; + to_msm_bo(obj)->sgt = sgt; return obj; -- 2.55.0