From nobody Sat Feb 7 20:28:07 2026 Received: from CY3PR05CU001.outbound.protection.outlook.com (mail-westcentralusazon11013025.outbound.protection.outlook.com [40.93.201.25]) (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 9090F14A60F for ; Thu, 13 Nov 2025 16:07:26 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.93.201.25 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763050048; cv=fail; b=TPzNnIfVcYILrVrAHTZq9nPnP0ZtZdQe9ei1LuFs9d5cImiZS3D6LO5eUAjT4FNfunxwZH97QpQXeokPXF7taz7dTkkYfeySh0K//dXFT8kgy2vg6xkG5KVr3Zx6tUbt0QIilZg/S4Rh0IrIcwLtVyAfm6HTG5LMZspEX91GHCw= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763050048; c=relaxed/simple; bh=qfLx8N9RBIl5FaJJlSsRw1ERH3gtcyQaN+pJgQnASC0=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=gTDkZAxRSFUCsD/sSRK5Fqs7cu3rg+PFWgpB+isH7qPx/s96dKa0weOFXOx+WNbxULuiyMfv72PppBU49T5q5L4I9G+uhE635URCuuD9JH+3s076cWbFQj8T1JIi4UoxM2+6eS7hEBAHvHZo1Ha2UarBIw4m1F94/lEtk2AGgKs= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amd.com; spf=fail smtp.mailfrom=amd.com; dkim=pass (1024-bit key) header.d=amd.com header.i=@amd.com header.b=KsblYjAO; arc=fail smtp.client-ip=40.93.201.25 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amd.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=amd.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=amd.com header.i=@amd.com header.b="KsblYjAO" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=Ye7BuMvg+nHGw362W02pYg9NSwJMqmFOYfyjHrfSmuU+CsAcJ7mPgNLe2TkR7gWHJY2oIV3Uz/d6M083kh7X80/Q0DzXBXvBi1kP6gsNbSv6bo26fhRpwFVwbz1tn/jSei6z4Y66i1v3pYb2GY3+kBSMHuTX/wiWS21sTFoh9Qs0RYbMpaiMryzDQjHdwxI4jUREMxQNMAJq3IJwuSeJPIqSaKZbGrYJpFkdJdkIhtews9MYi6PxYhfcXeNXfpYytOnfO6w4wAVApE3j8Lm5i5oxgtxzLZX5YtD8NAC/hUK4rTeRHsvZJmLnUWzJ5cJBWtY/H3Nq8PZsWyjOewBROQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=5mtcEofqrkvUItovYWkYVXHajXPHR/l89OuDyWCxwnY=; b=MsQxRoi6HyDeXdWoAHSv0SjpJy26lG3THXOFh7KQlSz7khSrwOi2e4erZbTYQQEaYSDKYlsPvfctmSE09BxyOTAMuhtaIQBjCt9oSvmUNpjKtslBde3mEa3Gu5Yi/F/S+OW/hIDShwNxSKnPv4pDOkAaSsqjYdKwid0pT2AA8P/w6xWLUrjnLrGXLEcGMlfCbUdsrP+5VOf5PhVFci69Kg5EVlNPc7w8w9PHnuLPe+JYfRY+Y8EQtYCW5r7oTo7biBowv5J35TbpdDozQpRMgJwXkeL22+MehGZtWZqCTF0B+w/yfgrZQA+zQ7IS8wbRzY1E9nYM0ntC5zosU7v05Q== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=gmail.com smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=5mtcEofqrkvUItovYWkYVXHajXPHR/l89OuDyWCxwnY=; b=KsblYjAObvMyjBpq0gh5n4z9aytlljkSgNb6PpbWIVTTvGsNwoB/mIWlmPeid0b5iPVpX5V6/v+gcIdWksyKDnuVbWRko3Bzlax85mLOXnD8PO2gTHFaquBI2/hG9z5nu77JmVOwy8PoFpQuOoMYhazWIHI7emPxWCQhe+tFYws= Received: from CH5PR03CA0011.namprd03.prod.outlook.com (2603:10b6:610:1f1::23) by MN6PR12MB8565.namprd12.prod.outlook.com (2603:10b6:208:47d::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9320.17; Thu, 13 Nov 2025 16:07:18 +0000 Received: from CH1PEPF0000A347.namprd04.prod.outlook.com (2603:10b6:610:1f1:cafe::c8) by CH5PR03CA0011.outlook.office365.com (2603:10b6:610:1f1::23) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.9320.17 via Frontend Transport; Thu, 13 Nov 2025 16:07:14 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=satlexmb07.amd.com; pr=C Received: from satlexmb07.amd.com (165.204.84.17) by CH1PEPF0000A347.mail.protection.outlook.com (10.167.244.7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9320.13 via Frontend Transport; Thu, 13 Nov 2025 16:07:17 +0000 Received: from FRAPPELLOUX01-WSLPUB.amd.com (10.180.168.240) by satlexmb07.amd.com (10.181.42.216) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.2562.17; Thu, 13 Nov 2025 08:07:14 -0800 From: Pierre-Eric Pelloux-Prayer To: Alex Deucher , =?UTF-8?q?Christian=20K=C3=B6nig?= , David Airlie , Simona Vetter , Felix Kuehling CC: Pierre-Eric Pelloux-Prayer , Arunpravin Paneer Selvam , , , Subject: [PATCH v2 01/20] drm/amdgpu: give each kernel job a unique id Date: Thu, 13 Nov 2025 17:05:42 +0100 Message-ID: <20251113160632.5889-2-pierre-eric.pelloux-prayer@amd.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20251113160632.5889-1-pierre-eric.pelloux-prayer@amd.com> References: <20251113160632.5889-1-pierre-eric.pelloux-prayer@amd.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-ClientProxiedBy: satlexmb07.amd.com (10.181.42.216) To satlexmb07.amd.com (10.181.42.216) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CH1PEPF0000A347:EE_|MN6PR12MB8565:EE_ X-MS-Office365-Filtering-Correlation-Id: 0c2e878b-fe73-491d-54c6-08de22ceb7dd X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|36860700013|82310400026|376014; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?PvT52Iu2LfFsv0Z3gXxtp1ZcJPV7Vl3cNbJs1cV13HzSN63ShVF7f798WPom?= =?us-ascii?Q?j08DvUX46feKgFtjxBlSH2hbNhivbQmuGpGs11Zmu0vz/aPq6jVLpq6MV2yV?= =?us-ascii?Q?12zgFcFlhue89iuy5QtVIuAdKgR2jQgaJa8wl0EnKRm244SzFymxY0hoNfsB?= =?us-ascii?Q?ekjM5jdI3p2HsiPBY78XpECfMahYOhyENau27rFiJc/ClBHKuW2CK4aJEt2d?= =?us-ascii?Q?v6E9DxgvPzbxRjOKHaErqQ19J4ZLQzR5U4nzr9DThTjEyJglTVaP0Nfj9EQx?= =?us-ascii?Q?ATxP3R3rHACI73xxAKV7yFqCwMiSMYJHIFKa9y3MBJd9g5s2CpA999XRuXY3?= =?us-ascii?Q?fk+NfaP46uZd7CLeZMiZk1BXFLAXltK5V09WjEmH/Sq/bVftyXuunXga+hO8?= =?us-ascii?Q?eGEQV2XeQKpZwRWrzmttG7+b8GSvSAiuyC+PWL/5oSSGDUOpDpJVW/Br7tvz?= =?us-ascii?Q?/y4iUlRYq9QDt29tlbda+uiqYA0YFMfJ4dmHaKQ5NGgQHobdFYSJv+Wjixbi?= =?us-ascii?Q?/cG+f8MNaHfXk1OU+ZVNqVHsHRZq7LkdntME+wZlFOptvgqVC9Xs7FKSCHxh?= =?us-ascii?Q?7lq5y7Kl1BUKB+sF9DbgFtSLv8A+i3Qn9UJShiVQ432a/BlKsgq3KcSuI7/s?= =?us-ascii?Q?Ekn0o0tY57hSoiSez3i69Ufb1xWYN98th1tB1EQ4ZvCJkNQ4TzfWIjxdXeIq?= =?us-ascii?Q?QWkZsr92ZmuJ7r0qlhBbpdtfkDT/sSCrHt+hxQAu65I74t9vtZlOn4+QRAum?= =?us-ascii?Q?T5ZmmTbUYRT76svQWz6yMoKcKaV/eiEGf4JVgqAvVieuQgrhl2LN16k03Kry?= =?us-ascii?Q?PwGKeO3nbgKMf45cBDPSBCUHK8RQeGutkHT/7nCxGyi4seKDTIRilDnM6laE?= =?us-ascii?Q?RjODDloj7LrVjCgRTgu+P6diVK2ZLZpwgjnGNoY0m04H7RWEKOOnUjTWj+v3?= =?us-ascii?Q?d903gJxgnjnMbenDg5PulGP4i1LFOhLb+52dqpzBVQDiHgjJZQ8ccYBq9olE?= =?us-ascii?Q?r1OCYI+wTP1KITUJAxl+2rN85zjcGyYQkllNiNx76iaQw7hROVmuhklYsQa5?= =?us-ascii?Q?KK63mI+muu3A/rqfnVVRt7f9b25rZGAEZWGm6TvCcFWQdTW12oD2+UZB1O3n?= =?us-ascii?Q?vYivlBE9ksT0QBAgMxv0UNBy3C1tRWeLh6MnTW4f5EYuR28D9JeowbcAVeDr?= =?us-ascii?Q?9TzYbVjeIKMyg/4ljkSlTDSkopSiYekDw38b+xz97OBLKr+dDeKlioDTBzc8?= =?us-ascii?Q?U/XAAXh5tYbrt3pQsfOIqsiN+QsfQNzP7Dkc23zlBrAoOnz0ZE5Keqx4Asa7?= =?us-ascii?Q?KlfkgGi6IPImyq07E7Af6XBEU+WjP5BC+rFlsDwNfHJ3jATECtbwRCkJQDjf?= =?us-ascii?Q?1HQeC3l3PRqavWx3xJ4RooueN4M1QyIsDhYSyVerp7js/EW3odqiVE39CL0p?= =?us-ascii?Q?Du4BZIVLtGNXmE+xTWqP0CqjcX7waFbg2yhSa7XKC8AcMrIqxr6CWU1A0fPJ?= =?us-ascii?Q?b4wuL7+zPSyyUhY4XyZzg4FJCAL5CAiQ7iX1xAcNIqEM2e7J+WnhdZTZduPK?= =?us-ascii?Q?vArkMjVYJjlmxmdm+r8=3D?= X-Forefront-Antispam-Report: CIP:165.204.84.17;CTRY:US;LANG:en;SCL:1;SRV:;IPV:CAL;SFV:NSPM;H:satlexmb07.amd.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230040)(1800799024)(36860700013)(82310400026)(376014);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Nov 2025 16:07:17.5997 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 0c2e878b-fe73-491d-54c6-08de22ceb7dd X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d;Ip=[165.204.84.17];Helo=[satlexmb07.amd.com] X-MS-Exchange-CrossTenant-AuthSource: CH1PEPF0000A347.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN6PR12MB8565 Content-Type: text/plain; charset="utf-8" Userspace jobs have drm_file.client_id as a unique identifier as job's owners. For kernel jobs, we can allocate arbitrary values - the risk of overlap with userspace ids is small (given that it's a u64 value). In the unlikely case the overlap happens, it'll only impact trace events. Since this ID is traced in the gpu_scheduler trace events, this allows to determine the source of each job sent to the hardware. To make grepping easier, the IDs are defined as they will appear in the trace output. Signed-off-by: Pierre-Eric Pelloux-Prayer Acked-by: Alex Deucher Signed-off-by: Arunpravin Paneer Selvam Link: https://lore.kernel.org/r/20250604122827.2191-1-pierre-eric.pelloux-p= rayer@amd.com Acked-by: Christian K=C3=B6nig --- drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c | 3 ++- drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c | 2 +- drivers/gpu/drm/amd/amdgpu/amdgpu_job.c | 5 ++-- drivers/gpu/drm/amd/amdgpu/amdgpu_job.h | 19 +++++++++++++- drivers/gpu/drm/amd/amdgpu/amdgpu_jpeg.c | 3 ++- drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 3 ++- drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 28 +++++++++++++-------- drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h | 3 ++- drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c | 3 ++- drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c | 5 ++-- drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c | 8 +++--- drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 6 +++-- drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h | 2 +- drivers/gpu/drm/amd/amdgpu/amdgpu_vm_cpu.c | 4 ++- drivers/gpu/drm/amd/amdgpu/amdgpu_vm_pt.c | 4 ++- drivers/gpu/drm/amd/amdgpu/amdgpu_vm_sdma.c | 12 +++++---- drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c | 6 +++-- drivers/gpu/drm/amd/amdgpu/uvd_v7_0.c | 6 +++-- drivers/gpu/drm/amd/amdkfd/kfd_migrate.c | 3 ++- 19 files changed, 84 insertions(+), 41 deletions(-) diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c b/drivers/gpu/drm/amd/= amdgpu/amdgpu_gfx.c index 3d24f9cd750a..29c927f4d6df 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c @@ -1549,7 +1549,8 @@ static int amdgpu_gfx_run_cleaner_shader_job(struct a= mdgpu_ring *ring) owner =3D (void *)(unsigned long)atomic_inc_return(&counter); =20 r =3D amdgpu_job_alloc_with_ib(ring->adev, &entity, owner, - 64, 0, &job); + 64, 0, &job, + AMDGPU_KERNEL_JOB_ID_CLEANER_SHADER); if (r) goto err; =20 diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c b/drivers/gpu/drm/amd/= amdgpu/amdgpu_gmc.c index 97b562a79ea8..9dcf51991b5b 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c @@ -690,7 +690,7 @@ void amdgpu_gmc_flush_gpu_tlb(struct amdgpu_device *ade= v, uint32_t vmid, r =3D amdgpu_job_alloc_with_ib(ring->adev, &adev->mman.high_pr, AMDGPU_FENCE_OWNER_UNDEFINED, 16 * 4, AMDGPU_IB_POOL_IMMEDIATE, - &job); + &job, AMDGPU_KERNEL_JOB_ID_FLUSH_GPU_TLB); if (r) goto error_alloc; =20 diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_job.c b/drivers/gpu/drm/amd/= amdgpu/amdgpu_job.c index 55c7e104d5ca..3457bd649623 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_job.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_job.c @@ -234,11 +234,12 @@ int amdgpu_job_alloc(struct amdgpu_device *adev, stru= ct amdgpu_vm *vm, int amdgpu_job_alloc_with_ib(struct amdgpu_device *adev, struct drm_sched_entity *entity, void *owner, size_t size, enum amdgpu_ib_pool_type pool_type, - struct amdgpu_job **job) + struct amdgpu_job **job, u64 k_job_id) { int r; =20 - r =3D amdgpu_job_alloc(adev, NULL, entity, owner, 1, job, 0); + r =3D amdgpu_job_alloc(adev, NULL, entity, owner, 1, job, + k_job_id); if (r) return r; =20 diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_job.h b/drivers/gpu/drm/amd/= amdgpu/amdgpu_job.h index d25f1fcf0242..7abf069d17d4 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_job.h +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_job.h @@ -44,6 +44,22 @@ struct amdgpu_fence; enum amdgpu_ib_pool_type; =20 +/* Internal kernel job ids. (decreasing values, starting from U64_MAX). */ +#define AMDGPU_KERNEL_JOB_ID_VM_UPDATE (18446744073709551615U= LL) +#define AMDGPU_KERNEL_JOB_ID_VM_UPDATE_PDES (18446744073709551614U= LL) +#define AMDGPU_KERNEL_JOB_ID_VM_UPDATE_RANGE (18446744073709551613U= LL) +#define AMDGPU_KERNEL_JOB_ID_VM_PT_CLEAR (18446744073709551612U= LL) +#define AMDGPU_KERNEL_JOB_ID_TTM_MAP_BUFFER (18446744073709551611U= LL) +#define AMDGPU_KERNEL_JOB_ID_TTM_ACCESS_MEMORY_SDMA (18446744073709551610U= LL) +#define AMDGPU_KERNEL_JOB_ID_TTM_COPY_BUFFER (18446744073709551609U= LL) +#define AMDGPU_KERNEL_JOB_ID_CLEAR_ON_RELEASE (18446744073709551608U= LL) +#define AMDGPU_KERNEL_JOB_ID_MOVE_BLIT (18446744073709551607U= LL) +#define AMDGPU_KERNEL_JOB_ID_TTM_CLEAR_BUFFER (18446744073709551606U= LL) +#define AMDGPU_KERNEL_JOB_ID_CLEANER_SHADER (18446744073709551605U= LL) +#define AMDGPU_KERNEL_JOB_ID_FLUSH_GPU_TLB (18446744073709551604U= LL) +#define AMDGPU_KERNEL_JOB_ID_KFD_GART_MAP (18446744073709551603U= LL) +#define AMDGPU_KERNEL_JOB_ID_VCN_RING_TEST (18446744073709551602U= LL) + struct amdgpu_job { struct drm_sched_job base; struct amdgpu_vm *vm; @@ -97,7 +113,8 @@ int amdgpu_job_alloc(struct amdgpu_device *adev, struct = amdgpu_vm *vm, int amdgpu_job_alloc_with_ib(struct amdgpu_device *adev, struct drm_sched_entity *entity, void *owner, size_t size, enum amdgpu_ib_pool_type pool_type, - struct amdgpu_job **job); + struct amdgpu_job **job, + u64 k_job_id); void amdgpu_job_set_resources(struct amdgpu_job *job, struct amdgpu_bo *gd= s, struct amdgpu_bo *gws, struct amdgpu_bo *oa); void amdgpu_job_free_resources(struct amdgpu_job *job); diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_jpeg.c b/drivers/gpu/drm/amd= /amdgpu/amdgpu_jpeg.c index 91678621f1ff..63ee6ba6a931 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_jpeg.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_jpeg.c @@ -196,7 +196,8 @@ static int amdgpu_jpeg_dec_set_reg(struct amdgpu_ring *= ring, uint32_t handle, int i, r; =20 r =3D amdgpu_job_alloc_with_ib(ring->adev, NULL, NULL, ib_size_dw * 4, - AMDGPU_IB_POOL_DIRECT, &job); + AMDGPU_IB_POOL_DIRECT, &job, + AMDGPU_KERNEL_JOB_ID_VCN_RING_TEST); if (r) return r; =20 diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c b/drivers/gpu/drm/a= md/amdgpu/amdgpu_object.c index fe486988a738..e08f58de4b17 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c @@ -1321,7 +1321,8 @@ void amdgpu_bo_release_notify(struct ttm_buffer_objec= t *bo) if (r) goto out; =20 - r =3D amdgpu_fill_buffer(abo, 0, &bo->base._resv, &fence, true); + r =3D amdgpu_fill_buffer(abo, 0, &bo->base._resv, &fence, true, + AMDGPU_KERNEL_JOB_ID_CLEAR_ON_RELEASE); if (WARN_ON(r)) goto out; =20 diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c b/drivers/gpu/drm/amd/= amdgpu/amdgpu_ttm.c index e226c3aff7d7..326476089db3 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c @@ -227,7 +227,8 @@ static int amdgpu_ttm_map_buffer(struct ttm_buffer_obje= ct *bo, r =3D amdgpu_job_alloc_with_ib(adev, &adev->mman.high_pr, AMDGPU_FENCE_OWNER_UNDEFINED, num_dw * 4 + num_bytes, - AMDGPU_IB_POOL_DELAYED, &job); + AMDGPU_IB_POOL_DELAYED, &job, + AMDGPU_KERNEL_JOB_ID_TTM_MAP_BUFFER); if (r) return r; =20 @@ -406,7 +407,7 @@ static int amdgpu_move_blit(struct ttm_buffer_object *b= o, struct dma_fence *wipe_fence =3D NULL; =20 r =3D amdgpu_fill_buffer(abo, 0, NULL, &wipe_fence, - false); + false, AMDGPU_KERNEL_JOB_ID_MOVE_BLIT); if (r) { goto error; } else if (wipe_fence) { @@ -1488,7 +1489,8 @@ static int amdgpu_ttm_access_memory_sdma(struct ttm_b= uffer_object *bo, r =3D amdgpu_job_alloc_with_ib(adev, &adev->mman.high_pr, AMDGPU_FENCE_OWNER_UNDEFINED, num_dw * 4, AMDGPU_IB_POOL_DELAYED, - &job); + &job, + AMDGPU_KERNEL_JOB_ID_TTM_ACCESS_MEMORY_SDMA); if (r) goto out; =20 @@ -2212,7 +2214,7 @@ static int amdgpu_ttm_prepare_job(struct amdgpu_devic= e *adev, struct dma_resv *resv, bool vm_needs_flush, struct amdgpu_job **job, - bool delayed) + bool delayed, u64 k_job_id) { enum amdgpu_ib_pool_type pool =3D direct_submit ? AMDGPU_IB_POOL_DIRECT : @@ -2222,7 +2224,7 @@ static int amdgpu_ttm_prepare_job(struct amdgpu_devic= e *adev, &adev->mman.high_pr; r =3D amdgpu_job_alloc_with_ib(adev, entity, AMDGPU_FENCE_OWNER_UNDEFINED, - num_dw * 4, pool, job); + num_dw * 4, pool, job, k_job_id); if (r) return r; =20 @@ -2262,7 +2264,8 @@ int amdgpu_copy_buffer(struct amdgpu_ring *ring, uint= 64_t src_offset, num_loops =3D DIV_ROUND_UP(byte_count, max_bytes); num_dw =3D ALIGN(num_loops * adev->mman.buffer_funcs->copy_num_dw, 8); r =3D amdgpu_ttm_prepare_job(adev, direct_submit, num_dw, - resv, vm_needs_flush, &job, false); + resv, vm_needs_flush, &job, false, + AMDGPU_KERNEL_JOB_ID_TTM_COPY_BUFFER); if (r) return r; =20 @@ -2297,7 +2300,8 @@ static int amdgpu_ttm_fill_mem(struct amdgpu_ring *ri= ng, uint32_t src_data, uint64_t dst_addr, uint32_t byte_count, struct dma_resv *resv, struct dma_fence **fence, - bool vm_needs_flush, bool delayed) + bool vm_needs_flush, bool delayed, + u64 k_job_id) { struct amdgpu_device *adev =3D ring->adev; unsigned int num_loops, num_dw; @@ -2310,7 +2314,7 @@ static int amdgpu_ttm_fill_mem(struct amdgpu_ring *ri= ng, uint32_t src_data, num_loops =3D DIV_ROUND_UP_ULL(byte_count, max_bytes); num_dw =3D ALIGN(num_loops * adev->mman.buffer_funcs->fill_num_dw, 8); r =3D amdgpu_ttm_prepare_job(adev, false, num_dw, resv, vm_needs_flush, - &job, delayed); + &job, delayed, k_job_id); if (r) return r; =20 @@ -2380,7 +2384,8 @@ int amdgpu_ttm_clear_buffer(struct amdgpu_bo *bo, goto err; =20 r =3D amdgpu_ttm_fill_mem(ring, 0, addr, size, resv, - &next, true, true); + &next, true, true, + AMDGPU_KERNEL_JOB_ID_TTM_CLEAR_BUFFER); if (r) goto err; =20 @@ -2399,7 +2404,8 @@ int amdgpu_fill_buffer(struct amdgpu_bo *bo, uint32_t src_data, struct dma_resv *resv, struct dma_fence **f, - bool delayed) + bool delayed, + u64 k_job_id) { struct amdgpu_device *adev =3D amdgpu_ttm_adev(bo->tbo.bdev); struct amdgpu_ring *ring =3D adev->mman.buffer_funcs_ring; @@ -2429,7 +2435,7 @@ int amdgpu_fill_buffer(struct amdgpu_bo *bo, goto error; =20 r =3D amdgpu_ttm_fill_mem(ring, src_data, to, cur_size, resv, - &next, true, delayed); + &next, true, delayed, k_job_id); if (r) goto error; =20 diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h b/drivers/gpu/drm/amd/= amdgpu/amdgpu_ttm.h index 054d48823d5f..577ee04ce0bf 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h @@ -175,7 +175,8 @@ int amdgpu_fill_buffer(struct amdgpu_bo *bo, uint32_t src_data, struct dma_resv *resv, struct dma_fence **fence, - bool delayed); + bool delayed, + u64 k_job_id); =20 int amdgpu_ttm_alloc_gart(struct ttm_buffer_object *bo); void amdgpu_ttm_recover_gart(struct ttm_buffer_object *tbo); diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c b/drivers/gpu/drm/amd/= amdgpu/amdgpu_uvd.c index 74758b5ffc6c..5c38f0d30c87 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c @@ -1136,7 +1136,8 @@ static int amdgpu_uvd_send_msg(struct amdgpu_ring *ri= ng, struct amdgpu_bo *bo, r =3D amdgpu_job_alloc_with_ib(ring->adev, &adev->uvd.entity, AMDGPU_FENCE_OWNER_UNDEFINED, 64, direct ? AMDGPU_IB_POOL_DIRECT : - AMDGPU_IB_POOL_DELAYED, &job); + AMDGPU_IB_POOL_DELAYED, &job, + AMDGPU_KERNEL_JOB_ID_VCN_RING_TEST); if (r) return r; =20 diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c b/drivers/gpu/drm/amd/= amdgpu/amdgpu_vce.c index b9060bcd4806..ce318f5de047 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c @@ -449,7 +449,7 @@ static int amdgpu_vce_get_create_msg(struct amdgpu_ring= *ring, uint32_t handle, r =3D amdgpu_job_alloc_with_ib(ring->adev, &ring->adev->vce.entity, AMDGPU_FENCE_OWNER_UNDEFINED, ib_size_dw * 4, AMDGPU_IB_POOL_DIRECT, - &job); + &job, AMDGPU_KERNEL_JOB_ID_VCN_RING_TEST); if (r) return r; =20 @@ -540,7 +540,8 @@ static int amdgpu_vce_get_destroy_msg(struct amdgpu_rin= g *ring, uint32_t handle, AMDGPU_FENCE_OWNER_UNDEFINED, ib_size_dw * 4, direct ? AMDGPU_IB_POOL_DIRECT : - AMDGPU_IB_POOL_DELAYED, &job); + AMDGPU_IB_POOL_DELAYED, &job, + AMDGPU_KERNEL_JOB_ID_VCN_RING_TEST); if (r) return r; =20 diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c b/drivers/gpu/drm/amd/= amdgpu/amdgpu_vcn.c index 5ae7cc0d5f57..5e0786ea911b 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c @@ -626,7 +626,7 @@ static int amdgpu_vcn_dec_send_msg(struct amdgpu_ring *= ring, =20 r =3D amdgpu_job_alloc_with_ib(ring->adev, NULL, NULL, 64, AMDGPU_IB_POOL_DIRECT, - &job); + &job, AMDGPU_KERNEL_JOB_ID_VCN_RING_TEST); if (r) goto err; =20 @@ -806,7 +806,7 @@ static int amdgpu_vcn_dec_sw_send_msg(struct amdgpu_rin= g *ring, =20 r =3D amdgpu_job_alloc_with_ib(ring->adev, NULL, NULL, ib_size_dw * 4, AMDGPU_IB_POOL_DIRECT, - &job); + &job, AMDGPU_KERNEL_JOB_ID_VCN_RING_TEST); if (r) goto err; =20 @@ -936,7 +936,7 @@ static int amdgpu_vcn_enc_get_create_msg(struct amdgpu_= ring *ring, uint32_t hand =20 r =3D amdgpu_job_alloc_with_ib(ring->adev, NULL, NULL, ib_size_dw * 4, AMDGPU_IB_POOL_DIRECT, - &job); + &job, AMDGPU_KERNEL_JOB_ID_VCN_RING_TEST); if (r) return r; =20 @@ -1003,7 +1003,7 @@ static int amdgpu_vcn_enc_get_destroy_msg(struct amdg= pu_ring *ring, uint32_t han =20 r =3D amdgpu_job_alloc_with_ib(ring->adev, NULL, NULL, ib_size_dw * 4, AMDGPU_IB_POOL_DIRECT, - &job); + &job, AMDGPU_KERNEL_JOB_ID_VCN_RING_TEST); if (r) return r; =20 diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c b/drivers/gpu/drm/amd/a= mdgpu/amdgpu_vm.c index db66b4232de0..2f8e83f840a8 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c @@ -983,7 +983,8 @@ int amdgpu_vm_update_pdes(struct amdgpu_device *adev, params.vm =3D vm; params.immediate =3D immediate; =20 - r =3D vm->update_funcs->prepare(¶ms, NULL); + r =3D vm->update_funcs->prepare(¶ms, NULL, + AMDGPU_KERNEL_JOB_ID_VM_UPDATE_PDES); if (r) goto error; =20 @@ -1152,7 +1153,8 @@ int amdgpu_vm_update_range(struct amdgpu_device *adev= , struct amdgpu_vm *vm, dma_fence_put(tmp); } =20 - r =3D vm->update_funcs->prepare(¶ms, sync); + r =3D vm->update_funcs->prepare(¶ms, sync, + AMDGPU_KERNEL_JOB_ID_VM_UPDATE_RANGE); if (r) goto error_free; =20 diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h b/drivers/gpu/drm/amd/a= mdgpu/amdgpu_vm.h index 77207f4e448e..cf0ec94e8a07 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h @@ -308,7 +308,7 @@ struct amdgpu_vm_update_params { struct amdgpu_vm_update_funcs { int (*map_table)(struct amdgpu_bo_vm *bo); int (*prepare)(struct amdgpu_vm_update_params *p, - struct amdgpu_sync *sync); + struct amdgpu_sync *sync, u64 k_job_id); int (*update)(struct amdgpu_vm_update_params *p, struct amdgpu_bo_vm *bo, uint64_t pe, uint64_t addr, unsigned count, uint32_t incr, uint64_t flags); diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm_cpu.c b/drivers/gpu/drm/a= md/amdgpu/amdgpu_vm_cpu.c index 0c1ef5850a5e..22e2e5b47341 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm_cpu.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm_cpu.c @@ -40,12 +40,14 @@ static int amdgpu_vm_cpu_map_table(struct amdgpu_bo_vm = *table) * * @p: see amdgpu_vm_update_params definition * @sync: sync obj with fences to wait on + * @k_job_id: the id for tracing/debug purposes * * Returns: * Negativ errno, 0 for success. */ static int amdgpu_vm_cpu_prepare(struct amdgpu_vm_update_params *p, - struct amdgpu_sync *sync) + struct amdgpu_sync *sync, + u64 k_job_id) { if (!sync) return 0; diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm_pt.c b/drivers/gpu/drm/am= d/amdgpu/amdgpu_vm_pt.c index 30022123b0bf..f794fb1cc06e 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm_pt.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm_pt.c @@ -26,6 +26,7 @@ #include "amdgpu.h" #include "amdgpu_trace.h" #include "amdgpu_vm.h" +#include "amdgpu_job.h" =20 /* * amdgpu_vm_pt_cursor - state for for_each_amdgpu_vm_pt @@ -395,7 +396,8 @@ int amdgpu_vm_pt_clear(struct amdgpu_device *adev, stru= ct amdgpu_vm *vm, params.vm =3D vm; params.immediate =3D immediate; =20 - r =3D vm->update_funcs->prepare(¶ms, NULL); + r =3D vm->update_funcs->prepare(¶ms, NULL, + AMDGPU_KERNEL_JOB_ID_VM_PT_CLEAR); if (r) goto exit; =20 diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm_sdma.c b/drivers/gpu/drm/= amd/amdgpu/amdgpu_vm_sdma.c index 46d9fb433ab2..36805dcfa159 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm_sdma.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm_sdma.c @@ -40,7 +40,7 @@ static int amdgpu_vm_sdma_map_table(struct amdgpu_bo_vm *= table) =20 /* Allocate a new job for @count PTE updates */ static int amdgpu_vm_sdma_alloc_job(struct amdgpu_vm_update_params *p, - unsigned int count) + unsigned int count, u64 k_job_id) { enum amdgpu_ib_pool_type pool =3D p->immediate ? AMDGPU_IB_POOL_IMMEDIATE : AMDGPU_IB_POOL_DELAYED; @@ -56,7 +56,7 @@ static int amdgpu_vm_sdma_alloc_job(struct amdgpu_vm_upda= te_params *p, ndw =3D min(ndw, AMDGPU_VM_SDMA_MAX_NUM_DW); =20 r =3D amdgpu_job_alloc_with_ib(p->adev, entity, AMDGPU_FENCE_OWNER_VM, - ndw * 4, pool, &p->job); + ndw * 4, pool, &p->job, k_job_id); if (r) return r; =20 @@ -69,16 +69,17 @@ static int amdgpu_vm_sdma_alloc_job(struct amdgpu_vm_up= date_params *p, * * @p: see amdgpu_vm_update_params definition * @sync: amdgpu_sync object with fences to wait for + * @k_job_id: identifier of the job, for tracing purpose * * Returns: * Negativ errno, 0 for success. */ static int amdgpu_vm_sdma_prepare(struct amdgpu_vm_update_params *p, - struct amdgpu_sync *sync) + struct amdgpu_sync *sync, u64 k_job_id) { int r; =20 - r =3D amdgpu_vm_sdma_alloc_job(p, 0); + r =3D amdgpu_vm_sdma_alloc_job(p, 0, k_job_id); if (r) return r; =20 @@ -249,7 +250,8 @@ static int amdgpu_vm_sdma_update(struct amdgpu_vm_updat= e_params *p, if (r) return r; =20 - r =3D amdgpu_vm_sdma_alloc_job(p, count); + r =3D amdgpu_vm_sdma_alloc_job(p, count, + AMDGPU_KERNEL_JOB_ID_VM_UPDATE); if (r) return r; } diff --git a/drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c b/drivers/gpu/drm/amd/am= dgpu/uvd_v6_0.c index 1c07b701d0e4..ceb94bbb03a4 100644 --- a/drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c +++ b/drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c @@ -217,7 +217,8 @@ static int uvd_v6_0_enc_get_create_msg(struct amdgpu_ri= ng *ring, uint32_t handle int i, r; =20 r =3D amdgpu_job_alloc_with_ib(ring->adev, NULL, NULL, ib_size_dw * 4, - AMDGPU_IB_POOL_DIRECT, &job); + AMDGPU_IB_POOL_DIRECT, &job, + AMDGPU_KERNEL_JOB_ID_VCN_RING_TEST); if (r) return r; =20 @@ -281,7 +282,8 @@ static int uvd_v6_0_enc_get_destroy_msg(struct amdgpu_r= ing *ring, int i, r; =20 r =3D amdgpu_job_alloc_with_ib(ring->adev, NULL, NULL, ib_size_dw * 4, - AMDGPU_IB_POOL_DIRECT, &job); + AMDGPU_IB_POOL_DIRECT, &job, + AMDGPU_KERNEL_JOB_ID_VCN_RING_TEST); if (r) return r; =20 diff --git a/drivers/gpu/drm/amd/amdgpu/uvd_v7_0.c b/drivers/gpu/drm/amd/am= dgpu/uvd_v7_0.c index 9d237b5937fb..1f8866f3f63c 100644 --- a/drivers/gpu/drm/amd/amdgpu/uvd_v7_0.c +++ b/drivers/gpu/drm/amd/amdgpu/uvd_v7_0.c @@ -225,7 +225,8 @@ static int uvd_v7_0_enc_get_create_msg(struct amdgpu_ri= ng *ring, u32 handle, int i, r; =20 r =3D amdgpu_job_alloc_with_ib(ring->adev, NULL, NULL, ib_size_dw * 4, - AMDGPU_IB_POOL_DIRECT, &job); + AMDGPU_IB_POOL_DIRECT, &job, + AMDGPU_KERNEL_JOB_ID_VCN_RING_TEST); if (r) return r; =20 @@ -288,7 +289,8 @@ static int uvd_v7_0_enc_get_destroy_msg(struct amdgpu_r= ing *ring, u32 handle, int i, r; =20 r =3D amdgpu_job_alloc_with_ib(ring->adev, NULL, NULL, ib_size_dw * 4, - AMDGPU_IB_POOL_DIRECT, &job); + AMDGPU_IB_POOL_DIRECT, &job, + AMDGPU_KERNEL_JOB_ID_VCN_RING_TEST); if (r) return r; =20 diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_migrate.c b/drivers/gpu/drm/amd= /amdkfd/kfd_migrate.c index 3653c563ee9a..46c84fc60af1 100644 --- a/drivers/gpu/drm/amd/amdkfd/kfd_migrate.c +++ b/drivers/gpu/drm/amd/amdkfd/kfd_migrate.c @@ -67,7 +67,8 @@ svm_migrate_gart_map(struct amdgpu_ring *ring, u64 npages, AMDGPU_FENCE_OWNER_UNDEFINED, num_dw * 4 + num_bytes, AMDGPU_IB_POOL_DELAYED, - &job); + &job, + AMDGPU_KERNEL_JOB_ID_KFD_GART_MAP); if (r) return r; =20 --=20 2.43.0 From nobody Sat Feb 7 20:28:07 2026 Received: from CH5PR02CU005.outbound.protection.outlook.com (mail-northcentralusazon11012046.outbound.protection.outlook.com [40.107.200.46]) (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 7F7D035581D; Thu, 13 Nov 2025 16:07:55 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.200.46 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763050077; cv=fail; b=dxHEc6oHUJUBLG8R0mIWb82vLtuPCLuICQT2pbMrclNBHX2aVPwbAnPssEvxuqNUYh6IiMS0h4XwBXyKham1f6Jxap8BETJhhpL/B9ePBWj1LFjuUJ/pSC6qn8A/hpSml6+k0t0GrO3UzNu8iw15tya8LnUqPKl4DYl2JOr8R6o= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763050077; c=relaxed/simple; bh=IcKXags6MaKVmD7qKjdohwnL0OeJovSflNcqCQZ0Ofs=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=PXRS8J9UD/r0jNs4Obvbh0bzhZsamP4jfIOK3gFKMcWBOxth8MqAJKqLqqTIXrkzIXeE8tt4jvHDo6QfTUw8z+9jsAUX4bBzMNfCSaAGPEncHcLaeItJ2qrLjFHRByW1PA6JJB/R7pUO5IdYci2kzDhorGz2oOL4Duo4aw07sqo= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amd.com; spf=fail smtp.mailfrom=amd.com; dkim=pass (1024-bit key) header.d=amd.com header.i=@amd.com header.b=19Da1SKB; arc=fail smtp.client-ip=40.107.200.46 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amd.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=amd.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=amd.com header.i=@amd.com header.b="19Da1SKB" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=w4vWYByzNqH5bXIl1xL/SKiROVeZkcZzuyhoFJ/rVRkGPiFDLWiIeXATMRPwVngz6oney/TV1VJxct3WKlYx4VKVrJ6Bx+6PgF7so2PIB+Q5e3jcMWyueH6GfvGxaYTzYsWd9CEGAm1Utc9+djMyp4R2Yb0ksaPi4sjb3jZlrwlws7pp41K1Y+nyd8HtURg2eBVJfR9IYUsdFLlAHf7RkE0jal/uODDzxzdQxvuz+ghMLEXuwjXHcce535ExXnYVsq2CIBMOpOleffEXpIWcd+mWRFYDgLbBoidjhTWCfdGm1p0S5GNEBI9dEZRbtK7me1hI/TDRh3TZzjttjnX9EQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=Arn16Y64G9OzYaohJ9Lt4oZuQ32f64L5Ev6u3A4/Uhk=; b=acG6dzeKrbNSQin8K+y2m4XY0P2IXdeD0qP7cjtt49pHd0eX4ZujmutSOK0ceYemzMMIiq4eLa3Sis+xilQpwi9i2xhyvIWfS6BFTlv46M3s8btBC9ICiDwzzjQ5+3UZ+bonjBbh/DtObcNV3wi4i+z+S4eUiw2ZPS54yAE1Wf4dvyBwwxUmsL0vgqpwohsn/uY54qJh0I1QlOwJ3Uj6vrdrktBcRV7oWBAmgiKG97N2TW6wi8Xu3PP71oDvRpmcqfKUdHV231yfJLf6ZVRvERtLOcYBFaSr3QDhc/CO7ueN8wyD1ZFvnV4SgUJnvU6LuCj5RfmJknTnYfYsD1d/cw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=gmail.com smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=Arn16Y64G9OzYaohJ9Lt4oZuQ32f64L5Ev6u3A4/Uhk=; b=19Da1SKBbN7GO09ILqZbKSZQS3K0mWqU/0OBWRHjzmJrNuS2sfM5icCSH13gayZs8tC/KMmDvgh+2E3hIAPV3k14CwTuI89rXVSvP286A3ROuVWaM0mQpY2MC9oU1lnG/fs52fXyDBtUPUxKQ5tzP4H6SRT3OX/sEMWmxU0MYDk= Received: from CH2PR11CA0007.namprd11.prod.outlook.com (2603:10b6:610:54::17) by CH2PR12MB4279.namprd12.prod.outlook.com (2603:10b6:610:af::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9320.17; Thu, 13 Nov 2025 16:07:49 +0000 Received: from CH1PEPF0000A349.namprd04.prod.outlook.com (2603:10b6:610:54:cafe::ec) by CH2PR11CA0007.outlook.office365.com (2603:10b6:610:54::17) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.9320.17 via Frontend Transport; Thu, 13 Nov 2025 16:07:40 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=satlexmb07.amd.com; pr=C Received: from satlexmb07.amd.com (165.204.84.17) by CH1PEPF0000A349.mail.protection.outlook.com (10.167.244.9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9320.13 via Frontend Transport; Thu, 13 Nov 2025 16:07:49 +0000 Received: from FRAPPELLOUX01-WSLPUB.amd.com (10.180.168.240) by satlexmb07.amd.com (10.181.42.216) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.2562.17; Thu, 13 Nov 2025 08:07:46 -0800 From: Pierre-Eric Pelloux-Prayer To: Alex Deucher , =?UTF-8?q?Christian=20K=C3=B6nig?= , David Airlie , Simona Vetter , Huang Rui , Matthew Auld , Matthew Brost , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , Sumit Semwal CC: Pierre-Eric Pelloux-Prayer , , , , , Subject: [PATCH v2 02/20] drm/ttm: rework pipelined eviction fence handling Date: Thu, 13 Nov 2025 17:05:43 +0100 Message-ID: <20251113160632.5889-3-pierre-eric.pelloux-prayer@amd.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20251113160632.5889-1-pierre-eric.pelloux-prayer@amd.com> References: <20251113160632.5889-1-pierre-eric.pelloux-prayer@amd.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-ClientProxiedBy: satlexmb07.amd.com (10.181.42.216) To satlexmb07.amd.com (10.181.42.216) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CH1PEPF0000A349:EE_|CH2PR12MB4279:EE_ X-MS-Office365-Filtering-Correlation-Id: 5d985290-40e5-40b2-f0cc-08de22cecaef X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|376014|7416014|82310400026|36860700013|921020; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?RMYPJPORhVubULN76edpdRSH6rbAEjG+SieIQ6urIJueGJaHaZaxnvEJBMaM?= =?us-ascii?Q?h2uReA/LUMwdu/55e0wIvr0Axy1f4INO4CmNq9fyMTVFQsmpDwfUNP7oOUgd?= =?us-ascii?Q?2J4FOCED7fmO/f2Mz2TR4TiU1G3LTQTSFUpOJs/tdIpHjMpVrL42RnwM8R56?= =?us-ascii?Q?zchRk7hu0FCzUPBi/yW1vgsWnTR7t366vGz8h0pxRl4VMp8wuPwitCuizYeP?= =?us-ascii?Q?aBI/Kz7+8J4ZfCFye5oPWW67+8T1lSVIOWAuX6Sd2o1HhL7AxMiLtPXjoyEI?= =?us-ascii?Q?76PjLvcMNAz2ToZ3jnPFKtxfV0sCGjdMnlvfdjNVeCzfcQpdllsogafU/kV0?= =?us-ascii?Q?t4Ny/fDCKK+mcbO29ndFVFG0hADQHVJpRLh+e/U06LvnBRvhQKrKZHVw+wIu?= =?us-ascii?Q?B0HmQ9JnYc4TGSb3xsIuIg2nliLZhWYbm/HFr4WGgNLGT3Jmq46tNI5BhurL?= =?us-ascii?Q?9MZqpvXVpnJNE7gO4eRQqQMdG84KzNvGASOn+H4bANGmC8fp996wnmHnMFh4?= =?us-ascii?Q?hsEfC8TI++/w59Z+z1TrAlYDv6VPqsso4D94JpVn65gA6zUYlfLZ2yfWeJs7?= =?us-ascii?Q?r0kb2j6V8hcXYfNOjyFJ0G8r/qssWSnkFEOqaeVztnUK5hqJi94fRsfBP2lG?= =?us-ascii?Q?IIzCjfKs3FCA8RWS8XsR69XAjmHyp6v74+XMKsN4FL7kQWUGTd2yMAAgp9+I?= =?us-ascii?Q?6XquSUuuS/9SWUjK8PW1dFGC91MOV9XEuTl/co+HBUGffxpgewRtbgOca6/J?= =?us-ascii?Q?hBDqjfJkNlO1XfQ+U/5nPtBF6F4+boRemJQ5/fKD1bjxnOV8E9kQE8rR2lwC?= =?us-ascii?Q?9H1diO9L0P08lcyU+EXHtgTjuxKoFLEKdhUHFCOgN2y0XYC221v/+vZYQuJP?= =?us-ascii?Q?gmhmo8UBx7Txul+eUi4IP9YejTs00/YnYIFieRDCBz1LhZ7xRlYZdzdNPE6+?= =?us-ascii?Q?YGQ3Ltx0O9lgo+7muNNfbVkcSIuyCoxqhotht7yPgN0svP+/gvBhEC+N27NO?= =?us-ascii?Q?gFINuTfcI+9RvfuVaGUGn//Smq5u+BE4u4yO1q6/zR6d+9uQfNXqDy1ODHIc?= =?us-ascii?Q?eECQMWlUz6HuXDe3Ro4NP3wv5xsYFHOeYpKVYiwIII1qrjiEDHTzejs6LWGR?= =?us-ascii?Q?W6jTfnvQ/dLnmZjcOQB8+kfxis6CY3XVyBy1oOqin2ZSftvOFnR2QFGfy5pM?= =?us-ascii?Q?f76cvW8pOUzztvy3WM83g1U/ofq4OGLhC6lbfvcaqLvsEgjanMLq60qVJjZ5?= =?us-ascii?Q?kLFegxhmRKzoDmTAy+iIrV21PU/JPdig4Hx6zHhSclBgA/Ca1Ae7G3iILwgg?= =?us-ascii?Q?ELHjInCKvqco/un86kFQzA3QMKOP7TnaorBsGCgvEUvs47Llb5dvFv4yI3R0?= =?us-ascii?Q?RoLfDEDTxjAN+3jIcIcTFVvlUP2jzgc5ocXuTWHgAMCvPof1OSnWIZIKf9/5?= =?us-ascii?Q?TbOQ16c58bdScMYV4Qh2PiTJqe3plcwE1Uwb3K+lPlUv5qZGseXqvwlCRK8h?= =?us-ascii?Q?PRw9RO7iZI3rbqtNBkD7gjVg8aWonqkJRGFTbd9tLXUG6GICjeOwi/fNsqMw?= =?us-ascii?Q?zNSvL16ChF64UOnbfYWgXpCBFOtsAcQhfBy0BvAp?= X-Forefront-Antispam-Report: CIP:165.204.84.17;CTRY:US;LANG:en;SCL:1;SRV:;IPV:CAL;SFV:NSPM;H:satlexmb07.amd.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230040)(1800799024)(376014)(7416014)(82310400026)(36860700013)(921020);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Nov 2025 16:07:49.5986 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 5d985290-40e5-40b2-f0cc-08de22cecaef X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d;Ip=[165.204.84.17];Helo=[satlexmb07.amd.com] X-MS-Exchange-CrossTenant-AuthSource: CH1PEPF0000A349.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH2PR12MB4279 Content-Type: text/plain; charset="utf-8" Until now ttm stored a single pipelined eviction fence which means drivers had to use a single entity for these evictions. To lift this requirement, this commit allows up to 8 entities to be used. Ideally a dma_resv object would have been used as a container of the eviction fences, but the locking rules makes it complex. dma_resv all have the same ww_class, which means "Attempting to lock more mutexes after ww_acquire_done." is an error. One alternative considered was to introduced a 2nd ww_class for specific resv to hold a single "transient" lock (=3D the resv lock would only be held for a short period, without taking any other locks). The other option, is to statically reserve a fence array, and extend the existing code to deal with N fences, instead of 1. The driver is still responsible to reserve the correct number of fence slots. --- v2: - simplified code - dropped n_fences - name changes --- Signed-off-by: Pierre-Eric Pelloux-Prayer --- drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 8 ++-- .../gpu/drm/ttm/tests/ttm_bo_validate_test.c | 11 +++-- drivers/gpu/drm/ttm/tests/ttm_resource_test.c | 5 +- drivers/gpu/drm/ttm/ttm_bo.c | 47 ++++++++++--------- drivers/gpu/drm/ttm/ttm_bo_util.c | 38 ++++++++++++--- drivers/gpu/drm/ttm/ttm_resource.c | 31 +++++++----- include/drm/ttm/ttm_resource.h | 29 ++++++++---- 7 files changed, 109 insertions(+), 60 deletions(-) diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c b/drivers/gpu/drm/amd/= amdgpu/amdgpu_ttm.c index 326476089db3..3b46a24a8c48 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c @@ -2156,7 +2156,7 @@ void amdgpu_ttm_set_buffer_funcs_status(struct amdgpu= _device *adev, bool enable) { struct ttm_resource_manager *man =3D ttm_manager_type(&adev->mman.bdev, T= TM_PL_VRAM); uint64_t size; - int r; + int r, i; =20 if (!adev->mman.initialized || amdgpu_in_reset(adev) || adev->mman.buffer_funcs_enabled =3D=3D enable || adev->gmc.is_app_apu) @@ -2190,8 +2190,10 @@ void amdgpu_ttm_set_buffer_funcs_status(struct amdgp= u_device *adev, bool enable) } else { drm_sched_entity_destroy(&adev->mman.high_pr); drm_sched_entity_destroy(&adev->mman.low_pr); - dma_fence_put(man->move); - man->move =3D NULL; + for (i =3D 0; i < TTM_NUM_MOVE_FENCES; i++) { + dma_fence_put(man->eviction_fences[i]); + man->eviction_fences[i] =3D NULL; + } } =20 /* this just adjusts TTM size idea, which sets lpfn to the correct value = */ diff --git a/drivers/gpu/drm/ttm/tests/ttm_bo_validate_test.c b/drivers/gpu= /drm/ttm/tests/ttm_bo_validate_test.c index 3148f5d3dbd6..8f71906c4238 100644 --- a/drivers/gpu/drm/ttm/tests/ttm_bo_validate_test.c +++ b/drivers/gpu/drm/ttm/tests/ttm_bo_validate_test.c @@ -651,7 +651,7 @@ static void ttm_bo_validate_move_fence_signaled(struct = kunit *test) int err; =20 man =3D ttm_manager_type(priv->ttm_dev, mem_type); - man->move =3D dma_fence_get_stub(); + man->eviction_fences[0] =3D dma_fence_get_stub(); =20 bo =3D ttm_bo_kunit_init(test, test->priv, size, NULL); bo->type =3D bo_type; @@ -668,7 +668,7 @@ static void ttm_bo_validate_move_fence_signaled(struct = kunit *test) KUNIT_EXPECT_EQ(test, ctx.bytes_moved, size); =20 ttm_bo_put(bo); - dma_fence_put(man->move); + dma_fence_put(man->eviction_fences[0]); } =20 static const struct ttm_bo_validate_test_case ttm_bo_validate_wait_cases[]= =3D { @@ -732,9 +732,9 @@ static void ttm_bo_validate_move_fence_not_signaled(str= uct kunit *test) =20 spin_lock_init(&fence_lock); man =3D ttm_manager_type(priv->ttm_dev, fst_mem); - man->move =3D alloc_mock_fence(test); + man->eviction_fences[0] =3D alloc_mock_fence(test); =20 - task =3D kthread_create(threaded_fence_signal, man->move, "move-fence-sig= nal"); + task =3D kthread_create(threaded_fence_signal, man->eviction_fences[0], "= move-fence-signal"); if (IS_ERR(task)) KUNIT_FAIL(test, "Couldn't create move fence signal task\n"); =20 @@ -742,7 +742,8 @@ static void ttm_bo_validate_move_fence_not_signaled(str= uct kunit *test) err =3D ttm_bo_validate(bo, placement_val, &ctx_val); dma_resv_unlock(bo->base.resv); =20 - dma_fence_wait_timeout(man->move, false, MAX_SCHEDULE_TIMEOUT); + dma_fence_wait_timeout(man->eviction_fences[0], false, MAX_SCHEDULE_TIMEO= UT); + man->eviction_fences[0] =3D NULL; =20 KUNIT_EXPECT_EQ(test, err, 0); KUNIT_EXPECT_EQ(test, ctx_val.bytes_moved, size); diff --git a/drivers/gpu/drm/ttm/tests/ttm_resource_test.c b/drivers/gpu/dr= m/ttm/tests/ttm_resource_test.c index e6ea2bd01f07..c0e4e35e0442 100644 --- a/drivers/gpu/drm/ttm/tests/ttm_resource_test.c +++ b/drivers/gpu/drm/ttm/tests/ttm_resource_test.c @@ -207,6 +207,7 @@ static void ttm_resource_manager_init_basic(struct kuni= t *test) struct ttm_resource_test_priv *priv =3D test->priv; struct ttm_resource_manager *man; size_t size =3D SZ_16K; + int i; =20 man =3D kunit_kzalloc(test, sizeof(*man), GFP_KERNEL); KUNIT_ASSERT_NOT_NULL(test, man); @@ -216,8 +217,8 @@ static void ttm_resource_manager_init_basic(struct kuni= t *test) KUNIT_ASSERT_PTR_EQ(test, man->bdev, priv->devs->ttm_dev); KUNIT_ASSERT_EQ(test, man->size, size); KUNIT_ASSERT_EQ(test, man->usage, 0); - KUNIT_ASSERT_NULL(test, man->move); - KUNIT_ASSERT_NOT_NULL(test, &man->move_lock); + for (i =3D 0; i < TTM_NUM_MOVE_FENCES; i++) + KUNIT_ASSERT_NULL(test, man->eviction_fences[i]); =20 for (int i =3D 0; i < TTM_MAX_BO_PRIORITY; ++i) KUNIT_ASSERT_TRUE(test, list_empty(&man->lru[i])); diff --git a/drivers/gpu/drm/ttm/ttm_bo.c b/drivers/gpu/drm/ttm/ttm_bo.c index f4d9e68b21e7..0b3732ed6f6c 100644 --- a/drivers/gpu/drm/ttm/ttm_bo.c +++ b/drivers/gpu/drm/ttm/ttm_bo.c @@ -658,34 +658,35 @@ void ttm_bo_unpin(struct ttm_buffer_object *bo) EXPORT_SYMBOL(ttm_bo_unpin); =20 /* - * Add the last move fence to the BO as kernel dependency and reserve a new - * fence slot. + * Add the pipelined eviction fencesto the BO as kernel dependency and res= erve new + * fence slots. */ -static int ttm_bo_add_move_fence(struct ttm_buffer_object *bo, - struct ttm_resource_manager *man, - bool no_wait_gpu) +static int ttm_bo_add_pipelined_eviction_fences(struct ttm_buffer_object *= bo, + struct ttm_resource_manager *man, + bool no_wait_gpu) { struct dma_fence *fence; - int ret; + int i; =20 - spin_lock(&man->move_lock); - fence =3D dma_fence_get(man->move); - spin_unlock(&man->move_lock); + spin_lock(&man->eviction_lock); + for (i =3D 0; i < TTM_NUM_MOVE_FENCES; i++) { + fence =3D man->eviction_fences[i]; + if (!fence) + continue; =20 - if (!fence) - return 0; - - if (no_wait_gpu) { - ret =3D dma_fence_is_signaled(fence) ? 0 : -EBUSY; - dma_fence_put(fence); - return ret; + if (no_wait_gpu) { + if (!dma_fence_is_signaled(fence)) { + spin_unlock(&man->eviction_lock); + return -EBUSY; + } + } else { + dma_resv_add_fence(bo->base.resv, fence, DMA_RESV_USAGE_KERNEL); + } } + spin_unlock(&man->eviction_lock); =20 - dma_resv_add_fence(bo->base.resv, fence, DMA_RESV_USAGE_KERNEL); - - ret =3D dma_resv_reserve_fences(bo->base.resv, 1); - dma_fence_put(fence); - return ret; + /* TODO: this call should be removed. */ + return dma_resv_reserve_fences(bo->base.resv, 1); } =20 /** @@ -718,7 +719,7 @@ static int ttm_bo_alloc_resource(struct ttm_buffer_obje= ct *bo, int i, ret; =20 ticket =3D dma_resv_locking_ctx(bo->base.resv); - ret =3D dma_resv_reserve_fences(bo->base.resv, 1); + ret =3D dma_resv_reserve_fences(bo->base.resv, TTM_NUM_MOVE_FENCES); if (unlikely(ret)) return ret; =20 @@ -757,7 +758,7 @@ static int ttm_bo_alloc_resource(struct ttm_buffer_obje= ct *bo, return ret; } =20 - ret =3D ttm_bo_add_move_fence(bo, man, ctx->no_wait_gpu); + ret =3D ttm_bo_add_pipelined_eviction_fences(bo, man, ctx->no_wait_gpu); if (unlikely(ret)) { ttm_resource_free(bo, res); if (ret =3D=3D -EBUSY) diff --git a/drivers/gpu/drm/ttm/ttm_bo_util.c b/drivers/gpu/drm/ttm/ttm_bo= _util.c index acbbca9d5c92..2ff35d55e462 100644 --- a/drivers/gpu/drm/ttm/ttm_bo_util.c +++ b/drivers/gpu/drm/ttm/ttm_bo_util.c @@ -258,7 +258,7 @@ static int ttm_buffer_object_transfer(struct ttm_buffer= _object *bo, ret =3D dma_resv_trylock(&fbo->base.base._resv); WARN_ON(!ret); =20 - ret =3D dma_resv_reserve_fences(&fbo->base.base._resv, 1); + ret =3D dma_resv_reserve_fences(&fbo->base.base._resv, TTM_NUM_MOVE_FENCE= S); if (ret) { dma_resv_unlock(&fbo->base.base._resv); kfree(fbo); @@ -646,20 +646,44 @@ static void ttm_bo_move_pipeline_evict(struct ttm_buf= fer_object *bo, { struct ttm_device *bdev =3D bo->bdev; struct ttm_resource_manager *from; + struct dma_fence *tmp; + int i; =20 from =3D ttm_manager_type(bdev, bo->resource->mem_type); =20 /** * BO doesn't have a TTM we need to bind/unbind. Just remember - * this eviction and free up the allocation + * this eviction and free up the allocation. + * The fence will be saved in the first free slot or in the slot + * already used to store a fence from the same context. Since + * drivers can't use more than TTM_NUM_MOVE_FENCES contexts for + * evictions we should always find a slot to use. */ - spin_lock(&from->move_lock); - if (!from->move || dma_fence_is_later(fence, from->move)) { - dma_fence_put(from->move); - from->move =3D dma_fence_get(fence); + spin_lock(&from->eviction_lock); + for (i =3D 0; i < TTM_NUM_MOVE_FENCES; i++) { + tmp =3D from->eviction_fences[i]; + if (!tmp) + break; + if (fence->context !=3D tmp->context) + continue; + if (dma_fence_is_later(fence, tmp)) { + dma_fence_put(tmp); + break; + } + goto unlock; + } + if (i < TTM_NUM_MOVE_FENCES) { + from->eviction_fences[i] =3D dma_fence_get(fence); + } else { + WARN(1, "not enough fence slots for all fence contexts"); + spin_unlock(&from->eviction_lock); + dma_fence_wait(fence, false); + goto end; } - spin_unlock(&from->move_lock); =20 +unlock: + spin_unlock(&from->eviction_lock); +end: ttm_resource_free(bo, &bo->resource); } =20 diff --git a/drivers/gpu/drm/ttm/ttm_resource.c b/drivers/gpu/drm/ttm/ttm_r= esource.c index e2c82ad07eb4..62c34cafa387 100644 --- a/drivers/gpu/drm/ttm/ttm_resource.c +++ b/drivers/gpu/drm/ttm/ttm_resource.c @@ -523,14 +523,15 @@ void ttm_resource_manager_init(struct ttm_resource_ma= nager *man, { unsigned i; =20 - spin_lock_init(&man->move_lock); man->bdev =3D bdev; man->size =3D size; man->usage =3D 0; =20 for (i =3D 0; i < TTM_MAX_BO_PRIORITY; ++i) INIT_LIST_HEAD(&man->lru[i]); - man->move =3D NULL; + spin_lock_init(&man->eviction_lock); + for (i =3D 0; i < TTM_NUM_MOVE_FENCES; i++) + man->eviction_fences[i] =3D NULL; } EXPORT_SYMBOL(ttm_resource_manager_init); =20 @@ -551,7 +552,7 @@ int ttm_resource_manager_evict_all(struct ttm_device *b= dev, .no_wait_gpu =3D false, }; struct dma_fence *fence; - int ret; + int ret, i; =20 do { ret =3D ttm_bo_evict_first(bdev, man, &ctx); @@ -561,18 +562,24 @@ int ttm_resource_manager_evict_all(struct ttm_device = *bdev, if (ret && ret !=3D -ENOENT) return ret; =20 - spin_lock(&man->move_lock); - fence =3D dma_fence_get(man->move); - spin_unlock(&man->move_lock); + ret =3D 0; =20 - if (fence) { - ret =3D dma_fence_wait(fence, false); - dma_fence_put(fence); - if (ret) - return ret; + spin_lock(&man->eviction_lock); + for (i =3D 0; i < TTM_NUM_MOVE_FENCES; i++) { + fence =3D man->eviction_fences[i]; + if (fence && !dma_fence_is_signaled(fence)) { + dma_fence_get(fence); + spin_unlock(&man->eviction_lock); + ret =3D dma_fence_wait(fence, false); + dma_fence_put(fence); + if (ret) + return ret; + spin_lock(&man->eviction_lock); + } } + spin_unlock(&man->eviction_lock); =20 - return 0; + return ret; } EXPORT_SYMBOL(ttm_resource_manager_evict_all); =20 diff --git a/include/drm/ttm/ttm_resource.h b/include/drm/ttm/ttm_resource.h index f49daa504c36..50e6added509 100644 --- a/include/drm/ttm/ttm_resource.h +++ b/include/drm/ttm/ttm_resource.h @@ -50,6 +50,15 @@ struct io_mapping; struct sg_table; struct scatterlist; =20 +/** + * define TTM_NUM_MOVE_FENCES - How many entities can be used for evictions + * + * Pipelined evictions can be spread on multiple entities. This + * is the max number of entities that can be used by the driver + * for that purpose. + */ +#define TTM_NUM_MOVE_FENCES 8 + /** * enum ttm_lru_item_type - enumerate ttm_lru_item subclasses */ @@ -180,8 +189,8 @@ struct ttm_resource_manager_func { * @size: Size of the managed region. * @bdev: ttm device this manager belongs to * @func: structure pointer implementing the range manager. See above - * @move_lock: lock for move fence - * @move: The fence of the last pipelined move operation. + * @eviction_lock: lock for eviction fences + * @eviction_fences: The fences of the last pipelined move operation. * @lru: The lru list for this memory type. * * This structure is used to identify and manage memory types for a device. @@ -195,12 +204,12 @@ struct ttm_resource_manager { struct ttm_device *bdev; uint64_t size; const struct ttm_resource_manager_func *func; - spinlock_t move_lock; =20 - /* - * Protected by @move_lock. + /* This is very similar to a dma_resv object, but locking rules make + * it difficult to use one in this context. */ - struct dma_fence *move; + spinlock_t eviction_lock; + struct dma_fence *eviction_fences[TTM_NUM_MOVE_FENCES]; =20 /* * Protected by the bdev->lru_lock. @@ -421,8 +430,12 @@ static inline bool ttm_resource_manager_used(struct tt= m_resource_manager *man) static inline void ttm_resource_manager_cleanup(struct ttm_resource_manager *man) { - dma_fence_put(man->move); - man->move =3D NULL; + int i; + + for (i =3D 0; i < TTM_NUM_MOVE_FENCES; i++) { + dma_fence_put(man->eviction_fences[i]); + man->eviction_fences[i] =3D NULL; + } } =20 void ttm_lru_bulk_move_init(struct ttm_lru_bulk_move *bulk); --=20 2.43.0 From nobody Sat Feb 7 20:28:07 2026 Received: from MW6PR02CU001.outbound.protection.outlook.com (mail-westus2azon11012010.outbound.protection.outlook.com [52.101.48.10]) (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 5E343357A21; Thu, 13 Nov 2025 16:08:14 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=52.101.48.10 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763050095; cv=fail; b=GwZvSVOwyU12trnxD8VHlRy41cnGjZ+RG6zObMf4sq6b/cAKPFB60DGyD22e0ofrNiE6ELS466fYfRmqZeB63EGKO6Zpri+aNtWufpPf64Z8RxsiEPZpsFEC4xclrfXlAldOQbG9daLHLOm+LThIeZ1UORqEwyCmkTwxc027rjM= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763050095; c=relaxed/simple; bh=jmO/IFmhiQAwYICyYmQDp3gcmzfV9xrnoqXb/V1sPSk=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=i5pvqvcwGsnEC16LaJIAmBJqjVFLetcXeRtk10phutjabxfeGLswsF0xkvue5LdmtE/2LVrFhlhPQ1pKRjUkSYsoYVgoqRYff/sju+D790UOS+gWpNwDKuxLwdWa4vmAvQfIUIOytCXNEXDhrRPOzi9LRkiVdPWtpymi6BSzERE= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amd.com; spf=fail smtp.mailfrom=amd.com; dkim=pass (1024-bit key) header.d=amd.com header.i=@amd.com header.b=gv3dAIhC; arc=fail smtp.client-ip=52.101.48.10 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amd.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=amd.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=amd.com header.i=@amd.com header.b="gv3dAIhC" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=L1ckiauZXB631b8ZZEZgxI+Zf9CGJ+pbKzuU7TKjAdocuExBVpm5/xSVOgoIfZW+g271+deTTMYl29Ozu6L1pvMEidiSlqP+eONKqCCE3OeWj4788u+/pAlOTKnPeBbZjBcG5nWgvVvCgoUULTSwkaXx7DK4a+cMpQYd1NHt04Ji+oE2KS7VO6hyFlLQnJCZSt7s2npRfvUuCzuQ5NitqJUgj9u3SGcukcGTqZC3irou9gKuz1RpVsCSfH5xTn0hET2oa6wsRDxw/2p29v6fEe4zjO+X0FvJvj/HSWIuCnFfGFcICOQGadQPCwGyb4oA1JiGAHjTNOcXzdG2KZTYxg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=c6E4IF3LYcU5qbaNoF8ewtPzT4lDCpbqqbYBA/cpCbg=; b=vBHISJ2Lwb68TiQm15wSqHo3A8Qc3SsLuaUC9yMXxknGoI+esnEwztTJvnOz/ryODriNphm6rXM/re0VqS7hx5dhA8N4I1MX8ldlOcr5LusC/3NyuhIuVBMOdJzoTKx/KVeEYeMcQcAiM+kmiknq3IVTGGqJQ7kyoxB8FCr3NsaWyXWDg7OQN8e12kiZ84sgfE28aJeBmgEIQIF2U+bC520LC97hU+wo9bwBFLzQnY1RZ0uSYA1sBBsaTr3pC95CIGSU7VySrewnYRZpGX3UDD3qcW9tOsNXwy6dA2DN/MBj3vr3xAZNNcqHeBEirGl8rnjbcq9v81ADzZBP6/SJeA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=gmail.com smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=c6E4IF3LYcU5qbaNoF8ewtPzT4lDCpbqqbYBA/cpCbg=; b=gv3dAIhCyE/Av39Q1dw3vs6kaByUoI2nC54k5QxfQpUEluB/UIhMr2IBMkAG30IgQ2q4us0b3PJXCd3sZj0fvRSNvgg5HIfqvP7NWAbckLSjdqWITIvdo+Li0Tcbo98R6zYsKnNrD438BTx44mnXdxBPw59ZIDtRliph6qdBEiQ= Received: from CH2PR14CA0006.namprd14.prod.outlook.com (2603:10b6:610:60::16) by CH2PR12MB4053.namprd12.prod.outlook.com (2603:10b6:610:7c::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9320.17; Thu, 13 Nov 2025 16:08:12 +0000 Received: from CH1PEPF0000A34A.namprd04.prod.outlook.com (2603:10b6:610:60:cafe::6f) by CH2PR14CA0006.outlook.office365.com (2603:10b6:610:60::16) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.9298.16 via Frontend Transport; Thu, 13 Nov 2025 16:08:12 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=satlexmb07.amd.com; pr=C Received: from satlexmb07.amd.com (165.204.84.17) by CH1PEPF0000A34A.mail.protection.outlook.com (10.167.244.5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9320.13 via Frontend Transport; Thu, 13 Nov 2025 16:08:12 +0000 Received: from FRAPPELLOUX01-WSLPUB.amd.com (10.180.168.240) by satlexmb07.amd.com (10.181.42.216) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.2562.17; Thu, 13 Nov 2025 08:08:10 -0800 From: Pierre-Eric Pelloux-Prayer To: Alex Deucher , =?UTF-8?q?Christian=20K=C3=B6nig?= , David Airlie , Simona Vetter , Felix Kuehling , Sumit Semwal CC: Pierre-Eric Pelloux-Prayer , , , , , Subject: [PATCH v2 03/20] drm/amdgpu: remove direct_submit arg from amdgpu_copy_buffer Date: Thu, 13 Nov 2025 17:05:44 +0100 Message-ID: <20251113160632.5889-4-pierre-eric.pelloux-prayer@amd.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20251113160632.5889-1-pierre-eric.pelloux-prayer@amd.com> References: <20251113160632.5889-1-pierre-eric.pelloux-prayer@amd.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 X-ClientProxiedBy: satlexmb07.amd.com (10.181.42.216) To satlexmb07.amd.com (10.181.42.216) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CH1PEPF0000A34A:EE_|CH2PR12MB4053:EE_ X-MS-Office365-Filtering-Correlation-Id: 54007dc9-ba94-4a78-6854-08de22ced868 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|376014|36860700013|1800799024|82310400026; X-Microsoft-Antispam-Message-Info: =?utf-8?B?UnRYSDR2UHN0eXlxM25hTkE3MVNwdndlRVcxbC9JYkZIZENBWlVTNTl1TTh1?= =?utf-8?B?UkFVakVmMHBMTmU5enZSci80UWNWWk9obEg4UlZIN0VYTGxlUjNKeTFzZU96?= =?utf-8?B?bHl1cEpFc1JnTndqRE1lVlBWazk5Y20rbkNPQkpyNnBFV3BGSHA1cjloTStv?= =?utf-8?B?VVpEMFZESmxEbnZrb21nSXhCRG1uRi9SUTVRaURhZTl5SGRtWkQrdTNRRSs4?= =?utf-8?B?NCtqcDMxSkhqMXpnUHlYMmZUVVdDdXUyWnB2Qktnc1FycFlIS3VMK2JoVGMr?= =?utf-8?B?dWJYOURwdVdTdkMwOUo5cHgvQ0ErZWN3SUNVZVUvQkMvSGw3Q3VTb1ExNVFv?= =?utf-8?B?T0YweXJMekFmVW9IcE91UUs2Z244M0xmVERPREZRdWY2cVJCdGFHTExsbC9F?= =?utf-8?B?U3pySXZsc0pzNnVUR2l3YTM0R0hQS3JkV2Y5SzM4U25SMnNNQzZyN1VrWTMx?= =?utf-8?B?ZTBLWThPSlJvMzJnWnplRVlOM3d0SVBqQ2lzNDAyUEhRcGkrRnJjL3l0ZDZK?= =?utf-8?B?dFpWSGFwY3hOU1p1bGxxQzJOdXBkWjQzeDZlNlcrcGt4L01tbmJ5MUZ4b1hU?= =?utf-8?B?cG1JTEIrbFpHbWczTVBoSFNuWFBlRkxncXpSYnN4M1VtTTJPQTRndUFiSGhY?= =?utf-8?B?L1hVdlBxTEx5aVhiNHk4aTZ5U1B3T1BiRVp2UjlmQjlFUEoyZlVzZ0FnV0hH?= =?utf-8?B?Nyt0OThJMmE0WS9VOC9ucm5WMkJSWmtFWkpaMWdZVzhSeFExTjlZNG5Oa1FZ?= =?utf-8?B?T0cwelJGcjZvWTFCdTZyZU1kWDh4TTRBMlNaVUFQMWhWWnZIclYzRmhxNW93?= =?utf-8?B?dnNEY2ltaWtmRkR3SjJvVVJQU2tTOVVnMjAxNWN0bzltUnJSWlJNV2tvY2wx?= =?utf-8?B?Q1hDeVUvNmYzT2hmWS9Jd2tYdEhEQ0xjTUpZay84UjdNbXc0NzVERGFVTGtM?= =?utf-8?B?ZEE3SW5mc05wVGZWeURyNWxqRklXS1RrbTBPT08vUUFyVWVPUldUVUhjUitv?= =?utf-8?B?VWFVNmtvZ2NxWkV5a0dLSXdkZ3JsVlZwVzNBM2Q2cmRsRHdBaWFrNzhoeXVk?= =?utf-8?B?bmd6cHg3RWtkV1A1b0tneTAxaS9FcTE4OThwdElFcUZpQ0FON3dDOUpVWFBj?= =?utf-8?B?b3R0M05pWS9zY0d4V01mZGk1enBFbEFvTU1ZWVFjalZuU1NzQkt3amhrL0g3?= =?utf-8?B?aVhFcTdvZWcxVGNHcmRRdTc3c1Zlb3lsMld2czVLWnNqdkRtWnZXY2tUUEpQ?= =?utf-8?B?bFYvckphaytoRndLeFFTYUp5MjJpdlJhRTlwRndHRWdQYlByb0NFaHpaQnRm?= =?utf-8?B?UTRwYmxOaThGOVkxa1RqUi9XMUhWUEZiR0U5MHdVcy9kcmRqTm9aNjdnWFA4?= =?utf-8?B?Vmswd3ZFTDlIdzRWVnlUTjV5c0pLalNLWnM3N0J5c0xraVRtTEVyOG9xaEli?= =?utf-8?B?dFJhS1grSGFTQ3VJeFJDZkkvMm5qV1dJREhxVHZxdjY1cXRaNHE1dVUvSGFa?= =?utf-8?B?U3NINVBLaWdLSDR3T05Va0JlTitLNzFsOUM3WGdabm5XeStpa3E0OC9IcFRJ?= =?utf-8?B?bzdhMVBXRHQ5dDNhTTZuajBzT1N0V25BbUl5bTVadmN3dWdzVzNVdWVWL1Vl?= =?utf-8?B?bDJheFJkM3A4WUxHT2NiRU16ajV2RkhySkNjYjA3UkVmZk5IWkJjakNsY0l6?= =?utf-8?B?TlA3ZGU3elJmc3VaaTJmWFhUalArUlpBMkdNTU1DVERXckpJSDREdm1mQzNK?= =?utf-8?B?UlRvU0ppNk1OZElBQVJJRFZwbFZyQTRUOEswN080ZEtGMXlqdHppR1l2d3NT?= =?utf-8?B?NXVyVFBSYXNPTG5mNDl3cWRQOEc2ZUpYdk1QRzZHQ040MW9HQlgyTXdIeDBa?= =?utf-8?B?SDlteUFyTmRNQ1JWZXBCeC9BRU9xNnFOazV6dGd3TU1COXFZa0NZM3pEYk0v?= =?utf-8?B?eG1UdktwWDFhbktlaHVLNVlLZjg2MDJ2d2htRDdRYlVNMzBGMnA2UkYrVzdK?= =?utf-8?B?ZEZhSXV1RHNnR2FmVDlhQlBUekZwS0NpSGZROXM5QWxUNkdhTDd0Z09vazY0?= =?utf-8?B?bUE3bG1jVWVGTm04ZzFFcUpyRXVCL3doWkYzcitYT3B3WlRoZ084ZC9iTThR?= =?utf-8?Q?LJJM=3D?= X-Forefront-Antispam-Report: CIP:165.204.84.17;CTRY:US;LANG:en;SCL:1;SRV:;IPV:CAL;SFV:NSPM;H:satlexmb07.amd.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230040)(376014)(36860700013)(1800799024)(82310400026);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Nov 2025 16:08:12.1986 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 54007dc9-ba94-4a78-6854-08de22ced868 X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d;Ip=[165.204.84.17];Helo=[satlexmb07.amd.com] X-MS-Exchange-CrossTenant-AuthSource: CH1PEPF0000A34A.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH2PR12MB4053 It was always false. Signed-off-by: Pierre-Eric Pelloux-Prayer Reviewed-by: Christian K=C3=B6nig --- drivers/gpu/drm/amd/amdgpu/amdgpu_benchmark.c | 2 +- drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 20 +++++++------------ drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h | 2 +- drivers/gpu/drm/amd/amdkfd/kfd_migrate.c | 2 +- 4 files changed, 10 insertions(+), 16 deletions(-) diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_benchmark.c b/drivers/gpu/dr= m/amd/amdgpu/amdgpu_benchmark.c index 199693369c7c..02c2479a8840 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_benchmark.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_benchmark.c @@ -39,7 +39,7 @@ static int amdgpu_benchmark_do_move(struct amdgpu_device = *adev, unsigned size, for (i =3D 0; i < n; i++) { struct amdgpu_ring *ring =3D adev->mman.buffer_funcs_ring; r =3D amdgpu_copy_buffer(ring, saddr, daddr, size, NULL, &fence, - false, false, 0); + false, 0); if (r) goto exit_do_move; r =3D dma_fence_wait(fence, false); diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c b/drivers/gpu/drm/amd/= amdgpu/amdgpu_ttm.c index 3b46a24a8c48..c985f57fa227 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c @@ -354,7 +354,7 @@ static int amdgpu_ttm_copy_mem_to_mem(struct amdgpu_dev= ice *adev, } =20 r =3D amdgpu_copy_buffer(ring, from, to, cur_size, resv, - &next, false, true, copy_flags); + &next, true, copy_flags); if (r) goto error; =20 @@ -2211,16 +2211,13 @@ void amdgpu_ttm_set_buffer_funcs_status(struct amdg= pu_device *adev, bool enable) } =20 static int amdgpu_ttm_prepare_job(struct amdgpu_device *adev, - bool direct_submit, unsigned int num_dw, struct dma_resv *resv, bool vm_needs_flush, struct amdgpu_job **job, bool delayed, u64 k_job_id) { - enum amdgpu_ib_pool_type pool =3D direct_submit ? - AMDGPU_IB_POOL_DIRECT : - AMDGPU_IB_POOL_DELAYED; + enum amdgpu_ib_pool_type pool =3D AMDGPU_IB_POOL_DELAYED; int r; struct drm_sched_entity *entity =3D delayed ? &adev->mman.low_pr : &adev->mman.high_pr; @@ -2246,7 +2243,7 @@ static int amdgpu_ttm_prepare_job(struct amdgpu_devic= e *adev, int amdgpu_copy_buffer(struct amdgpu_ring *ring, uint64_t src_offset, uint64_t dst_offset, uint32_t byte_count, struct dma_resv *resv, - struct dma_fence **fence, bool direct_submit, + struct dma_fence **fence, bool vm_needs_flush, uint32_t copy_flags) { struct amdgpu_device *adev =3D ring->adev; @@ -2256,7 +2253,7 @@ int amdgpu_copy_buffer(struct amdgpu_ring *ring, uint= 64_t src_offset, unsigned int i; int r; =20 - if (!direct_submit && !ring->sched.ready) { + if (!ring->sched.ready) { dev_err(adev->dev, "Trying to move memory with ring turned off.\n"); return -EINVAL; @@ -2265,7 +2262,7 @@ int amdgpu_copy_buffer(struct amdgpu_ring *ring, uint= 64_t src_offset, max_bytes =3D adev->mman.buffer_funcs->copy_max_bytes; num_loops =3D DIV_ROUND_UP(byte_count, max_bytes); num_dw =3D ALIGN(num_loops * adev->mman.buffer_funcs->copy_num_dw, 8); - r =3D amdgpu_ttm_prepare_job(adev, direct_submit, num_dw, + r =3D amdgpu_ttm_prepare_job(adev, num_dw, resv, vm_needs_flush, &job, false, AMDGPU_KERNEL_JOB_ID_TTM_COPY_BUFFER); if (r) @@ -2283,10 +2280,7 @@ int amdgpu_copy_buffer(struct amdgpu_ring *ring, uin= t64_t src_offset, =20 amdgpu_ring_pad_ib(ring, &job->ibs[0]); WARN_ON(job->ibs[0].length_dw > num_dw); - if (direct_submit) - r =3D amdgpu_job_submit_direct(job, ring, fence); - else - *fence =3D amdgpu_job_submit(job); + *fence =3D amdgpu_job_submit(job); if (r) goto error_free; =20 @@ -2315,7 +2309,7 @@ static int amdgpu_ttm_fill_mem(struct amdgpu_ring *ri= ng, uint32_t src_data, max_bytes =3D adev->mman.buffer_funcs->fill_max_bytes; num_loops =3D DIV_ROUND_UP_ULL(byte_count, max_bytes); num_dw =3D ALIGN(num_loops * adev->mman.buffer_funcs->fill_num_dw, 8); - r =3D amdgpu_ttm_prepare_job(adev, false, num_dw, resv, vm_needs_flush, + r =3D amdgpu_ttm_prepare_job(adev, num_dw, resv, vm_needs_flush, &job, delayed, k_job_id); if (r) return r; diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h b/drivers/gpu/drm/amd/= amdgpu/amdgpu_ttm.h index 577ee04ce0bf..50e40380fe95 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h @@ -166,7 +166,7 @@ void amdgpu_ttm_set_buffer_funcs_status(struct amdgpu_d= evice *adev, int amdgpu_copy_buffer(struct amdgpu_ring *ring, uint64_t src_offset, uint64_t dst_offset, uint32_t byte_count, struct dma_resv *resv, - struct dma_fence **fence, bool direct_submit, + struct dma_fence **fence, bool vm_needs_flush, uint32_t copy_flags); int amdgpu_ttm_clear_buffer(struct amdgpu_bo *bo, struct dma_resv *resv, diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_migrate.c b/drivers/gpu/drm/amd= /amdkfd/kfd_migrate.c index 46c84fc60af1..378af0b2aaa9 100644 --- a/drivers/gpu/drm/amd/amdkfd/kfd_migrate.c +++ b/drivers/gpu/drm/amd/amdkfd/kfd_migrate.c @@ -153,7 +153,7 @@ svm_migrate_copy_memory_gart(struct amdgpu_device *adev= , dma_addr_t *sys, } =20 r =3D amdgpu_copy_buffer(ring, gart_s, gart_d, size * PAGE_SIZE, - NULL, &next, false, true, 0); + NULL, &next, true, 0); if (r) { dev_err(adev->dev, "fail %d to copy memory\n", r); goto out_unlock; --=20 2.43.0 From nobody Sat Feb 7 20:28:07 2026 Received: from PH7PR06CU001.outbound.protection.outlook.com (mail-westus3azon11010018.outbound.protection.outlook.com [52.101.201.18]) (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 3D5FE3590D6 for ; Thu, 13 Nov 2025 16:08:37 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=52.101.201.18 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763050120; cv=fail; b=E74w4yPARsHpgItNRW9ZpcAloiGpLMlVxMmKboOGnsgs0tBvQwUXCF1Gh1XFzrI/z0ejJbX5lHuvKmYJDnxqUdF0vbTlbQNmFjBRbpN8hZ3blee61diEsTvpliL+D98AyUhof40djZgV5/5PMqSrymRMCllVwPxqJKKkQbIG/rA= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763050120; c=relaxed/simple; bh=8EBJZDHJ3k6sm+s70D9uBmGWJyxnCzRXFKqEUqmNmZw=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=XyVnpqiCqCJSzP+MHWOom1JNiJNAzkfUYsLy9O1fMjH9Tib3KJapAPGAu2Uah6Y4iJceJPTOjm+pC6a9jAFQTsBYal92Ss1uAFSfrXnhlNHm9q2pRdA9abJxD3XTcCHv/97djylD2M1BZXCcrYRm6f4vIkGfaGOJrnn5F7wg77U= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amd.com; spf=fail smtp.mailfrom=amd.com; dkim=pass (1024-bit key) header.d=amd.com header.i=@amd.com header.b=4+e+EbLh; arc=fail smtp.client-ip=52.101.201.18 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amd.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=amd.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=amd.com header.i=@amd.com header.b="4+e+EbLh" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=FM4mOYEClyGVNJrTT+0XWa6y06Z7MDmz0Noe+YQrSwzxQUTrTtbxOLfOZPN6iaI6yXGnB+n2ccBwFAO3oFC56dV6hR09WBOwpehKSjAHMaTSnFjXvQ1uHtqasvFM+3E1sRGg/CieSarsyov1pZOc9FaVK8h2AQWtScZ+tM1+E5Sr0GbRNGi0eGNsIQv/oQ1hbXM+f9cUYJk1KZtUdeBSAZNnQpnKuNP7Pbd8ZRTmDqaAXAD7dKOYq/FCeNaY9WvnLEls8gN+6i90VKzZ9YT3BP07LXBAn/PD3N9au36et5Hwg+7zkC/uZe1Qx/HWBvSkw556WTDmR5vgXSru2TYWcw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=do4B0eKXCEaWMnKHSNgdDCWe0OAb0N+B+LYHXTLlPXI=; b=Eq6NTNf13abFIDccHDFf1MwAPxA9zVcnSFwLHBh7s8NdegpE4ZDg/85GSFCsYrfgw7JStOaopduyYK768j1MnPYcK9cJfl+WPPfb3Eua+PdCdroqQzgsm8FJqEEfgbIx6lPbnjNx9mZBtRjoZHAgJRGLhcKesZH7UdPXB/P7HQ5yWz7RztU0nF+IfTRZrAk5XYT2RHDvRoOgRf+njFsXdduwI5dPmYiDLmfnPSc9oRI547bHCuxVrwiqIXC4Yku3W9gwTVGAPMXGjrhWoPGjj+5MwCGuoXv800+F4iQi+z4BLs8A5+rin2KgyUyuTfGnIe8/KBINLRodQJvCUyDr3A== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=gmail.com smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=do4B0eKXCEaWMnKHSNgdDCWe0OAb0N+B+LYHXTLlPXI=; b=4+e+EbLh0MF1dWd1AWyrzwzKvGO7qgfvo5q8b0aNB9D/IzAxxWhAzdDrTMQ0hBbaXV2BIvTj2/qeU9rK1JMscCgN9JLNKhK0R4SNzZz4rs/brbpbMp7hKLRN56fihVUzyMkIsaOmWRGTKrhSFseopFELYO/SnxwCSFCy7lu7JIg= Received: from CH0PR13CA0049.namprd13.prod.outlook.com (2603:10b6:610:b2::24) by DS0PR12MB8269.namprd12.prod.outlook.com (2603:10b6:8:fd::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9320.17; Thu, 13 Nov 2025 16:08:35 +0000 Received: from CH1PEPF0000A345.namprd04.prod.outlook.com (2603:10b6:610:b2:cafe::38) by CH0PR13CA0049.outlook.office365.com (2603:10b6:610:b2::24) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.9343.6 via Frontend Transport; Thu, 13 Nov 2025 16:08:34 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=satlexmb07.amd.com; pr=C Received: from satlexmb07.amd.com (165.204.84.17) by CH1PEPF0000A345.mail.protection.outlook.com (10.167.244.8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9320.13 via Frontend Transport; Thu, 13 Nov 2025 16:08:35 +0000 Received: from FRAPPELLOUX01-WSLPUB.amd.com (10.180.168.240) by satlexmb07.amd.com (10.181.42.216) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.2562.17; Thu, 13 Nov 2025 08:08:33 -0800 From: Pierre-Eric Pelloux-Prayer To: Alex Deucher , =?UTF-8?q?Christian=20K=C3=B6nig?= , David Airlie , Simona Vetter , Felix Kuehling CC: Pierre-Eric Pelloux-Prayer , , , Subject: [PATCH v2 04/20] drm/amdgpu: introduce amdgpu_ttm_buffer_entity Date: Thu, 13 Nov 2025 17:05:45 +0100 Message-ID: <20251113160632.5889-5-pierre-eric.pelloux-prayer@amd.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20251113160632.5889-1-pierre-eric.pelloux-prayer@amd.com> References: <20251113160632.5889-1-pierre-eric.pelloux-prayer@amd.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-ClientProxiedBy: satlexmb07.amd.com (10.181.42.216) To satlexmb07.amd.com (10.181.42.216) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CH1PEPF0000A345:EE_|DS0PR12MB8269:EE_ X-MS-Office365-Filtering-Correlation-Id: 9bcce563-619d-4161-20e6-08de22cee64c X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|376014|36860700013|82310400026; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?bLGPpvHnz+UN+I4JG7H9E4aTJh/PVOAwRq8FtdQx+vek7pIyBlaRlo48ehyV?= =?us-ascii?Q?vBmy1xV5loyUaL/rV67e2ghQ0WtxyPW0eGu+ZJkmw7WO2ZFmPvUlvfOD0oaE?= =?us-ascii?Q?F6yKV8l6Qex4wj6eg6U3iE8w/5la1s2uvZam70Nd6YId/48MgoLsT6v4kHM3?= =?us-ascii?Q?/f+VkHQoTSXu2uzPA5apKOK16IQxRmXHh5DcQ1XO3+jlgOJ45/UDzrVcgxb7?= =?us-ascii?Q?HCVzsKHJX8YsJMcRdm+ck7/87K4+g7+QGK2R/54RBmEm/odnDu/4xGW1D9V2?= =?us-ascii?Q?9nDKMTH2kHsDW5eEjj6Rko/MuRA+L5eaXijaUG4/yVjBq65lo1i5OeBBSlu8?= =?us-ascii?Q?qEVZu67J9p9WJDPlGJjO6GTo8qB+FHMmC2GoihuXjJdGgWSCDcU6BsP8Bd/Z?= =?us-ascii?Q?ZkReJ4B5A0Gj+0L/l5VUws84i70RDrEBYi2zgVCnKwAW991ekeXWZzFxbFVG?= =?us-ascii?Q?bVOIxROz+boHwHb3Rq5YYPLkKHhDCS7K+K7wGVAGKuBei6bgyP4TTQMb1/dp?= =?us-ascii?Q?JWGfRGHKsiBLZoXwhoyAvYgCyM6h2QTmokSf6SCHjvqE0r+dk5oM3KqO87XO?= =?us-ascii?Q?NpAowpS/NQZ8cTj7RT/1vFu/SCEwZbux4/sGsYmLN1IleSc96pPFeogp+PDx?= =?us-ascii?Q?1cwV/PJ2RDuZNqejGqWX5hqyu+lh3F9hn6Y0FjFgAtBAlMOyUTWeZwTHBZ/k?= =?us-ascii?Q?RMABhO7PUFiAxjScb8RWiU9sdu9RicpSqGmriUWycchSpcNKTtuFq4RbveMf?= =?us-ascii?Q?Ft0VwJ1ErnO4nSzCwt4u7vZxSRn7o+iCfrY8fxPM+JghlK4uNDFEL/5Zq2AX?= =?us-ascii?Q?+5vXaLuiLHGSK4y7tNTBnpdnirI7A2Jlu4jtyAFX6cy/jOYcOA0fbTezZH1N?= =?us-ascii?Q?ZmdJNc6uLnlVJE2c2ttm71aSwWYvaIjkj/4759w3TvOVhxkSPeHA5ImvpDlf?= =?us-ascii?Q?KOeH0GdWrsdln/snnhGaagnLlGT2d5DeaSh3yU3XjkriVri8VpdixjNtjcij?= =?us-ascii?Q?/ae0ZTJrsFmQ/r0CzdiAUTnZVM/YNWDfX0RR5tvFpqrO6ezyyErgGSJViUYX?= =?us-ascii?Q?lVysJY7CbCJpxPwo1DMiVWONni7IA7I6cKjsxtYetT+YQFT2l/ZdAQuzMvW+?= =?us-ascii?Q?G7ls1Lb5vtcaw2nZ0JlA8uh34uNRMvsGNsWkpjKEOkpHEDRmwkZ8ElIjzlYS?= =?us-ascii?Q?+Rf/bfcPh+aYwH7ityiwOqTp4BeWrBCeb7sOasZ2/5GjHEidfJCMy2HpFUJM?= =?us-ascii?Q?TTGcJVIIGeIXvjUxLBa4NH6iRnUbzo5TZthknotD+e4z+HediobRj2otqaDT?= =?us-ascii?Q?7GRhM8eDStv55UTn5o0aKwngDeF6Gsd34cARtDMr5ikOLId1FCVNpAsOZybw?= =?us-ascii?Q?0WkJQDDOhS2PjKc/2Ud58uooByu/thY/Btu+YOdHb93AgSUkyUBVrAP9d/tE?= =?us-ascii?Q?9aVyl9O4qjITURffpL2cac9nosHlOWwjMoVy9VJChTImyxnxk8YeLyT7oHLL?= =?us-ascii?Q?WCPsVk2mIQhJeHLRb0N9WAfFT5FEREwHpzyX6r7t1Md8PzT/bGwjT8/X8M3+?= =?us-ascii?Q?i9l6YHalcfcDlcpOla8=3D?= X-Forefront-Antispam-Report: CIP:165.204.84.17;CTRY:US;LANG:en;SCL:1;SRV:;IPV:CAL;SFV:NSPM;H:satlexmb07.amd.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230040)(1800799024)(376014)(36860700013)(82310400026);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Nov 2025 16:08:35.5011 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 9bcce563-619d-4161-20e6-08de22cee64c X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d;Ip=[165.204.84.17];Helo=[satlexmb07.amd.com] X-MS-Exchange-CrossTenant-AuthSource: CH1PEPF0000A345.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS0PR12MB8269 Content-Type: text/plain; charset="utf-8" No functional change for now, but this struct will have more fields added in the next commit. Technically the change introduces synchronisation issue, because dependencies between successive jobs are not taken care of properly. For instance, amdgpu_ttm_clear_buffer uses amdgpu_ttm_map_buffer then amdgpu_ttm_fill_mem which use different entities (default_entity then move/clear entity). But it's all working as expected, because all entities use the same sdma instance for now and default_entity has a higher prio so its job always gets scheduler first. The next commits will deal with these dependencies correctly. Acked-by: Felix Kuehling Reviewed-by: Christian K=C3=B6nig --- v2: renamed amdgpu_ttm_buffer_entity --- Signed-off-by: Pierre-Eric Pelloux-Prayer --- drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c | 2 +- drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 30 +++++++++++++++++------- drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h | 12 ++++++---- drivers/gpu/drm/amd/amdkfd/kfd_migrate.c | 13 ++++++---- 4 files changed, 39 insertions(+), 18 deletions(-) diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c b/drivers/gpu/drm/amd/= amdgpu/amdgpu_gmc.c index 9dcf51991b5b..8e2d41c9c271 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c @@ -687,7 +687,7 @@ void amdgpu_gmc_flush_gpu_tlb(struct amdgpu_device *ade= v, uint32_t vmid, * itself at least for GART. */ mutex_lock(&adev->mman.gtt_window_lock); - r =3D amdgpu_job_alloc_with_ib(ring->adev, &adev->mman.high_pr, + r =3D amdgpu_job_alloc_with_ib(ring->adev, &adev->mman.default_entity.bas= e, AMDGPU_FENCE_OWNER_UNDEFINED, 16 * 4, AMDGPU_IB_POOL_IMMEDIATE, &job, AMDGPU_KERNEL_JOB_ID_FLUSH_GPU_TLB); diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c b/drivers/gpu/drm/amd/= amdgpu/amdgpu_ttm.c index c985f57fa227..42d448cd6a6d 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c @@ -224,7 +224,7 @@ static int amdgpu_ttm_map_buffer(struct ttm_buffer_obje= ct *bo, num_dw =3D ALIGN(adev->mman.buffer_funcs->copy_num_dw, 8); num_bytes =3D num_pages * 8 * AMDGPU_GPU_PAGES_IN_CPU_PAGE; =20 - r =3D amdgpu_job_alloc_with_ib(adev, &adev->mman.high_pr, + r =3D amdgpu_job_alloc_with_ib(adev, &adev->mman.default_entity.base, AMDGPU_FENCE_OWNER_UNDEFINED, num_dw * 4 + num_bytes, AMDGPU_IB_POOL_DELAYED, &job, @@ -1486,7 +1486,7 @@ static int amdgpu_ttm_access_memory_sdma(struct ttm_b= uffer_object *bo, memcpy(adev->mman.sdma_access_ptr, buf, len); =20 num_dw =3D ALIGN(adev->mman.buffer_funcs->copy_num_dw, 8); - r =3D amdgpu_job_alloc_with_ib(adev, &adev->mman.high_pr, + r =3D amdgpu_job_alloc_with_ib(adev, &adev->mman.default_entity.base, AMDGPU_FENCE_OWNER_UNDEFINED, num_dw * 4, AMDGPU_IB_POOL_DELAYED, &job, @@ -2168,7 +2168,7 @@ void amdgpu_ttm_set_buffer_funcs_status(struct amdgpu= _device *adev, bool enable) =20 ring =3D adev->mman.buffer_funcs_ring; sched =3D &ring->sched; - r =3D drm_sched_entity_init(&adev->mman.high_pr, + r =3D drm_sched_entity_init(&adev->mman.default_entity.base, DRM_SCHED_PRIORITY_KERNEL, &sched, 1, NULL); if (r) { @@ -2178,18 +2178,30 @@ void amdgpu_ttm_set_buffer_funcs_status(struct amdg= pu_device *adev, bool enable) return; } =20 - r =3D drm_sched_entity_init(&adev->mman.low_pr, + r =3D drm_sched_entity_init(&adev->mman.clear_entity.base, + DRM_SCHED_PRIORITY_NORMAL, &sched, + 1, NULL); + if (r) { + dev_err(adev->dev, + "Failed setting up TTM BO clear entity (%d)\n", + r); + goto error_free_entity; + } + + r =3D drm_sched_entity_init(&adev->mman.move_entity.base, DRM_SCHED_PRIORITY_NORMAL, &sched, 1, NULL); if (r) { dev_err(adev->dev, "Failed setting up TTM BO move entity (%d)\n", r); + drm_sched_entity_destroy(&adev->mman.clear_entity.base); goto error_free_entity; } } else { - drm_sched_entity_destroy(&adev->mman.high_pr); - drm_sched_entity_destroy(&adev->mman.low_pr); + drm_sched_entity_destroy(&adev->mman.default_entity.base); + drm_sched_entity_destroy(&adev->mman.clear_entity.base); + drm_sched_entity_destroy(&adev->mman.move_entity.base); for (i =3D 0; i < TTM_NUM_MOVE_FENCES; i++) { dma_fence_put(man->eviction_fences[i]); man->eviction_fences[i] =3D NULL; @@ -2207,7 +2219,7 @@ void amdgpu_ttm_set_buffer_funcs_status(struct amdgpu= _device *adev, bool enable) return; =20 error_free_entity: - drm_sched_entity_destroy(&adev->mman.high_pr); + drm_sched_entity_destroy(&adev->mman.default_entity.base); } =20 static int amdgpu_ttm_prepare_job(struct amdgpu_device *adev, @@ -2219,8 +2231,8 @@ static int amdgpu_ttm_prepare_job(struct amdgpu_devic= e *adev, { enum amdgpu_ib_pool_type pool =3D AMDGPU_IB_POOL_DELAYED; int r; - struct drm_sched_entity *entity =3D delayed ? &adev->mman.low_pr : - &adev->mman.high_pr; + struct drm_sched_entity *entity =3D delayed ? &adev->mman.clear_entity.ba= se : + &adev->mman.move_entity.base; r =3D amdgpu_job_alloc_with_ib(adev, entity, AMDGPU_FENCE_OWNER_UNDEFINED, num_dw * 4, pool, job, k_job_id); diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h b/drivers/gpu/drm/amd/= amdgpu/amdgpu_ttm.h index 50e40380fe95..d2295d6c2b67 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h @@ -52,6 +52,10 @@ struct amdgpu_gtt_mgr { spinlock_t lock; }; =20 +struct amdgpu_ttm_buffer_entity { + struct drm_sched_entity base; +}; + struct amdgpu_mman { struct ttm_device bdev; struct ttm_pool *ttm_pools; @@ -64,10 +68,10 @@ struct amdgpu_mman { bool buffer_funcs_enabled; =20 struct mutex gtt_window_lock; - /* High priority scheduler entity for buffer moves */ - struct drm_sched_entity high_pr; - /* Low priority scheduler entity for VRAM clearing */ - struct drm_sched_entity low_pr; + + struct amdgpu_ttm_buffer_entity default_entity; + struct amdgpu_ttm_buffer_entity clear_entity; + struct amdgpu_ttm_buffer_entity move_entity; =20 struct amdgpu_vram_mgr vram_mgr; struct amdgpu_gtt_mgr gtt_mgr; diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_migrate.c b/drivers/gpu/drm/amd= /amdkfd/kfd_migrate.c index 378af0b2aaa9..d74ff6e90590 100644 --- a/drivers/gpu/drm/amd/amdkfd/kfd_migrate.c +++ b/drivers/gpu/drm/amd/amdkfd/kfd_migrate.c @@ -45,7 +45,9 @@ svm_migrate_direct_mapping_addr(struct amdgpu_device *ade= v, u64 addr) } =20 static int -svm_migrate_gart_map(struct amdgpu_ring *ring, u64 npages, +svm_migrate_gart_map(struct amdgpu_ring *ring, + struct amdgpu_ttm_buffer_entity *entity, + u64 npages, dma_addr_t *addr, u64 *gart_addr, u64 flags) { struct amdgpu_device *adev =3D ring->adev; @@ -63,7 +65,7 @@ svm_migrate_gart_map(struct amdgpu_ring *ring, u64 npages, num_dw =3D ALIGN(adev->mman.buffer_funcs->copy_num_dw, 8); num_bytes =3D npages * 8; =20 - r =3D amdgpu_job_alloc_with_ib(adev, &adev->mman.high_pr, + r =3D amdgpu_job_alloc_with_ib(adev, &entity->base, AMDGPU_FENCE_OWNER_UNDEFINED, num_dw * 4 + num_bytes, AMDGPU_IB_POOL_DELAYED, @@ -128,11 +130,14 @@ svm_migrate_copy_memory_gart(struct amdgpu_device *ad= ev, dma_addr_t *sys, { const u64 GTT_MAX_PAGES =3D AMDGPU_GTT_MAX_TRANSFER_SIZE; struct amdgpu_ring *ring =3D adev->mman.buffer_funcs_ring; + struct amdgpu_ttm_buffer_entity *entity; u64 gart_s, gart_d; struct dma_fence *next; u64 size; int r; =20 + entity =3D &adev->mman.move_entity; + mutex_lock(&adev->mman.gtt_window_lock); =20 while (npages) { @@ -140,10 +145,10 @@ svm_migrate_copy_memory_gart(struct amdgpu_device *ad= ev, dma_addr_t *sys, =20 if (direction =3D=3D FROM_VRAM_TO_RAM) { gart_s =3D svm_migrate_direct_mapping_addr(adev, *vram); - r =3D svm_migrate_gart_map(ring, size, sys, &gart_d, 0); + r =3D svm_migrate_gart_map(ring, entity, size, sys, &gart_d, 0); =20 } else if (direction =3D=3D FROM_RAM_TO_VRAM) { - r =3D svm_migrate_gart_map(ring, size, sys, &gart_s, + r =3D svm_migrate_gart_map(ring, entity, size, sys, &gart_s, KFD_IOCTL_SVM_FLAG_GPU_RO); gart_d =3D svm_migrate_direct_mapping_addr(adev, *vram); } --=20 2.43.0 From nobody Sat Feb 7 20:28:07 2026 Received: from SJ2PR03CU001.outbound.protection.outlook.com (mail-westusazon11012063.outbound.protection.outlook.com [52.101.43.63]) (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 DAFBF307494; Thu, 13 Nov 2025 16:08:57 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=52.101.43.63 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763050139; cv=fail; b=kA2M2wiLNDI0p8CRPLsOqrJz6Rpm8jNaPfJJ16b3ZYgVgMamJqGdx1g33KpvsXnxOgghYoyQm5o2L7VK5ZdXjBaJY3oIzAcqVuKaT/x6N9fssdIwX7kieRgzCsw8bqcy5E3qOtPu2CTb5fcFpgEUWLuy6h7i/K9bA7yU0Y5ylIA= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763050139; c=relaxed/simple; bh=IapMg5+zP9l0dklGbtvDfX1rOPtwY/R0xD8k9oGXwjc=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=AcZe7RRVaQZaC2tY/+Swz+4nhqQTyv05Cy7P4f2900DrvttpZ5TIqYuyNGEndoBJa5S+4nguftYAqnyknamzfNRCHdouz5nFfWB202GtNHf4oBrD6AAIVAgu35aM8chFeUqgr+EZkX2aOP+URbmsB2FRlLIW6pRc5bM6CTXc+ag= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amd.com; spf=fail smtp.mailfrom=amd.com; dkim=pass (1024-bit key) header.d=amd.com header.i=@amd.com header.b=tYUeLzrj; arc=fail smtp.client-ip=52.101.43.63 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amd.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=amd.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=amd.com header.i=@amd.com header.b="tYUeLzrj" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=AbXzKDBIVPsOORM21EKlK5VRmQrAYgi0vvEfgdjn1lCCyqb11sEIfO1p8DShINhRbtW6fr5UTvSQI2CBiUKXvvab2lP8UTLc+XB0nTildUMg4EV/SbboA9tcaRYpnBoo7bJKPFAeGxzGpLFhqB0YpmTpHWvgCRjNZQIi+fr/RgplLbkh2falFNeVdA+tFGtGoLZrv5hqPJRYBNdwboWv4sdlHXvr4oVSSC3MYitwz4LztuehUOhEpANoqxDuziV0YB2oRASlp/IwKKoNq8aPeOafth/hZeN6J7DohndxtlSo/VLkgDrIGb8cGly1+yEi5geSsA9+Tv+vFxXOBFkdSg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=1rjLrLmglT+XrDHN7Wv7aURaNZ/9anVO6wUs+izJ8bo=; b=uEUgds+J/nBFg0VtzjHSCCJivZeGfhu9c0mr1ONAVcdHhbY/vF8RmWKnbsGN96/1AL1yMS0cgbAOm+uqC8NSRvZWZ8ARrDs5UtQb0l8atBJDdk4Ic5Fy0p3wc7xaFHHNO0ztO/Aya5HBOJICUqsMwhH/+M7zVBBdYpdq2J6zlgGNt4nswH/onnoJF2pejJUarZdsocvtg2kV/QLHoCPMHB5xcFqCU5oH77k4JyjAbkk2syEbu3hLLmJ34mEbNa4jLG9FraU+YP2U6pwF1vxAB3WRfulGZOPI72I+43pImW0JTDSnhBZKjoBARNvn64QV2Hvw2lPqg/Zq59F3Lqjnsw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=gmail.com smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=1rjLrLmglT+XrDHN7Wv7aURaNZ/9anVO6wUs+izJ8bo=; b=tYUeLzrjq1f2NNHbJoBVBsxpkMWmqWdGkzsfhYxHdV37T0K3gyL5RFUAUZFfmK1akEAea2H4mwFhN81574bpD+DbL/3ny/yNTjYo3wG8YcohLqQpqtqsEvL35rJmznyDGcBWCZA65uR4uNwQGwceQAGrX+AbtJMehica7GB83n8= Received: from CH0PR03CA0406.namprd03.prod.outlook.com (2603:10b6:610:11b::14) by BL3PR12MB6595.namprd12.prod.outlook.com (2603:10b6:208:38e::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9320.17; Thu, 13 Nov 2025 16:08:50 +0000 Received: from CH1PEPF0000A34B.namprd04.prod.outlook.com (2603:10b6:610:11b:cafe::42) by CH0PR03CA0406.outlook.office365.com (2603:10b6:610:11b::14) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.9320.16 via Frontend Transport; Thu, 13 Nov 2025 16:08:47 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=satlexmb07.amd.com; pr=C Received: from satlexmb07.amd.com (165.204.84.17) by CH1PEPF0000A34B.mail.protection.outlook.com (10.167.244.10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9320.13 via Frontend Transport; Thu, 13 Nov 2025 16:08:50 +0000 Received: from FRAPPELLOUX01-WSLPUB.amd.com (10.180.168.240) by satlexmb07.amd.com (10.181.42.216) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.2562.17; Thu, 13 Nov 2025 08:08:47 -0800 From: Pierre-Eric Pelloux-Prayer To: Alex Deucher , =?UTF-8?q?Christian=20K=C3=B6nig?= , David Airlie , Simona Vetter , Felix Kuehling , Sumit Semwal CC: Pierre-Eric Pelloux-Prayer , , , , , Subject: [PATCH v2 05/20] drm/amdgpu: pass the entity to use to ttm functions Date: Thu, 13 Nov 2025 17:05:46 +0100 Message-ID: <20251113160632.5889-6-pierre-eric.pelloux-prayer@amd.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20251113160632.5889-1-pierre-eric.pelloux-prayer@amd.com> References: <20251113160632.5889-1-pierre-eric.pelloux-prayer@amd.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-ClientProxiedBy: satlexmb07.amd.com (10.181.42.216) To satlexmb07.amd.com (10.181.42.216) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CH1PEPF0000A34B:EE_|BL3PR12MB6595:EE_ X-MS-Office365-Filtering-Correlation-Id: 5fd695ab-cf5f-48b7-cf0b-08de22ceef09 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|36860700013|82310400026|376014; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?sG3CLsMoeFNFZbBJ0esQ6TPP81I8iXNDWpiixnMMmKAxXie+bv7ORRG1uOjA?= =?us-ascii?Q?XIgCgBntICs4/XnUg9xxlNFb5BSL5btapMM5Dr0AqxiZ9hqZkPgjKNRZTCMh?= =?us-ascii?Q?cMog2VpGg1Bk3YZJgmNiIqcSSfBq7sn96eku3gqpjXRY6LMspi5t3fO41Ipb?= =?us-ascii?Q?n7MpvuNf3ftgq23VdothVfg4OH0JvJXLsScjpCkR3mXpp3CfYAkiGFvq4eiO?= =?us-ascii?Q?6108SNReOSrJQuwmo7J2jbIpAqevXeIz/r/1d3J8dLOX5lZ5H1w1uZH2QA4b?= =?us-ascii?Q?pAgNcRhZknqYcKAZZNjmcV4KLxuk0IZ+3c7KsWqT/4RbOG824rA2wSw0bO2Y?= =?us-ascii?Q?vUQb0FU4tDsSA4n9cwanYk0irqUYtliFaCe5kGlz4yy7otCDu7j4FF6Z7q5I?= =?us-ascii?Q?u/WBRTUCBaFpEOChKvx0qxT1Care6Sy3vG2Du4pD7yxOmFskiTwmsFDcPvSd?= =?us-ascii?Q?5ziECyByVwsQS5meoYiYBm7kjZdC62x4OoTauzmsmAwpBV3twuAg+FzQgFS5?= =?us-ascii?Q?gXssuZSKqtXglXH2HGTJVsbiBo2FK8H05yEllZ4JhLCsFBgbcRUNpU4fqFjO?= =?us-ascii?Q?wJRoHlpG41XC2LB2e2IN0/MgEGlg8E3SLjmILBRGvftARs1+tj2BBx3tBI6X?= =?us-ascii?Q?sZO9aFvVYDDSCZDPq4TWl9UOP2a2Pc28oxd9ulHc6Ab1zzY3SEP8wk2TqAxA?= =?us-ascii?Q?9udDceGMQkNsKa5mZz9tzLyXI8jSaKbqmrzcZK422LCCsI454ica01F5dnLh?= =?us-ascii?Q?wR+RsJyWe7f2LYVH4bpZnhQt0OHJP1avD3u08gQGL6T4plYCh2aB9EuMmLFJ?= =?us-ascii?Q?rX7G9XV84zrbDfyVqc4xwnNCfoeM5VkwTbN84ayPQ71K3h49dSYC3Uw1GITI?= =?us-ascii?Q?CTZGSpXuk/ps28t/1572cvlaqvn0ehkvK2gBkwEi4nW68OtIHGmmJPc/HWEY?= =?us-ascii?Q?B33C4eKmP4nK/PYOsdeYpXGwvxTucbal1m5bhNCC/yC8c4fHbifbWYxTM+tE?= =?us-ascii?Q?7KAry/LSJaDlRY2EBFxmhVOneb/5D7S3sW6EKd2qz9oWvHVUUPlCjINuuH7X?= =?us-ascii?Q?l1wiw8SlKDiUXyWAPXh2fVj6PYb8mrPsBG3jJuTyvu+5T1KvFziQZ+WHCV6Z?= =?us-ascii?Q?/zBkUUFl0bbgM+ogdSxnREWJbPfGTGZMiI4wzDGe2hFiPmfPMLEao0D02rFc?= =?us-ascii?Q?J2vzOGykaM6+bjT6PjU+4RQAfGuOtyPAi0pxQTbULTAytkYengSOza1qyq41?= =?us-ascii?Q?LbWq7QmmHI7VSvyhQfxE/BIWCWETnZmynTaNVlP9E+fbXVj7u3XT86aT1vos?= =?us-ascii?Q?ExW9aYhopl4VkqPEYLxFI+W6s7Utz+Ji73ana6ZkhFF6FUbusXdtZXa8swhu?= =?us-ascii?Q?kv6yfDTFjnGHXWeL2SZlrtVDiyQI2ZRubUeZM1iz/5x6vKm7e5kIwb083hcB?= =?us-ascii?Q?sBEypyqZ9IJJNZ7lboYv0wSWfXr7r0swT+jpQcN7WMwjLdNrYhYRa2z+4b2Q?= =?us-ascii?Q?SxY60RSYpnxko6uMy65e6OCXML+kfZPiNqzGzGZERT8dePdnFiyp5/isMnNr?= =?us-ascii?Q?p+c8jsYIX1ZH/qi6pzk=3D?= X-Forefront-Antispam-Report: CIP:165.204.84.17;CTRY:US;LANG:en;SCL:1;SRV:;IPV:CAL;SFV:NSPM;H:satlexmb07.amd.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230040)(1800799024)(36860700013)(82310400026)(376014);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Nov 2025 16:08:50.1632 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 5fd695ab-cf5f-48b7-cf0b-08de22ceef09 X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d;Ip=[165.204.84.17];Helo=[satlexmb07.amd.com] X-MS-Exchange-CrossTenant-AuthSource: CH1PEPF0000A34B.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BL3PR12MB6595 Content-Type: text/plain; charset="utf-8" This way the caller can select the one it wants to use. Signed-off-by: Pierre-Eric Pelloux-Prayer Acked-by: Felix Kuehling --- drivers/gpu/drm/amd/amdgpu/amdgpu_benchmark.c | 3 +- drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 4 +- drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 75 +++++++++++-------- drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h | 16 ++-- drivers/gpu/drm/amd/amdkfd/kfd_migrate.c | 3 +- 5 files changed, 60 insertions(+), 41 deletions(-) diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_benchmark.c b/drivers/gpu/dr= m/amd/amdgpu/amdgpu_benchmark.c index 02c2479a8840..b59040a8771f 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_benchmark.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_benchmark.c @@ -38,7 +38,8 @@ static int amdgpu_benchmark_do_move(struct amdgpu_device = *adev, unsigned size, stime =3D ktime_get(); for (i =3D 0; i < n; i++) { struct amdgpu_ring *ring =3D adev->mman.buffer_funcs_ring; - r =3D amdgpu_copy_buffer(ring, saddr, daddr, size, NULL, &fence, + r =3D amdgpu_copy_buffer(ring, &adev->mman.default_entity.base, + saddr, daddr, size, NULL, &fence, false, 0); if (r) goto exit_do_move; diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c b/drivers/gpu/drm/a= md/amdgpu/amdgpu_object.c index e08f58de4b17..c06c132a753c 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c @@ -1321,8 +1321,8 @@ void amdgpu_bo_release_notify(struct ttm_buffer_objec= t *bo) if (r) goto out; =20 - r =3D amdgpu_fill_buffer(abo, 0, &bo->base._resv, &fence, true, - AMDGPU_KERNEL_JOB_ID_CLEAR_ON_RELEASE); + r =3D amdgpu_fill_buffer(&adev->mman.clear_entity, abo, 0, &bo->base._res= v, + &fence, AMDGPU_KERNEL_JOB_ID_CLEAR_ON_RELEASE); if (WARN_ON(r)) goto out; =20 diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c b/drivers/gpu/drm/amd/= amdgpu/amdgpu_ttm.c index 42d448cd6a6d..c8d59ca2b3bd 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c @@ -164,6 +164,7 @@ static void amdgpu_evict_flags(struct ttm_buffer_object= *bo, =20 /** * amdgpu_ttm_map_buffer - Map memory into the GART windows + * @entity: entity to run the window setup job * @bo: buffer object to map * @mem: memory object to map * @mm_cur: range to map @@ -176,7 +177,8 @@ static void amdgpu_evict_flags(struct ttm_buffer_object= *bo, * Setup one of the GART windows to access a specific piece of memory or r= eturn * the physical address for local memory. */ -static int amdgpu_ttm_map_buffer(struct ttm_buffer_object *bo, +static int amdgpu_ttm_map_buffer(struct drm_sched_entity *entity, + struct ttm_buffer_object *bo, struct ttm_resource *mem, struct amdgpu_res_cursor *mm_cur, unsigned int window, struct amdgpu_ring *ring, @@ -224,7 +226,7 @@ static int amdgpu_ttm_map_buffer(struct ttm_buffer_obje= ct *bo, num_dw =3D ALIGN(adev->mman.buffer_funcs->copy_num_dw, 8); num_bytes =3D num_pages * 8 * AMDGPU_GPU_PAGES_IN_CPU_PAGE; =20 - r =3D amdgpu_job_alloc_with_ib(adev, &adev->mman.default_entity.base, + r =3D amdgpu_job_alloc_with_ib(adev, entity, AMDGPU_FENCE_OWNER_UNDEFINED, num_dw * 4 + num_bytes, AMDGPU_IB_POOL_DELAYED, &job, @@ -274,6 +276,7 @@ static int amdgpu_ttm_map_buffer(struct ttm_buffer_obje= ct *bo, /** * amdgpu_ttm_copy_mem_to_mem - Helper function for copy * @adev: amdgpu device + * @entity: entity to run the jobs * @src: buffer/address where to read from * @dst: buffer/address where to write to * @size: number of bytes to copy @@ -288,6 +291,7 @@ static int amdgpu_ttm_map_buffer(struct ttm_buffer_obje= ct *bo, */ __attribute__((nonnull)) static int amdgpu_ttm_copy_mem_to_mem(struct amdgpu_device *adev, + struct drm_sched_entity *entity, const struct amdgpu_copy_mem *src, const struct amdgpu_copy_mem *dst, uint64_t size, bool tmz, @@ -320,12 +324,14 @@ static int amdgpu_ttm_copy_mem_to_mem(struct amdgpu_d= evice *adev, cur_size =3D min3(src_mm.size, dst_mm.size, 256ULL << 20); =20 /* Map src to window 0 and dst to window 1. */ - r =3D amdgpu_ttm_map_buffer(src->bo, src->mem, &src_mm, + r =3D amdgpu_ttm_map_buffer(entity, + src->bo, src->mem, &src_mm, 0, ring, tmz, &cur_size, &from); if (r) goto error; =20 - r =3D amdgpu_ttm_map_buffer(dst->bo, dst->mem, &dst_mm, + r =3D amdgpu_ttm_map_buffer(entity, + dst->bo, dst->mem, &dst_mm, 1, ring, tmz, &cur_size, &to); if (r) goto error; @@ -353,7 +359,7 @@ static int amdgpu_ttm_copy_mem_to_mem(struct amdgpu_dev= ice *adev, write_compress_disable)); } =20 - r =3D amdgpu_copy_buffer(ring, from, to, cur_size, resv, + r =3D amdgpu_copy_buffer(ring, entity, from, to, cur_size, resv, &next, true, copy_flags); if (r) goto error; @@ -394,7 +400,9 @@ static int amdgpu_move_blit(struct ttm_buffer_object *b= o, src.offset =3D 0; dst.offset =3D 0; =20 - r =3D amdgpu_ttm_copy_mem_to_mem(adev, &src, &dst, + r =3D amdgpu_ttm_copy_mem_to_mem(adev, + &adev->mman.move_entity.base, + &src, &dst, new_mem->size, amdgpu_bo_encrypted(abo), bo->base.resv, &fence); @@ -406,8 +414,9 @@ static int amdgpu_move_blit(struct ttm_buffer_object *b= o, (abo->flags & AMDGPU_GEM_CREATE_VRAM_WIPE_ON_RELEASE)) { struct dma_fence *wipe_fence =3D NULL; =20 - r =3D amdgpu_fill_buffer(abo, 0, NULL, &wipe_fence, - false, AMDGPU_KERNEL_JOB_ID_MOVE_BLIT); + r =3D amdgpu_fill_buffer(&adev->mman.move_entity, + abo, 0, NULL, &wipe_fence, + AMDGPU_KERNEL_JOB_ID_MOVE_BLIT); if (r) { goto error; } else if (wipe_fence) { @@ -2223,16 +2232,15 @@ void amdgpu_ttm_set_buffer_funcs_status(struct amdg= pu_device *adev, bool enable) } =20 static int amdgpu_ttm_prepare_job(struct amdgpu_device *adev, + struct drm_sched_entity *entity, unsigned int num_dw, struct dma_resv *resv, bool vm_needs_flush, struct amdgpu_job **job, - bool delayed, u64 k_job_id) + u64 k_job_id) { enum amdgpu_ib_pool_type pool =3D AMDGPU_IB_POOL_DELAYED; int r; - struct drm_sched_entity *entity =3D delayed ? &adev->mman.clear_entity.ba= se : - &adev->mman.move_entity.base; r =3D amdgpu_job_alloc_with_ib(adev, entity, AMDGPU_FENCE_OWNER_UNDEFINED, num_dw * 4, pool, job, k_job_id); @@ -2252,7 +2260,9 @@ static int amdgpu_ttm_prepare_job(struct amdgpu_devic= e *adev, DMA_RESV_USAGE_BOOKKEEP); } =20 -int amdgpu_copy_buffer(struct amdgpu_ring *ring, uint64_t src_offset, +int amdgpu_copy_buffer(struct amdgpu_ring *ring, + struct drm_sched_entity *entity, + uint64_t src_offset, uint64_t dst_offset, uint32_t byte_count, struct dma_resv *resv, struct dma_fence **fence, @@ -2274,8 +2284,8 @@ int amdgpu_copy_buffer(struct amdgpu_ring *ring, uint= 64_t src_offset, max_bytes =3D adev->mman.buffer_funcs->copy_max_bytes; num_loops =3D DIV_ROUND_UP(byte_count, max_bytes); num_dw =3D ALIGN(num_loops * adev->mman.buffer_funcs->copy_num_dw, 8); - r =3D amdgpu_ttm_prepare_job(adev, num_dw, - resv, vm_needs_flush, &job, false, + r =3D amdgpu_ttm_prepare_job(adev, entity, num_dw, + resv, vm_needs_flush, &job, AMDGPU_KERNEL_JOB_ID_TTM_COPY_BUFFER); if (r) return r; @@ -2304,11 +2314,13 @@ int amdgpu_copy_buffer(struct amdgpu_ring *ring, ui= nt64_t src_offset, return r; } =20 -static int amdgpu_ttm_fill_mem(struct amdgpu_ring *ring, uint32_t src_data, +static int amdgpu_ttm_fill_mem(struct amdgpu_ring *ring, + struct drm_sched_entity *entity, + uint32_t src_data, uint64_t dst_addr, uint32_t byte_count, struct dma_resv *resv, struct dma_fence **fence, - bool vm_needs_flush, bool delayed, + bool vm_needs_flush, u64 k_job_id) { struct amdgpu_device *adev =3D ring->adev; @@ -2321,8 +2333,8 @@ static int amdgpu_ttm_fill_mem(struct amdgpu_ring *ri= ng, uint32_t src_data, max_bytes =3D adev->mman.buffer_funcs->fill_max_bytes; num_loops =3D DIV_ROUND_UP_ULL(byte_count, max_bytes); num_dw =3D ALIGN(num_loops * adev->mman.buffer_funcs->fill_num_dw, 8); - r =3D amdgpu_ttm_prepare_job(adev, num_dw, resv, vm_needs_flush, - &job, delayed, k_job_id); + r =3D amdgpu_ttm_prepare_job(adev, entity, num_dw, resv, + vm_needs_flush, &job, k_job_id); if (r) return r; =20 @@ -2386,13 +2398,14 @@ int amdgpu_ttm_clear_buffer(struct amdgpu_bo *bo, /* Never clear more than 256MiB at once to avoid timeouts */ size =3D min(cursor.size, 256ULL << 20); =20 - r =3D amdgpu_ttm_map_buffer(&bo->tbo, bo->tbo.resource, &cursor, + r =3D amdgpu_ttm_map_buffer(&adev->mman.clear_entity.base, + &bo->tbo, bo->tbo.resource, &cursor, 1, ring, false, &size, &addr); if (r) goto err; =20 - r =3D amdgpu_ttm_fill_mem(ring, 0, addr, size, resv, - &next, true, true, + r =3D amdgpu_ttm_fill_mem(ring, &adev->mman.clear_entity.base, 0, addr, = size, resv, + &next, true, AMDGPU_KERNEL_JOB_ID_TTM_CLEAR_BUFFER); if (r) goto err; @@ -2408,12 +2421,12 @@ int amdgpu_ttm_clear_buffer(struct amdgpu_bo *bo, return r; } =20 -int amdgpu_fill_buffer(struct amdgpu_bo *bo, - uint32_t src_data, - struct dma_resv *resv, - struct dma_fence **f, - bool delayed, - u64 k_job_id) +int amdgpu_fill_buffer(struct amdgpu_ttm_entity *entity, + struct amdgpu_bo *bo, + uint32_t src_data, + struct dma_resv *resv, + struct dma_fence **f, + u64 k_job_id) { struct amdgpu_device *adev =3D amdgpu_ttm_adev(bo->tbo.bdev); struct amdgpu_ring *ring =3D adev->mman.buffer_funcs_ring; @@ -2437,13 +2450,15 @@ int amdgpu_fill_buffer(struct amdgpu_bo *bo, /* Never fill more than 256MiB at once to avoid timeouts */ cur_size =3D min(dst.size, 256ULL << 20); =20 - r =3D amdgpu_ttm_map_buffer(&bo->tbo, bo->tbo.resource, &dst, + r =3D amdgpu_ttm_map_buffer(&entity->base, + &bo->tbo, bo->tbo.resource, &dst, 1, ring, false, &cur_size, &to); if (r) goto error; =20 - r =3D amdgpu_ttm_fill_mem(ring, src_data, to, cur_size, resv, - &next, true, delayed, k_job_id); + r =3D amdgpu_ttm_fill_mem(ring, &entity->base, + src_data, to, cur_size, resv, + &next, true, k_job_id); if (r) goto error; =20 diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h b/drivers/gpu/drm/amd/= amdgpu/amdgpu_ttm.h index d2295d6c2b67..e1655f86a016 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h @@ -167,7 +167,9 @@ int amdgpu_ttm_init(struct amdgpu_device *adev); void amdgpu_ttm_fini(struct amdgpu_device *adev); void amdgpu_ttm_set_buffer_funcs_status(struct amdgpu_device *adev, bool enable); -int amdgpu_copy_buffer(struct amdgpu_ring *ring, uint64_t src_offset, +int amdgpu_copy_buffer(struct amdgpu_ring *ring, + struct drm_sched_entity *entity, + uint64_t src_offset, uint64_t dst_offset, uint32_t byte_count, struct dma_resv *resv, struct dma_fence **fence, @@ -175,12 +177,12 @@ int amdgpu_copy_buffer(struct amdgpu_ring *ring, uint= 64_t src_offset, int amdgpu_ttm_clear_buffer(struct amdgpu_bo *bo, struct dma_resv *resv, struct dma_fence **fence); -int amdgpu_fill_buffer(struct amdgpu_bo *bo, - uint32_t src_data, - struct dma_resv *resv, - struct dma_fence **fence, - bool delayed, - u64 k_job_id); +int amdgpu_fill_buffer(struct amdgpu_ttm_entity *entity, + struct amdgpu_bo *bo, + uint32_t src_data, + struct dma_resv *resv, + struct dma_fence **f, + u64 k_job_id); =20 int amdgpu_ttm_alloc_gart(struct ttm_buffer_object *bo); void amdgpu_ttm_recover_gart(struct ttm_buffer_object *tbo); diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_migrate.c b/drivers/gpu/drm/amd= /amdkfd/kfd_migrate.c index d74ff6e90590..09756132fa1b 100644 --- a/drivers/gpu/drm/amd/amdkfd/kfd_migrate.c +++ b/drivers/gpu/drm/amd/amdkfd/kfd_migrate.c @@ -157,7 +157,8 @@ svm_migrate_copy_memory_gart(struct amdgpu_device *adev= , dma_addr_t *sys, goto out_unlock; } =20 - r =3D amdgpu_copy_buffer(ring, gart_s, gart_d, size * PAGE_SIZE, + r =3D amdgpu_copy_buffer(ring, &entity->base, + gart_s, gart_d, size * PAGE_SIZE, NULL, &next, true, 0); if (r) { dev_err(adev->dev, "fail %d to copy memory\n", r); --=20 2.43.0 From nobody Sat Feb 7 20:28:07 2026 Received: from PH0PR06CU001.outbound.protection.outlook.com (mail-westus3azon11011023.outbound.protection.outlook.com [40.107.208.23]) (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 19F69359F83 for ; Thu, 13 Nov 2025 16:09:05 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.208.23 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763050147; cv=fail; b=CbsS2h+vv1ZHCJrIbRNiu8D9B4dtIX/F2558Af1hm+E9c0pC8JSe4x5rxquVwOhCuicl+LQ4TMArwdGO+sOqGwXRBTEqMvIY166XMtaVsPTczg46Ko7qTbebijWsLxhmzosc1YfZnwxR5fYXkodgXoMIb0/JO9L4TzjKoPrKB9w= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763050147; c=relaxed/simple; bh=Kdw/bN828aO0lR8ols40yq9KDSQkDPx6WiY78IQlC3Y=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=CcekgrQiRKkZIXBnO1qs3ahl1uyxJEVzGu4tZbwvBqeCDh9B3dO9udvt5GT2wKCKTne4YrTwhrsro9SN7ABbtWcPT0dFoNtjwKP+Tr66WolMPw0jtVwvvV6E/+iLycPLp4Vkem35diNtcMkb1S/jqwZ1jPju5LkkrBjyCW8/xH0= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amd.com; spf=fail smtp.mailfrom=amd.com; dkim=pass (1024-bit key) header.d=amd.com header.i=@amd.com header.b=aOZYjczY; arc=fail smtp.client-ip=40.107.208.23 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amd.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=amd.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=amd.com header.i=@amd.com header.b="aOZYjczY" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=REska99V12yWANAW2sS22ALuBtaa2Fx3BgmXBGiAGCTXFVqXnkvqMOhCdRqzmtla2VgpZYPloDdRcdsL6x28ApGPA9LNF97wgVmt1PSHFD5+HGNcZ2Da8PRmkm63LToEUMj8iIvzib1LBZ2uFwQyr/itgJdXFpbEjcFmt1XSMSe2UwkWct1ZhCoG/InMowf9A8KsSVy0YJ/Ts4uaSrOs6HHeBBqxeJNHcyiiafU6CdzWz3Myt87Aj9MIGZmw7PmSp9UkBLTW1wWbQEo3ThnTxU1Oj7gVqtjBbOz6qVlLzjujASyciCD8s/4C9DeocQXKkgEr0kpoFvJrNbyF1iV67Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=78ZkSTiA49OEqnuHu5gVkr7/CfpOTZLtY5ddvNJY+HQ=; b=VVUN0+Gq0kK+dYPrwVRM5SAv7Z5lx0BHfdLrmmm6N/x6pMUUvgzkd3UQO40mF17YjAouhN8bJG4aKP71CKD83WOy1myaDzk/fHXf5UD15RugtTbe9Uk2/fzyPlK7tRgYQzFvCnrAAPA3g6C6mnuB65TVDliE8drmscN4X9Pi1UVnHqc/yQGV1z5njqKwV2vdpZfqp5yk3E1ssR6nKXfGXluhvQ1UNoZl6qSzR9GjUf7ojtJRwsVYp7HIXIirWE0oI0eQw6TBQ5NOvxxpvwKiv4zesxXqi639eZuEyrMyQF+MOL6yksi0zpGUfM1qsn0OFxqKJznT5ov4vx6S1GW0sQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=gmail.com smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=78ZkSTiA49OEqnuHu5gVkr7/CfpOTZLtY5ddvNJY+HQ=; b=aOZYjczYlJdQUKf/bzUeJlr0xPHw1tzOyLkuJ57Ay0VHuqiA7xmqtCkBIUmSMaFBWi+ex/ooaxhiypZtkJHgNkEdXIt3qPogu6ZKxvE/wNn74JUZo7SWp17p4xmYIaQYwxXalGnsWdpWPCQVW80UEFXM3rWhNU/tClPALwfdZOs= Received: from CH0PR03CA0396.namprd03.prod.outlook.com (2603:10b6:610:11b::16) by CH3PR12MB7524.namprd12.prod.outlook.com (2603:10b6:610:146::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9320.17; Thu, 13 Nov 2025 16:09:03 +0000 Received: from CH1PEPF0000A34B.namprd04.prod.outlook.com (2603:10b6:610:11b:cafe::c0) by CH0PR03CA0396.outlook.office365.com (2603:10b6:610:11b::16) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.9320.17 via Frontend Transport; Thu, 13 Nov 2025 16:09:00 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=satlexmb07.amd.com; pr=C Received: from satlexmb07.amd.com (165.204.84.17) by CH1PEPF0000A34B.mail.protection.outlook.com (10.167.244.10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9320.13 via Frontend Transport; Thu, 13 Nov 2025 16:09:00 +0000 Received: from FRAPPELLOUX01-WSLPUB.amd.com (10.180.168.240) by satlexmb07.amd.com (10.181.42.216) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.2562.17; Thu, 13 Nov 2025 08:08:58 -0800 From: Pierre-Eric Pelloux-Prayer To: Alex Deucher , =?UTF-8?q?Christian=20K=C3=B6nig?= , David Airlie , Simona Vetter , Felix Kuehling CC: Pierre-Eric Pelloux-Prayer , , , Subject: [PATCH v2 06/20] drm/amdgpu: statically assign gart windows to ttm entities Date: Thu, 13 Nov 2025 17:05:47 +0100 Message-ID: <20251113160632.5889-7-pierre-eric.pelloux-prayer@amd.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20251113160632.5889-1-pierre-eric.pelloux-prayer@amd.com> References: <20251113160632.5889-1-pierre-eric.pelloux-prayer@amd.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-ClientProxiedBy: satlexmb07.amd.com (10.181.42.216) To satlexmb07.amd.com (10.181.42.216) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CH1PEPF0000A34B:EE_|CH3PR12MB7524:EE_ X-MS-Office365-Filtering-Correlation-Id: 91069092-8051-41d5-9a9e-08de22cef571 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|36860700013|82310400026|376014; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?ldNfTL3w9Y0ryxVl+M/GvXzsuHNHx5objROg1WYNBxhOeVCzkbcm9Qa0GyBA?= =?us-ascii?Q?sNz0Frn+OuUSZExTnhM4Fnv/K0zG/7ZKtRmBt9vVSpx76F0DhEhh0KGNPaVy?= =?us-ascii?Q?f8C3HAY33bRIIWbsIPrjtY/PfQaxp/tb9zG3EZg+MX7/xAjaBtqGg4Mwr9pm?= =?us-ascii?Q?7jvPxcad/b5P2LZlKFZV4wEWQzAotMu+yBg21lRB6hulGfzxYWUcG71rRm9Q?= =?us-ascii?Q?Npaum+pU8ho/24sEH5+LJ1PzaXP+U/gqwE33NxxCLn3yWkWkKLW+joLG41Sd?= =?us-ascii?Q?bEQZAyuiEF4wDnF7LPeoL8gcL1yz4mucQu5gitlOA3bsftQuLC+rhzRTJ6Pi?= =?us-ascii?Q?rfB5+UB7AqsoipCNxA7XpwszMgKhmrEs/XPDyoqDCyP+c9D3IEkdzfb8JMiD?= =?us-ascii?Q?nx2cbZiGhGrphq8ZirSdsQm07HribeWSKfv63YUPMLJ7rMv/yIZRj7h8Q+29?= =?us-ascii?Q?LqVefCFdQZIwQpxGjoZ1Fl1RhmPPw4QMMjZZaaVhZrGrfw3QyfyzZZJlKf3p?= =?us-ascii?Q?IUFeG5TnZfBYF3eacrvqUWD2q4xwzFLoVNUJlsfYAZq8XXq6dESowhh162Lv?= =?us-ascii?Q?BxMFJP5z5AUNEPtXM9xxgPsmx/SSGrTlagsN/ciQJN25cSI/i+D/ev0fMD8z?= =?us-ascii?Q?VY78VWlvowD5zm708s+nOwe5X4wuVWMSK2+Nddsn5J9kgR3drHaoUqM1mHz4?= =?us-ascii?Q?5I1hG9clCg0sKriLRPvnxWB8H7o9u2YUDSu/KKyRP4yi4Sm3Urv1ygno7n6b?= =?us-ascii?Q?e2qfp2AA8ltFPFakx4N5274IMESXC1SsjTQpDboOjCKxatKo7mxuVGodJnc8?= =?us-ascii?Q?UNQN9nn5RlM66BskZHINIh3nS69VHPse7S+6gnl7NvJKzQU9G+fyLMTBQMO4?= =?us-ascii?Q?TJvVtJQXCo67oylvP4YrNR0yf+1fzEstpJ8qn5sRjdTrkaL7xKVimqRNK0vp?= =?us-ascii?Q?kok8CZ+HUQewj2reth1cwVf8n4zJb9wJB3bdFxhY7RttV1tq2BaBff5EMlhI?= =?us-ascii?Q?gP+cKgSsmgtDRLvej8Kz5cyYxgMOuv9jt6hF6pHTaqhOqrb/5rkTvQjKWSpv?= =?us-ascii?Q?0p+ZVcYL7d4Nl9Yvqt9RuAR7JYqgzKDafiX5EfiqzihGOXbwMVjcBGARE7y0?= =?us-ascii?Q?n83gn1pQJxPESmhML/XDNXYaKYpAoccougFBQ5vkuCflL00Ih5ejInSYBKqC?= =?us-ascii?Q?oOcMYG5itHQgLuduBjauitUJgBajaM/dGO8t5JYfZD0WDBQmHN1odwDoedAu?= =?us-ascii?Q?eVmD6MVlGE26VFpCG91/DRTL53ZKnqcVKOMaBbifuoF8GNcwXW4sapOL5Dlk?= =?us-ascii?Q?cBrRaj77pOzeGNKr0wBk8FL97ZcSCdtR7TlqoMJntjk3YtEdJ+CzVVjvJ8cp?= =?us-ascii?Q?zGAwheXBk/cZ/G6dBLBXyLeYfybpCoW5PkNtQP8FDXFcgy20EcBnlG28urJI?= =?us-ascii?Q?SkHGEQl3HnlhK/kUe+65lI0NtRyGcR/Lv9vwSNmKlaOF0YikI+wd4VXjmoVw?= =?us-ascii?Q?aGRML69P1URdZG9d6MpLLoeH6q4BiQI+zrCvTZcCehilFUcnKwgSzYocJicr?= =?us-ascii?Q?pTKm9oZcLKhLdsggxPM=3D?= X-Forefront-Antispam-Report: CIP:165.204.84.17;CTRY:US;LANG:en;SCL:1;SRV:;IPV:CAL;SFV:NSPM;H:satlexmb07.amd.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230040)(1800799024)(36860700013)(82310400026)(376014);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Nov 2025 16:09:00.9147 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 91069092-8051-41d5-9a9e-08de22cef571 X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d;Ip=[165.204.84.17];Helo=[satlexmb07.amd.com] X-MS-Exchange-CrossTenant-AuthSource: CH1PEPF0000A34B.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH3PR12MB7524 Content-Type: text/plain; charset="utf-8" If multiple entities share the same window we must make sure that jobs using them are executed sequentially. This commit gives separate window id to each entity, so jobs from multiple entities could execute in parallel if needed. (for now they all use the first sdma engine, so it makes no difference yet). default_entity doesn't get any windows reserved since there is no use for them. Signed-off-by: Pierre-Eric Pelloux-Prayer --- drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c | 9 +++-- drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 50 ++++++++++++++---------- drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h | 9 +++-- drivers/gpu/drm/amd/amdkfd/kfd_migrate.c | 8 ++-- 4 files changed, 46 insertions(+), 30 deletions(-) diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c b/drivers/gpu/drm/amd/= amdgpu/amdgpu_gmc.c index 8e2d41c9c271..2a444d02cf4b 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c @@ -686,7 +686,8 @@ void amdgpu_gmc_flush_gpu_tlb(struct amdgpu_device *ade= v, uint32_t vmid, * translation. Avoid this by doing the invalidation from the SDMA * itself at least for GART. */ - mutex_lock(&adev->mman.gtt_window_lock); + mutex_lock(&adev->mman.clear_entity.gart_window_lock); + mutex_lock(&adev->mman.move_entity.gart_window_lock); r =3D amdgpu_job_alloc_with_ib(ring->adev, &adev->mman.default_entity.bas= e, AMDGPU_FENCE_OWNER_UNDEFINED, 16 * 4, AMDGPU_IB_POOL_IMMEDIATE, @@ -699,7 +700,8 @@ void amdgpu_gmc_flush_gpu_tlb(struct amdgpu_device *ade= v, uint32_t vmid, job->ibs->ptr[job->ibs->length_dw++] =3D ring->funcs->nop; amdgpu_ring_pad_ib(ring, &job->ibs[0]); fence =3D amdgpu_job_submit(job); - mutex_unlock(&adev->mman.gtt_window_lock); + mutex_unlock(&adev->mman.move_entity.gart_window_lock); + mutex_unlock(&adev->mman.clear_entity.gart_window_lock); =20 dma_fence_wait(fence, false); dma_fence_put(fence); @@ -707,7 +709,8 @@ void amdgpu_gmc_flush_gpu_tlb(struct amdgpu_device *ade= v, uint32_t vmid, return; =20 error_alloc: - mutex_unlock(&adev->mman.gtt_window_lock); + mutex_unlock(&adev->mman.move_entity.gart_window_lock); + mutex_unlock(&adev->mman.clear_entity.gart_window_lock); dev_err(adev->dev, "Error flushing GPU TLB using the SDMA (%d)!\n", r); } =20 diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c b/drivers/gpu/drm/amd/= amdgpu/amdgpu_ttm.c index c8d59ca2b3bd..7193a341689d 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c @@ -291,7 +291,7 @@ static int amdgpu_ttm_map_buffer(struct drm_sched_entit= y *entity, */ __attribute__((nonnull)) static int amdgpu_ttm_copy_mem_to_mem(struct amdgpu_device *adev, - struct drm_sched_entity *entity, + struct amdgpu_ttm_buffer_entity *entity, const struct amdgpu_copy_mem *src, const struct amdgpu_copy_mem *dst, uint64_t size, bool tmz, @@ -314,7 +314,7 @@ static int amdgpu_ttm_copy_mem_to_mem(struct amdgpu_dev= ice *adev, amdgpu_res_first(src->mem, src->offset, size, &src_mm); amdgpu_res_first(dst->mem, dst->offset, size, &dst_mm); =20 - mutex_lock(&adev->mman.gtt_window_lock); + mutex_lock(&entity->gart_window_lock); while (src_mm.remaining) { uint64_t from, to, cur_size, tiling_flags; uint32_t num_type, data_format, max_com, write_compress_disable; @@ -324,15 +324,15 @@ static int amdgpu_ttm_copy_mem_to_mem(struct amdgpu_d= evice *adev, cur_size =3D min3(src_mm.size, dst_mm.size, 256ULL << 20); =20 /* Map src to window 0 and dst to window 1. */ - r =3D amdgpu_ttm_map_buffer(entity, + r =3D amdgpu_ttm_map_buffer(&entity->base, src->bo, src->mem, &src_mm, - 0, ring, tmz, &cur_size, &from); + entity->gart_window_id0, ring, tmz, &cur_size, &from); if (r) goto error; =20 - r =3D amdgpu_ttm_map_buffer(entity, + r =3D amdgpu_ttm_map_buffer(&entity->base, dst->bo, dst->mem, &dst_mm, - 1, ring, tmz, &cur_size, &to); + entity->gart_window_id1, ring, tmz, &cur_size, &to); if (r) goto error; =20 @@ -359,7 +359,7 @@ static int amdgpu_ttm_copy_mem_to_mem(struct amdgpu_dev= ice *adev, write_compress_disable)); } =20 - r =3D amdgpu_copy_buffer(ring, entity, from, to, cur_size, resv, + r =3D amdgpu_copy_buffer(ring, &entity->base, from, to, cur_size, resv, &next, true, copy_flags); if (r) goto error; @@ -371,7 +371,7 @@ static int amdgpu_ttm_copy_mem_to_mem(struct amdgpu_dev= ice *adev, amdgpu_res_next(&dst_mm, cur_size); } error: - mutex_unlock(&adev->mman.gtt_window_lock); + mutex_unlock(&entity->gart_window_lock); *f =3D fence; return r; } @@ -401,7 +401,7 @@ static int amdgpu_move_blit(struct ttm_buffer_object *b= o, dst.offset =3D 0; =20 r =3D amdgpu_ttm_copy_mem_to_mem(adev, - &adev->mman.move_entity.base, + &adev->mman.move_entity, &src, &dst, new_mem->size, amdgpu_bo_encrypted(abo), @@ -1893,8 +1893,6 @@ int amdgpu_ttm_init(struct amdgpu_device *adev) uint64_t gtt_size; int r; =20 - mutex_init(&adev->mman.gtt_window_lock); - dma_set_max_seg_size(adev->dev, UINT_MAX); /* No others user of address space so set it to 0 */ r =3D ttm_device_init(&adev->mman.bdev, &amdgpu_bo_driver, adev->dev, @@ -2207,6 +2205,15 @@ void amdgpu_ttm_set_buffer_funcs_status(struct amdgp= u_device *adev, bool enable) drm_sched_entity_destroy(&adev->mman.clear_entity.base); goto error_free_entity; } + + /* Statically assign GART windows to each entity. */ + mutex_init(&adev->mman.default_entity.gart_window_lock); + adev->mman.move_entity.gart_window_id0 =3D 0; + adev->mman.move_entity.gart_window_id1 =3D 1; + mutex_init(&adev->mman.move_entity.gart_window_lock); + /* Clearing entity doesn't use id0 */ + adev->mman.clear_entity.gart_window_id1 =3D 2; + mutex_init(&adev->mman.clear_entity.gart_window_lock); } else { drm_sched_entity_destroy(&adev->mman.default_entity.base); drm_sched_entity_destroy(&adev->mman.clear_entity.base); @@ -2371,6 +2378,7 @@ int amdgpu_ttm_clear_buffer(struct amdgpu_bo *bo, { struct amdgpu_device *adev =3D amdgpu_ttm_adev(bo->tbo.bdev); struct amdgpu_ring *ring =3D adev->mman.buffer_funcs_ring; + struct amdgpu_ttm_buffer_entity *entity; struct amdgpu_res_cursor cursor; u64 addr; int r =3D 0; @@ -2381,11 +2389,12 @@ int amdgpu_ttm_clear_buffer(struct amdgpu_bo *bo, if (!fence) return -EINVAL; =20 + entity =3D &adev->mman.clear_entity; *fence =3D dma_fence_get_stub(); =20 amdgpu_res_first(bo->tbo.resource, 0, amdgpu_bo_size(bo), &cursor); =20 - mutex_lock(&adev->mman.gtt_window_lock); + mutex_lock(&entity->gart_window_lock); while (cursor.remaining) { struct dma_fence *next =3D NULL; u64 size; @@ -2398,13 +2407,13 @@ int amdgpu_ttm_clear_buffer(struct amdgpu_bo *bo, /* Never clear more than 256MiB at once to avoid timeouts */ size =3D min(cursor.size, 256ULL << 20); =20 - r =3D amdgpu_ttm_map_buffer(&adev->mman.clear_entity.base, + r =3D amdgpu_ttm_map_buffer(&entity->base, &bo->tbo, bo->tbo.resource, &cursor, - 1, ring, false, &size, &addr); + entity->gart_window_id1, ring, false, &size, &addr); if (r) goto err; =20 - r =3D amdgpu_ttm_fill_mem(ring, &adev->mman.clear_entity.base, 0, addr, = size, resv, + r =3D amdgpu_ttm_fill_mem(ring, &entity->base, 0, addr, size, resv, &next, true, AMDGPU_KERNEL_JOB_ID_TTM_CLEAR_BUFFER); if (r) @@ -2416,12 +2425,12 @@ int amdgpu_ttm_clear_buffer(struct amdgpu_bo *bo, amdgpu_res_next(&cursor, size); } err: - mutex_unlock(&adev->mman.gtt_window_lock); + mutex_unlock(&entity->gart_window_lock); =20 return r; } =20 -int amdgpu_fill_buffer(struct amdgpu_ttm_entity *entity, +int amdgpu_fill_buffer(struct amdgpu_ttm_buffer_entity *entity, struct amdgpu_bo *bo, uint32_t src_data, struct dma_resv *resv, @@ -2442,7 +2451,7 @@ int amdgpu_fill_buffer(struct amdgpu_ttm_entity *enti= ty, =20 amdgpu_res_first(bo->tbo.resource, 0, amdgpu_bo_size(bo), &dst); =20 - mutex_lock(&adev->mman.gtt_window_lock); + mutex_lock(&entity->gart_window_lock); while (dst.remaining) { struct dma_fence *next; uint64_t cur_size, to; @@ -2452,7 +2461,8 @@ int amdgpu_fill_buffer(struct amdgpu_ttm_entity *enti= ty, =20 r =3D amdgpu_ttm_map_buffer(&entity->base, &bo->tbo, bo->tbo.resource, &dst, - 1, ring, false, &cur_size, &to); + entity->gart_window_id1, ring, false, + &cur_size, &to); if (r) goto error; =20 @@ -2468,7 +2478,7 @@ int amdgpu_fill_buffer(struct amdgpu_ttm_entity *enti= ty, amdgpu_res_next(&dst, cur_size); } error: - mutex_unlock(&adev->mman.gtt_window_lock); + mutex_unlock(&entity->gart_window_lock); if (f) *f =3D dma_fence_get(fence); dma_fence_put(fence); diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h b/drivers/gpu/drm/amd/= amdgpu/amdgpu_ttm.h index e1655f86a016..f4f762be9fdd 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h @@ -39,7 +39,7 @@ #define __AMDGPU_PL_NUM (TTM_PL_PRIV + 6) =20 #define AMDGPU_GTT_MAX_TRANSFER_SIZE 512 -#define AMDGPU_GTT_NUM_TRANSFER_WINDOWS 2 +#define AMDGPU_GTT_NUM_TRANSFER_WINDOWS 3 =20 extern const struct attribute_group amdgpu_vram_mgr_attr_group; extern const struct attribute_group amdgpu_gtt_mgr_attr_group; @@ -54,6 +54,9 @@ struct amdgpu_gtt_mgr { =20 struct amdgpu_ttm_buffer_entity { struct drm_sched_entity base; + struct mutex gart_window_lock; + u32 gart_window_id0; + u32 gart_window_id1; }; =20 struct amdgpu_mman { @@ -69,7 +72,7 @@ struct amdgpu_mman { =20 struct mutex gtt_window_lock; =20 - struct amdgpu_ttm_buffer_entity default_entity; + struct amdgpu_ttm_buffer_entity default_entity; /* has no gart windows */ struct amdgpu_ttm_buffer_entity clear_entity; struct amdgpu_ttm_buffer_entity move_entity; =20 @@ -177,7 +180,7 @@ int amdgpu_copy_buffer(struct amdgpu_ring *ring, int amdgpu_ttm_clear_buffer(struct amdgpu_bo *bo, struct dma_resv *resv, struct dma_fence **fence); -int amdgpu_fill_buffer(struct amdgpu_ttm_entity *entity, +int amdgpu_fill_buffer(struct amdgpu_ttm_buffer_entity *entity, struct amdgpu_bo *bo, uint32_t src_data, struct dma_resv *resv, diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_migrate.c b/drivers/gpu/drm/amd= /amdkfd/kfd_migrate.c index 09756132fa1b..bc47fc362a17 100644 --- a/drivers/gpu/drm/amd/amdkfd/kfd_migrate.c +++ b/drivers/gpu/drm/amd/amdkfd/kfd_migrate.c @@ -60,7 +60,7 @@ svm_migrate_gart_map(struct amdgpu_ring *ring, int r; =20 /* use gart window 0 */ - *gart_addr =3D adev->gmc.gart_start; + *gart_addr =3D entity->gart_window_id0; =20 num_dw =3D ALIGN(adev->mman.buffer_funcs->copy_num_dw, 8); num_bytes =3D npages * 8; @@ -116,7 +116,7 @@ svm_migrate_gart_map(struct amdgpu_ring *ring, * multiple GTT_MAX_PAGES transfer, all sdma operations are serialized, wa= it for * the last sdma finish fence which is returned to check copy memory is do= ne. * - * Context: Process context, takes and releases gtt_window_lock + * Context: Process context, takes and releases gart_window_lock * * Return: * 0 - OK, otherwise error code @@ -138,7 +138,7 @@ svm_migrate_copy_memory_gart(struct amdgpu_device *adev= , dma_addr_t *sys, =20 entity =3D &adev->mman.move_entity; =20 - mutex_lock(&adev->mman.gtt_window_lock); + mutex_lock(&entity->gart_window_lock); =20 while (npages) { size =3D min(GTT_MAX_PAGES, npages); @@ -175,7 +175,7 @@ svm_migrate_copy_memory_gart(struct amdgpu_device *adev= , dma_addr_t *sys, } =20 out_unlock: - mutex_unlock(&adev->mman.gtt_window_lock); + mutex_unlock(&entity->gart_window_lock); =20 return r; } --=20 2.43.0 From nobody Sat Feb 7 20:28:07 2026 Received: from CO1PR03CU002.outbound.protection.outlook.com (mail-westus2azon11010013.outbound.protection.outlook.com [52.101.46.13]) (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 27E76358D0D for ; Thu, 13 Nov 2025 16:09:23 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=52.101.46.13 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763050165; cv=fail; b=SFhl7fkc8aupxNgbwrDPM6TWlTFiJnASChaKPtpxvJ0FqdbNb3qTN3UzOUcwvAVWCe9ek6BHqSxj+JDcrrCmdveKFMy0vZPQW7za26LgEFLvgadpkSt8NnyuYJJby9g6tk+YvimHE7TMe8NgC0gIR/rMURuuFN0zEMfuVYiCs6I= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763050165; c=relaxed/simple; bh=UqOjbQdwnVxHr+x18IDj1lsuqLOn6rYLWq90R4dJ8uQ=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=GAN39Vus7Va6xZ43FD7cZxkfrFikNA98TTCKNOwGAOij5dhi0lJPU3oXsoSSk8H1cxAdlPe4/MQR7qmxiW1PNnboUH5ai8oFfc7PQ7RF55BYqomF5yzS6OQ4Y9vY7r4djAbzJO6YPtl/AG+CX4ZaDetiq8REfqZOAoS0V+ohiOM= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amd.com; spf=fail smtp.mailfrom=amd.com; dkim=pass (1024-bit key) header.d=amd.com header.i=@amd.com header.b=WtEkG8vt; arc=fail smtp.client-ip=52.101.46.13 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amd.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=amd.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=amd.com header.i=@amd.com header.b="WtEkG8vt" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=ea4drXt46hlhOy7yEfujxODWYW9yagz2zA81woE1FtZ/KAyqTyRMgaAcCsyXBpB1jNG2Ja0ZbUwhEJWjboJQXFiwXPKE1c6TqtdTwCV+vXuJdabeVu87vjjLWaSH15t9mV+zlHm9USyLJGBi00vTAR1JtVFoVirFRNfATy5biGByNaY37C1ps8iwBZOlAKCKJbf9C14Tyo0jKXA0QBH2+JnK0U0G/yTKERoAh4YGxfLNxyrocf2hqPmiP4szhiOuYYkZTgeme1hFqS5sJwkph5sfsPEf0t153SNFwrmNPdnc44xcKEGkiWP73zJGDvtV64NBClibJTf1hfLwe2drCw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=pSb0AfU6whGZpzANyOEjI7vsUTXGJ3qQKVKdFC/gtFs=; b=k3B0SieIXcMGQlXa4raZMbvcNuJ5QNXMumB4qSrsZc5nN+OwEZqTjZwK8kY96XuPGkTieGgzBdsbhMQFgUAjHCcXXJrPVmobUlkAmP8VWePro4EEsBzyLor8oH75CzAwCUvN5CaVEDSPqPeOWopHTA2qqu6z2rQFsBFZ9Os3B0CdaoDJ1rJdgORGXInWlUWwLwJ7MAEUtymuVIP+Mob21UafyEvtoWA3LMhL6UAKsFOWcFfgsYcluZmbfVw2dYB6C34m6ZU+ZgYjztyFmrYTtd2SNtVq8heEcustZlwGlN0+cH7p6YMDwLHvjRs8PIbqSPo5Erxm7wEVwLMtAQGQwA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=gmail.com smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=pSb0AfU6whGZpzANyOEjI7vsUTXGJ3qQKVKdFC/gtFs=; b=WtEkG8vti+y5qQDG2ZxYCAInw/Ek8CLtPcrHxrTpImHuClIMuEcG2niaqF2LfsbDlDFDhkdI1TGbRJo6TCtlmYYMxD5++7ETIMDSx/tyNoLq3w40eCJH9B54NEIXOO2gLQm33dUFHva4o/nollmrvT5N4DhYAKjD3J+FZ/mQgBw= Received: from CH5PR05CA0024.namprd05.prod.outlook.com (2603:10b6:610:1f0::29) by DM6PR12MB4089.namprd12.prod.outlook.com (2603:10b6:5:213::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9320.17; Thu, 13 Nov 2025 16:09:21 +0000 Received: from CH1PEPF0000A346.namprd04.prod.outlook.com (2603:10b6:610:1f0:cafe::84) by CH5PR05CA0024.outlook.office365.com (2603:10b6:610:1f0::29) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.9343.7 via Frontend Transport; Thu, 13 Nov 2025 16:09:21 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=satlexmb07.amd.com; pr=C Received: from satlexmb07.amd.com (165.204.84.17) by CH1PEPF0000A346.mail.protection.outlook.com (10.167.244.11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9320.13 via Frontend Transport; Thu, 13 Nov 2025 16:09:21 +0000 Received: from FRAPPELLOUX01-WSLPUB.amd.com (10.180.168.240) by satlexmb07.amd.com (10.181.42.216) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.2562.17; Thu, 13 Nov 2025 08:09:19 -0800 From: Pierre-Eric Pelloux-Prayer To: Alex Deucher , =?UTF-8?q?Christian=20K=C3=B6nig?= , David Airlie , Simona Vetter CC: Pierre-Eric Pelloux-Prayer , , , Subject: [PATCH v2 07/20] drm/amdgpu: allocate multiple clear entities Date: Thu, 13 Nov 2025 17:05:48 +0100 Message-ID: <20251113160632.5889-8-pierre-eric.pelloux-prayer@amd.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20251113160632.5889-1-pierre-eric.pelloux-prayer@amd.com> References: <20251113160632.5889-1-pierre-eric.pelloux-prayer@amd.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-ClientProxiedBy: satlexmb07.amd.com (10.181.42.216) To satlexmb07.amd.com (10.181.42.216) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CH1PEPF0000A346:EE_|DM6PR12MB4089:EE_ X-MS-Office365-Filtering-Correlation-Id: 7ee39ade-992d-4c24-8be9-08de22cf01d6 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|376014|36860700013|1800799024|82310400026; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?IOXe3qyhwOse05vZAM4oHLUURdTlcuEVSrWeEMrgjh6nm0BX81Ln83Av1UIr?= =?us-ascii?Q?SdJ2gL/lCu+kcnOA7E3dZwf3/uMM3ly73SopRKa46RnpCl2Ay33B/oZYti8l?= =?us-ascii?Q?V5vVNf48As8i299eF+47PphNqiS7duRGQn4Rb6kr863V7dLXWPGiy5p8hIar?= =?us-ascii?Q?sUXNzTmBPZBsyF2sB1QXiIoyXhc5tFcPzrD7jkotiF4VSg4xHtW+SLWBhh+p?= =?us-ascii?Q?MNsLyZSbBJoAn7QYJNCTknG4sZrZOfNK9jKSZXslk0UbdJjvXVZn8WNxmQ8t?= =?us-ascii?Q?bvH7v9pczoFuaSokDl5vM8t1MHHVKEU1Q72uePwTP6re+rAmmmrjDOp+6L6t?= =?us-ascii?Q?EfS8QPNM7iPvB4PZVTVV7cPE0193PRNJy4cHgy0n11pb8f0rkXOEvb7JxOlE?= =?us-ascii?Q?SvQycL5hgpdhWjMF4Php8Matd4Mr/YRyWE27DepZMx7qQfxzYfYP+glGhsAF?= =?us-ascii?Q?5VGF1+K8sPVv0xU4Hu7PDFFS94ZKJ1prneTICdmIgIZURRZVZWwKuosq+lUJ?= =?us-ascii?Q?3EfEkVm9h4f2hiuoT4Pogz0p31Q6meftRxtGg299NEgr5dRm1LNOS582yrZS?= =?us-ascii?Q?se1ei3rP7BU83KTstrIbWyrjB1sCxDjGUrBb7XtwMuoWCwIkCoZhzJPh22Dl?= =?us-ascii?Q?0TJcDuqzwByDUwshUF2D5WK2BRZAx4lmVT+dOzSvKD+Wtp8AXXkxHeGsDSex?= =?us-ascii?Q?7arAdk32sEjle+GiqbbUMDIqB+0YLPgrcOeYjSE6jUG69caNN4LIFZoMh8YO?= =?us-ascii?Q?GyXliEuHGVUaVvD9RhdoTfM4K24k34beiHvK8lwqFogUUrQIg5fCeADlBptL?= =?us-ascii?Q?YM/mygHVTGxxSPWZ0XJmJs7UGRtdCLGeOneiKllxgpo/LhkRms9ounLA5khM?= =?us-ascii?Q?8YNvltao5K6aKbQhxKG8s1u45gP8mOZgHGIjvGfycn0sJt78m/Tvn1kd2s/r?= =?us-ascii?Q?Sl379anwxzeWGOlbk5/fwp7MJcIfNSxolybnwWeOPeqxZmQUtaLzFtp5jmdo?= =?us-ascii?Q?1DqsG4q7e1Hku0SJV9bhtyqz5cWHe1//q711RVwodoIljAeimTgzqvPhNQ6z?= =?us-ascii?Q?mCF/oNktGHQtlXBSI56BjHVKOMkkq5d53UEhhzFvwTrCI46aruEeR4gkDxT2?= =?us-ascii?Q?MjzDaFXyi251pkO5+xO8ctVUOBpbpYJhF3A7j8xaZ9Op/CoEe7o0ZMS/BBvY?= =?us-ascii?Q?KBR+F1nM+bKN/gdUiD2bFdsHy0b8OxYAyeWMd3XIZwuBrWc5NwKpylauQwxI?= =?us-ascii?Q?/hNQXjfImSbNNtVP/ms47O7hHqMht9eEyGteSsWkseUKPlGHQQe0gEquuGTr?= =?us-ascii?Q?10RJvpGZ3577FyBCx+SdL2tT2DPGrNXB+2NupdseR5/5T6OD2UsHvaK5szxd?= =?us-ascii?Q?V6LG3JI1nLzn1PQBQLU7EOuAGMLzZefPnStYXZXIDqmLdMzjXNErjPSDo180?= =?us-ascii?Q?4XdmnIs4WUBjvamV1dkpFS6lz0pAkRrcy1XDmOQZZWFFf/EO66twvdG7pHy2?= =?us-ascii?Q?JDXcls5yibi34ecPrO5nMcBPIFZIZ3ExXqwODNXguFqbNNJ7/qjn7ZPsycnw?= =?us-ascii?Q?wlH8PHzKmqUNtl6gqWc=3D?= X-Forefront-Antispam-Report: CIP:165.204.84.17;CTRY:US;LANG:en;SCL:1;SRV:;IPV:CAL;SFV:NSPM;H:satlexmb07.amd.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230040)(376014)(36860700013)(1800799024)(82310400026);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Nov 2025 16:09:21.7065 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 7ee39ade-992d-4c24-8be9-08de22cf01d6 X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d;Ip=[165.204.84.17];Helo=[satlexmb07.amd.com] X-MS-Exchange-CrossTenant-AuthSource: CH1PEPF0000A346.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR12MB4089 Content-Type: text/plain; charset="utf-8" No functional change for now, as we always use entity 0. Signed-off-by: Pierre-Eric Pelloux-Prayer --- drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c | 11 +-- drivers/gpu/drm/amd/amdgpu/amdgpu_gtt_mgr.c | 6 +- drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 2 +- drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 76 +++++++++++++-------- drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h | 10 +-- 5 files changed, 66 insertions(+), 39 deletions(-) diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c b/drivers/gpu/drm/amd/= amdgpu/amdgpu_gmc.c index 2a444d02cf4b..e73dcfed5338 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c @@ -655,7 +655,7 @@ void amdgpu_gmc_flush_gpu_tlb(struct amdgpu_device *ade= v, uint32_t vmid, struct amdgpu_vmhub *hub =3D &adev->vmhub[vmhub]; struct dma_fence *fence; struct amdgpu_job *job; - int r; + int r, i; =20 if (!hub->sdma_invalidation_workaround || vmid || !adev->mman.buffer_funcs_enabled || !adev->ib_pool_ready || @@ -686,8 +686,9 @@ void amdgpu_gmc_flush_gpu_tlb(struct amdgpu_device *ade= v, uint32_t vmid, * translation. Avoid this by doing the invalidation from the SDMA * itself at least for GART. */ - mutex_lock(&adev->mman.clear_entity.gart_window_lock); mutex_lock(&adev->mman.move_entity.gart_window_lock); + for (i =3D 0; i < adev->mman.num_clear_entities; i++) + mutex_lock(&adev->mman.clear_entities[i].gart_window_lock); r =3D amdgpu_job_alloc_with_ib(ring->adev, &adev->mman.default_entity.bas= e, AMDGPU_FENCE_OWNER_UNDEFINED, 16 * 4, AMDGPU_IB_POOL_IMMEDIATE, @@ -701,7 +702,8 @@ void amdgpu_gmc_flush_gpu_tlb(struct amdgpu_device *ade= v, uint32_t vmid, amdgpu_ring_pad_ib(ring, &job->ibs[0]); fence =3D amdgpu_job_submit(job); mutex_unlock(&adev->mman.move_entity.gart_window_lock); - mutex_unlock(&adev->mman.clear_entity.gart_window_lock); + for (i =3D 0; i < adev->mman.num_clear_entities; i++) + mutex_unlock(&adev->mman.clear_entities[i].gart_window_lock); =20 dma_fence_wait(fence, false); dma_fence_put(fence); @@ -710,7 +712,8 @@ void amdgpu_gmc_flush_gpu_tlb(struct amdgpu_device *ade= v, uint32_t vmid, =20 error_alloc: mutex_unlock(&adev->mman.move_entity.gart_window_lock); - mutex_unlock(&adev->mman.clear_entity.gart_window_lock); + for (i =3D 0; i < adev->mman.num_clear_entities; i++) + mutex_unlock(&adev->mman.clear_entities[i].gart_window_lock); dev_err(adev->dev, "Error flushing GPU TLB using the SDMA (%d)!\n", r); } =20 diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_gtt_mgr.c b/drivers/gpu/drm/= amd/amdgpu/amdgpu_gtt_mgr.c index 0760e70402ec..3771e89035f5 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_gtt_mgr.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_gtt_mgr.c @@ -269,10 +269,12 @@ static const struct ttm_resource_manager_func amdgpu_= gtt_mgr_func =3D { * * @adev: amdgpu_device pointer * @gtt_size: maximum size of GTT + * @reserved_windows: num of already used windows * * Allocate and initialize the GTT manager. */ -int amdgpu_gtt_mgr_init(struct amdgpu_device *adev, uint64_t gtt_size) +int amdgpu_gtt_mgr_init(struct amdgpu_device *adev, uint64_t gtt_size, + u32 reserved_windows) { struct amdgpu_gtt_mgr *mgr =3D &adev->mman.gtt_mgr; struct ttm_resource_manager *man =3D &mgr->manager; @@ -283,7 +285,7 @@ int amdgpu_gtt_mgr_init(struct amdgpu_device *adev, uin= t64_t gtt_size) =20 ttm_resource_manager_init(man, &adev->mman.bdev, gtt_size); =20 - start =3D AMDGPU_GTT_MAX_TRANSFER_SIZE * AMDGPU_GTT_NUM_TRANSFER_WINDOWS; + start =3D AMDGPU_GTT_MAX_TRANSFER_SIZE * reserved_windows; size =3D (adev->gmc.gart_size >> PAGE_SHIFT) - start; drm_mm_init(&mgr->mm, start, size); spin_lock_init(&mgr->lock); diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c b/drivers/gpu/drm/a= md/amdgpu/amdgpu_object.c index c06c132a753c..e7b2cae031b3 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c @@ -1321,7 +1321,7 @@ void amdgpu_bo_release_notify(struct ttm_buffer_objec= t *bo) if (r) goto out; =20 - r =3D amdgpu_fill_buffer(&adev->mman.clear_entity, abo, 0, &bo->base._res= v, + r =3D amdgpu_fill_buffer(&adev->mman.clear_entities[0], abo, 0, &bo->base= ._resv, &fence, AMDGPU_KERNEL_JOB_ID_CLEAR_ON_RELEASE); if (WARN_ON(r)) goto out; diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c b/drivers/gpu/drm/amd/= amdgpu/amdgpu_ttm.c index 7193a341689d..2f305ad32080 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c @@ -1891,6 +1891,7 @@ static void amdgpu_ttm_mmio_remap_bo_fini(struct amdg= pu_device *adev) int amdgpu_ttm_init(struct amdgpu_device *adev) { uint64_t gtt_size; + u32 gart_window; int r; =20 dma_set_max_seg_size(adev->dev, UINT_MAX); @@ -1923,7 +1924,7 @@ int amdgpu_ttm_init(struct amdgpu_device *adev) } =20 /* Change the size here instead of the init above so only lpfn is affecte= d */ - amdgpu_ttm_set_buffer_funcs_status(adev, false); + gart_window =3D amdgpu_ttm_set_buffer_funcs_status(adev, false); #ifdef CONFIG_64BIT #ifdef CONFIG_X86 if (adev->gmc.xgmi.connected_to_cpu) @@ -2019,7 +2020,7 @@ int amdgpu_ttm_init(struct amdgpu_device *adev) } =20 /* Initialize GTT memory pool */ - r =3D amdgpu_gtt_mgr_init(adev, gtt_size); + r =3D amdgpu_gtt_mgr_init(adev, gtt_size, gart_window); if (r) { dev_err(adev->dev, "Failed initializing GTT heap.\n"); return r; @@ -2158,16 +2159,22 @@ void amdgpu_ttm_fini(struct amdgpu_device *adev) * * Enable/disable use of buffer functions during suspend/resume. This shou= ld * only be called at bootup or when userspace isn't running. + * + * Returns: the number of GART reserved window */ -void amdgpu_ttm_set_buffer_funcs_status(struct amdgpu_device *adev, bool e= nable) +u32 amdgpu_ttm_set_buffer_funcs_status(struct amdgpu_device *adev, bool en= able) { struct ttm_resource_manager *man =3D ttm_manager_type(&adev->mman.bdev, T= TM_PL_VRAM); uint64_t size; - int r, i; + int r, i, j; + u32 num_clear_entities, windows, w; + + num_clear_entities =3D adev->sdma.num_instances; + windows =3D adev->gmc.is_app_apu ? 0 : (2 + num_clear_entities); =20 if (!adev->mman.initialized || amdgpu_in_reset(adev) || adev->mman.buffer_funcs_enabled =3D=3D enable || adev->gmc.is_app_apu) - return; + return windows; =20 if (enable) { struct amdgpu_ring *ring; @@ -2180,19 +2187,9 @@ void amdgpu_ttm_set_buffer_funcs_status(struct amdgp= u_device *adev, bool enable) 1, NULL); if (r) { dev_err(adev->dev, - "Failed setting up TTM BO move entity (%d)\n", + "Failed setting up TTM BO eviction entity (%d)\n", r); - return; - } - - r =3D drm_sched_entity_init(&adev->mman.clear_entity.base, - DRM_SCHED_PRIORITY_NORMAL, &sched, - 1, NULL); - if (r) { - dev_err(adev->dev, - "Failed setting up TTM BO clear entity (%d)\n", - r); - goto error_free_entity; + return 0; } =20 r =3D drm_sched_entity_init(&adev->mman.move_entity.base, @@ -2202,26 +2199,51 @@ void amdgpu_ttm_set_buffer_funcs_status(struct amdg= pu_device *adev, bool enable) dev_err(adev->dev, "Failed setting up TTM BO move entity (%d)\n", r); - drm_sched_entity_destroy(&adev->mman.clear_entity.base); goto error_free_entity; } =20 + adev->mman.num_clear_entities =3D num_clear_entities; + adev->mman.clear_entities =3D kcalloc(num_clear_entities, + sizeof(struct amdgpu_ttm_buffer_entity), + GFP_KERNEL); + if (!adev->mman.clear_entities) + goto error_free_entity; + + for (i =3D 0; i < num_clear_entities; i++) { + r =3D drm_sched_entity_init(&adev->mman.clear_entities[i].base, + DRM_SCHED_PRIORITY_NORMAL, &sched, + 1, NULL); + if (r) { + for (j =3D 0; j < i; j++) + drm_sched_entity_destroy( + &adev->mman.clear_entities[j].base); + kfree(adev->mman.clear_entities); + goto error_free_entity; + } + } + /* Statically assign GART windows to each entity. */ + w =3D 0; mutex_init(&adev->mman.default_entity.gart_window_lock); - adev->mman.move_entity.gart_window_id0 =3D 0; - adev->mman.move_entity.gart_window_id1 =3D 1; + adev->mman.move_entity.gart_window_id0 =3D w++; + adev->mman.move_entity.gart_window_id1 =3D w++; mutex_init(&adev->mman.move_entity.gart_window_lock); - /* Clearing entity doesn't use id0 */ - adev->mman.clear_entity.gart_window_id1 =3D 2; - mutex_init(&adev->mman.clear_entity.gart_window_lock); + for (i =3D 0; i < num_clear_entities; i++) { + /* Clearing entities don't use id0 */ + adev->mman.clear_entities[i].gart_window_id1 =3D w++; + mutex_init(&adev->mman.clear_entities[i].gart_window_lock); + } + WARN_ON(w !=3D windows); } else { drm_sched_entity_destroy(&adev->mman.default_entity.base); - drm_sched_entity_destroy(&adev->mman.clear_entity.base); drm_sched_entity_destroy(&adev->mman.move_entity.base); + for (i =3D 0; i < num_clear_entities; i++) + drm_sched_entity_destroy(&adev->mman.clear_entities[i].base); for (i =3D 0; i < TTM_NUM_MOVE_FENCES; i++) { dma_fence_put(man->eviction_fences[i]); man->eviction_fences[i] =3D NULL; } + kfree(adev->mman.clear_entities); } =20 /* this just adjusts TTM size idea, which sets lpfn to the correct value = */ @@ -2232,10 +2254,11 @@ void amdgpu_ttm_set_buffer_funcs_status(struct amdg= pu_device *adev, bool enable) man->size =3D size; adev->mman.buffer_funcs_enabled =3D enable; =20 - return; + return windows; =20 error_free_entity: drm_sched_entity_destroy(&adev->mman.default_entity.base); + return 0; } =20 static int amdgpu_ttm_prepare_job(struct amdgpu_device *adev, @@ -2388,8 +2411,7 @@ int amdgpu_ttm_clear_buffer(struct amdgpu_bo *bo, =20 if (!fence) return -EINVAL; - - entity =3D &adev->mman.clear_entity; + entity =3D &adev->mman.clear_entities[0]; *fence =3D dma_fence_get_stub(); =20 amdgpu_res_first(bo->tbo.resource, 0, amdgpu_bo_size(bo), &cursor); diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h b/drivers/gpu/drm/amd/= amdgpu/amdgpu_ttm.h index f4f762be9fdd..797f851a4578 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h @@ -39,7 +39,6 @@ #define __AMDGPU_PL_NUM (TTM_PL_PRIV + 6) =20 #define AMDGPU_GTT_MAX_TRANSFER_SIZE 512 -#define AMDGPU_GTT_NUM_TRANSFER_WINDOWS 3 =20 extern const struct attribute_group amdgpu_vram_mgr_attr_group; extern const struct attribute_group amdgpu_gtt_mgr_attr_group; @@ -73,8 +72,9 @@ struct amdgpu_mman { struct mutex gtt_window_lock; =20 struct amdgpu_ttm_buffer_entity default_entity; /* has no gart windows */ - struct amdgpu_ttm_buffer_entity clear_entity; struct amdgpu_ttm_buffer_entity move_entity; + struct amdgpu_ttm_buffer_entity *clear_entities; + u32 num_clear_entities; =20 struct amdgpu_vram_mgr vram_mgr; struct amdgpu_gtt_mgr gtt_mgr; @@ -134,7 +134,7 @@ struct amdgpu_copy_mem { #define AMDGPU_COPY_FLAGS_GET(value, field) \ (((__u32)(value) >> AMDGPU_COPY_FLAGS_##field##_SHIFT) & AMDGPU_COPY_FLAG= S_##field##_MASK) =20 -int amdgpu_gtt_mgr_init(struct amdgpu_device *adev, uint64_t gtt_size); +int amdgpu_gtt_mgr_init(struct amdgpu_device *adev, uint64_t gtt_size, u32= reserved_windows); void amdgpu_gtt_mgr_fini(struct amdgpu_device *adev); int amdgpu_preempt_mgr_init(struct amdgpu_device *adev); void amdgpu_preempt_mgr_fini(struct amdgpu_device *adev); @@ -168,8 +168,8 @@ bool amdgpu_res_cpu_visible(struct amdgpu_device *adev, =20 int amdgpu_ttm_init(struct amdgpu_device *adev); void amdgpu_ttm_fini(struct amdgpu_device *adev); -void amdgpu_ttm_set_buffer_funcs_status(struct amdgpu_device *adev, - bool enable); +u32 amdgpu_ttm_set_buffer_funcs_status(struct amdgpu_device *adev, + bool enable); int amdgpu_copy_buffer(struct amdgpu_ring *ring, struct drm_sched_entity *entity, uint64_t src_offset, --=20 2.43.0 From nobody Sat Feb 7 20:28:07 2026 Received: from BL0PR03CU003.outbound.protection.outlook.com (mail-eastusazon11012015.outbound.protection.outlook.com [52.101.53.15]) (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 8D03A2FA0C4 for ; Thu, 13 Nov 2025 16:09:35 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=52.101.53.15 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763050177; cv=fail; b=nW9wgVWZLelAAACtu0jI55VOg7o3QJ8keZlbEgvsJK356damw+PxeCfNYkLaCHn4KZ4G6/zqUQf29D4QGHKFW58ENAeOrN3TLhbA1r4pnHnBVakEgJDEXaEYaOYAbX6lxrSk0l6RRNe8+Z92USyXDIYOWs2d/pA7hh4p5w0ICCU= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763050177; c=relaxed/simple; bh=rF3lswUMicbYvL3ZN6hLQ15OUNK0mmDUaiF3JGwRHsI=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=sH2r+Ng1uA/s0z+AUi39xEGZdg7vXomNSsR3IHH+Mv01vgTcBSK3+B7VKmzW9/TDU6Iy06c5xNJ7TtZsyEyD8rb0HYRElAG+5dYbJdkaSQYG0pkAecZEGZNKlb4mTN7ZFvVlewLroWBJFb3X3iotGU4maZ0PS43rqwmvjrsWmtI= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amd.com; spf=fail smtp.mailfrom=amd.com; dkim=pass (1024-bit key) header.d=amd.com header.i=@amd.com header.b=p5ZMHSEO; arc=fail smtp.client-ip=52.101.53.15 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amd.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=amd.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=amd.com header.i=@amd.com header.b="p5ZMHSEO" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=gTtQP9El0hCLESzSYCc7b2LR4e6FNEaeWgW+wG5l01QZFRA9RRq/Q3cmGKZZ+P3nSuwJLVNuZJcc+4apJeEJOXBFPoUYUvp/lX09vdWlPE+x64Tj2F4M63z11SkrbcUTklrUm/b8A0EAUYB60cTYrSvrWpzK9Z9QkzgIpOqmG6iRBXvp7q7h3F+gYl18L0pvV0e2MlBkEzbkzDSSATjxt1q7O51zJEBHMY0S0fPNiK/N2qGmU6iQxLcW2I65oLrv2dYh6yxEUrXoJEzAObkT7CueDdtYfzGtNF2zEWhSVcRugK/lWuJaz+JPkXh2mkU1/9eKUxCNCki9bHoMTDvEwA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=g7pXmJ0944i1lBp1TIZciLkSnvufgVg0r9jhMkc4Plc=; b=BnLGqQNTCFHYkcBZJ8OslVyxJBh9S4ToBN/fsti07/PBz3mTvh+tmDkN9cl3jcBuhHUHmxr56ps0GWcPgAYtbpMJDtlRjWtesKiqnOSg0QvPpZbiNkeav5DB/MHbWzICoeg5VPOk46b6VmGqItSoVwPovQwDzxpqqc4iT2VDg+cOgeRkhRNiVq5mSAidk4T+Smvmyt6sgKtu33bIqtgbbX0qU5NqgGbI8/xcz+1mN6bBBDpPko37m++z35FkHebeaFHyIzCA7JTCHSxlrl6YoO8pIyW/kKu03loklKo5MVdYSkx5aGVDTukZrX3KXzn6w9gu0h4fojI/TM2fh8BP1g== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=gmail.com smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=g7pXmJ0944i1lBp1TIZciLkSnvufgVg0r9jhMkc4Plc=; b=p5ZMHSEOnYF5pMDSWihahSN/Nb5R3ha69xKk+KCvnYPQutLHv2NRv175LguoVYZpF55gHnPDVsDLE6fYx6IPRu4HCG35siOO29Ia7jFQ83g8dX10Dry2BceUY8GjfQXnEkCHvez7JgUrRJrTpbdGjSdsfVGofiS6j6ubuS5Iz4Q= Received: from CH5PR05CA0020.namprd05.prod.outlook.com (2603:10b6:610:1f0::13) by IA0PR12MB8303.namprd12.prod.outlook.com (2603:10b6:208:3de::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9320.17; Thu, 13 Nov 2025 16:09:32 +0000 Received: from CH1PEPF0000A346.namprd04.prod.outlook.com (2603:10b6:610:1f0:cafe::f0) by CH5PR05CA0020.outlook.office365.com (2603:10b6:610:1f0::13) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.9343.7 via Frontend Transport; Thu, 13 Nov 2025 16:09:32 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=satlexmb07.amd.com; pr=C Received: from satlexmb07.amd.com (165.204.84.17) by CH1PEPF0000A346.mail.protection.outlook.com (10.167.244.11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9320.13 via Frontend Transport; Thu, 13 Nov 2025 16:09:31 +0000 Received: from FRAPPELLOUX01-WSLPUB.amd.com (10.180.168.240) by satlexmb07.amd.com (10.181.42.216) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.2562.17; Thu, 13 Nov 2025 08:09:30 -0800 From: Pierre-Eric Pelloux-Prayer To: Alex Deucher , =?UTF-8?q?Christian=20K=C3=B6nig?= , David Airlie , Simona Vetter , Felix Kuehling CC: Pierre-Eric Pelloux-Prayer , , , Subject: [PATCH v2 08/20] drm/amdgpu: allocate multiple move entities Date: Thu, 13 Nov 2025 17:05:49 +0100 Message-ID: <20251113160632.5889-9-pierre-eric.pelloux-prayer@amd.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20251113160632.5889-1-pierre-eric.pelloux-prayer@amd.com> References: <20251113160632.5889-1-pierre-eric.pelloux-prayer@amd.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-ClientProxiedBy: satlexmb07.amd.com (10.181.42.216) To satlexmb07.amd.com (10.181.42.216) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CH1PEPF0000A346:EE_|IA0PR12MB8303:EE_ X-MS-Office365-Filtering-Correlation-Id: 20988e6f-b804-4b5e-a14a-08de22cf07f5 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|82310400026|36860700013|1800799024|376014; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?DTVS2g72wx5kxglN4jLQVVD66mkRIdDYPSmGdCd2DV7YQ2Zzn+iIyjhzA8hM?= =?us-ascii?Q?55TkvIDXK1IWEhk1WgvdgIGSppluPkRGMX9VNfWEaxxY7GJg4SPrz02suhxI?= =?us-ascii?Q?gg0au6E5VFFt3HnoyUr4mW1oDk972ZaBkfbvHxIT/VcgUlNYLkuuqrmXOgdz?= =?us-ascii?Q?yqWi+E6x1+W7lmP/ARqQrJ8oEF0GLBS9w+IDIK9MFRQi9LLNkqEGzD/sn6tA?= =?us-ascii?Q?cPlb9856TKnJ8Rgl+oUWxlNo8x11gJq9dUqDrxuYlNrPJDlNXTr0SkFVduwY?= =?us-ascii?Q?2QhihwKqFX+gTlWGtBp4JJPcCekE3ql6rm1QFuYQci8eLxoRStQbTmJObkU+?= =?us-ascii?Q?7RpQIilUsAqnGSeFD40gohatWUN8IYs7nSa2s3msi2RzqLhPzh+1Rote05+H?= =?us-ascii?Q?cczSoJw1IAfBjqq0ZOglEUaDX4zf+wxCKGhlhL1SUpakNtnnqG6vBQDiS3Bs?= =?us-ascii?Q?EecN4My/Or4jimKNoSAnSGl/yC9qWXWQDbBdOhVFyV4dNabyLm/ppyx0miyn?= =?us-ascii?Q?TsRHfVdheTQrenMSrd/sWKN7KeuuojsA/EXkOgjDCs7zoCC9Tn4GWVJ6S6Pp?= =?us-ascii?Q?0IreMxynzMj2BMbX8bTb5lzanf2XSDmfJgxRjwdJhQ5VYy1++X23xNtCXltK?= =?us-ascii?Q?dpOYj0RyCsrnr/MhxyaD26XwJojtc2CfYROuIKLxxAfp/Be31LxgpUP0mkKT?= =?us-ascii?Q?YDIXK3zbU99MrD1c9OmvsxofPcMfagMRMjla6NRqo2XvA6LZJzODVrQ6l7c2?= =?us-ascii?Q?g/vNp8MFVlLsByq6p/071CT+AaPSjZaolUOZKvvv0qgu1IGNjfc72kP6AxEw?= =?us-ascii?Q?VKX0waZ+xc5xe/YDSL9EjMfjy5XTppuRCyp6ZZ0GkyoNlyRaGkKQfVpNdR19?= =?us-ascii?Q?Iaks0MrEyNJ99PJAc2YaL4v6iPxAFv3yp5awB903hWMCET4hFyYFtB+CLym2?= =?us-ascii?Q?zYtsL0v41qbPzDT771DXM+9fFRmitIovnahr5DDVzofEaDnBr2gGetDCqOOZ?= =?us-ascii?Q?u3DqTCFdkVP7H9Efx59TjkH6LK6/Ln3y7+mBjrZuKIVu1LH5IsrXMKVdGVAP?= =?us-ascii?Q?ZIeFd6xNJ4p2bJZTW+pSYUmJauVUCxeJ2UB/cUv+153Vg/hAf6aeUTl5KauJ?= =?us-ascii?Q?I4Boe37aVyCRH44o2rDclPgEzy+454cWBCHWLIqS+ZwMRI+bmSpdL+2o35FW?= =?us-ascii?Q?GAa/47GmRiJKHAFVKPvh2kyKVp6HsutwFZ5REWmOnb8ARVyVzTW9zXUkC7Lf?= =?us-ascii?Q?4nk3Fye5m0zukhCTe4Q91218JHZonuu4Ykc7bRIRGP4qjyOQEWKgkTDMSBgl?= =?us-ascii?Q?+4b5s9RHAu6eyvgcv3dl2LxuIJ9vIN73PhcPAuPdGI1Lb5HdOLV18h/PmI8S?= =?us-ascii?Q?9YvIBTUUpu7cvArZ9G5OCFQ/+pBrxhk8s2efI2ghbFQITl4Aw+JCEyZ1VoAM?= =?us-ascii?Q?5HgaP5ix4r9cNZDTGid0FjPvf6HrX4cWGYsPs2zVsgYxP1auk2pFe7TvAU8m?= =?us-ascii?Q?fsVJexPRTVISGD6HuMx+8VziqMZdo2H72PcBm4ZwWT0vfCZv6LA7OqIVZBfy?= =?us-ascii?Q?jlx0FJQ5m7PXNMDt1IA=3D?= X-Forefront-Antispam-Report: CIP:165.204.84.17;CTRY:US;LANG:en;SCL:1;SRV:;IPV:CAL;SFV:NSPM;H:satlexmb07.amd.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230040)(82310400026)(36860700013)(1800799024)(376014);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Nov 2025 16:09:31.9768 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 20988e6f-b804-4b5e-a14a-08de22cf07f5 X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d;Ip=[165.204.84.17];Helo=[satlexmb07.amd.com] X-MS-Exchange-CrossTenant-AuthSource: CH1PEPF0000A346.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA0PR12MB8303 Content-Type: text/plain; charset="utf-8" No functional change for now, as we always use entity 0. Signed-off-by: Pierre-Eric Pelloux-Prayer Acked-by: Felix Kuehling --- drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c | 9 +++-- drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 48 +++++++++++++++--------- drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h | 3 +- drivers/gpu/drm/amd/amdkfd/kfd_migrate.c | 2 +- 4 files changed, 39 insertions(+), 23 deletions(-) diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c b/drivers/gpu/drm/amd/= amdgpu/amdgpu_gmc.c index e73dcfed5338..2713dd51ab9a 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c @@ -686,9 +686,10 @@ void amdgpu_gmc_flush_gpu_tlb(struct amdgpu_device *ad= ev, uint32_t vmid, * translation. Avoid this by doing the invalidation from the SDMA * itself at least for GART. */ - mutex_lock(&adev->mman.move_entity.gart_window_lock); for (i =3D 0; i < adev->mman.num_clear_entities; i++) mutex_lock(&adev->mman.clear_entities[i].gart_window_lock); + for (i =3D 0; i < adev->mman.num_move_entities; i++) + mutex_lock(&adev->mman.move_entities[i].gart_window_lock); r =3D amdgpu_job_alloc_with_ib(ring->adev, &adev->mman.default_entity.bas= e, AMDGPU_FENCE_OWNER_UNDEFINED, 16 * 4, AMDGPU_IB_POOL_IMMEDIATE, @@ -701,7 +702,8 @@ void amdgpu_gmc_flush_gpu_tlb(struct amdgpu_device *ade= v, uint32_t vmid, job->ibs->ptr[job->ibs->length_dw++] =3D ring->funcs->nop; amdgpu_ring_pad_ib(ring, &job->ibs[0]); fence =3D amdgpu_job_submit(job); - mutex_unlock(&adev->mman.move_entity.gart_window_lock); + for (i =3D 0; i < adev->mman.num_move_entities; i++) + mutex_unlock(&adev->mman.move_entities[i].gart_window_lock); for (i =3D 0; i < adev->mman.num_clear_entities; i++) mutex_unlock(&adev->mman.clear_entities[i].gart_window_lock); =20 @@ -711,7 +713,8 @@ void amdgpu_gmc_flush_gpu_tlb(struct amdgpu_device *ade= v, uint32_t vmid, return; =20 error_alloc: - mutex_unlock(&adev->mman.move_entity.gart_window_lock); + for (i =3D 0; i < adev->mman.num_move_entities; i++) + mutex_unlock(&adev->mman.move_entities[i].gart_window_lock); for (i =3D 0; i < adev->mman.num_clear_entities; i++) mutex_unlock(&adev->mman.clear_entities[i].gart_window_lock); dev_err(adev->dev, "Error flushing GPU TLB using the SDMA (%d)!\n", r); diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c b/drivers/gpu/drm/amd/= amdgpu/amdgpu_ttm.c index 2f305ad32080..e1f0567fd2d5 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c @@ -401,7 +401,7 @@ static int amdgpu_move_blit(struct ttm_buffer_object *b= o, dst.offset =3D 0; =20 r =3D amdgpu_ttm_copy_mem_to_mem(adev, - &adev->mman.move_entity, + &adev->mman.move_entities[0], &src, &dst, new_mem->size, amdgpu_bo_encrypted(abo), @@ -414,7 +414,7 @@ static int amdgpu_move_blit(struct ttm_buffer_object *b= o, (abo->flags & AMDGPU_GEM_CREATE_VRAM_WIPE_ON_RELEASE)) { struct dma_fence *wipe_fence =3D NULL; =20 - r =3D amdgpu_fill_buffer(&adev->mman.move_entity, + r =3D amdgpu_fill_buffer(&adev->mman.move_entities[0], abo, 0, NULL, &wipe_fence, AMDGPU_KERNEL_JOB_ID_MOVE_BLIT); if (r) { @@ -2167,10 +2167,11 @@ u32 amdgpu_ttm_set_buffer_funcs_status(struct amdgp= u_device *adev, bool enable) struct ttm_resource_manager *man =3D ttm_manager_type(&adev->mman.bdev, T= TM_PL_VRAM); uint64_t size; int r, i, j; - u32 num_clear_entities, windows, w; + u32 num_clear_entities, num_move_entities, windows, w; =20 num_clear_entities =3D adev->sdma.num_instances; - windows =3D adev->gmc.is_app_apu ? 0 : (2 + num_clear_entities); + num_move_entities =3D MIN(adev->sdma.num_instances, TTM_NUM_MOVE_FENCES); + windows =3D adev->gmc.is_app_apu ? 0 : (2 * num_move_entities + num_clear= _entities); =20 if (!adev->mman.initialized || amdgpu_in_reset(adev) || adev->mman.buffer_funcs_enabled =3D=3D enable || adev->gmc.is_app_apu) @@ -2186,20 +2187,25 @@ u32 amdgpu_ttm_set_buffer_funcs_status(struct amdgp= u_device *adev, bool enable) DRM_SCHED_PRIORITY_KERNEL, &sched, 1, NULL); if (r) { - dev_err(adev->dev, - "Failed setting up TTM BO eviction entity (%d)\n", + dev_err(adev->dev, "Failed setting up entity (%d)\n", r); return 0; } =20 - r =3D drm_sched_entity_init(&adev->mman.move_entity.base, - DRM_SCHED_PRIORITY_NORMAL, &sched, - 1, NULL); - if (r) { - dev_err(adev->dev, - "Failed setting up TTM BO move entity (%d)\n", - r); - goto error_free_entity; + adev->mman.num_move_entities =3D num_move_entities; + for (i =3D 0; i < num_move_entities; i++) { + r =3D drm_sched_entity_init(&adev->mman.move_entities[i].base, + DRM_SCHED_PRIORITY_NORMAL, &sched, + 1, NULL); + if (r) { + dev_err(adev->dev, + "Failed setting up TTM BO move entities (%d)\n", + r); + for (j =3D 0; j < i; j++) + drm_sched_entity_destroy( + &adev->mman.move_entities[j].base); + goto error_free_entity; + } } =20 adev->mman.num_clear_entities =3D num_clear_entities; @@ -2214,6 +2220,9 @@ u32 amdgpu_ttm_set_buffer_funcs_status(struct amdgpu_= device *adev, bool enable) DRM_SCHED_PRIORITY_NORMAL, &sched, 1, NULL); if (r) { + for (j =3D 0; j < num_move_entities; j++) + drm_sched_entity_destroy( + &adev->mman.move_entities[j].base); for (j =3D 0; j < i; j++) drm_sched_entity_destroy( &adev->mman.clear_entities[j].base); @@ -2225,9 +2234,11 @@ u32 amdgpu_ttm_set_buffer_funcs_status(struct amdgpu= _device *adev, bool enable) /* Statically assign GART windows to each entity. */ w =3D 0; mutex_init(&adev->mman.default_entity.gart_window_lock); - adev->mman.move_entity.gart_window_id0 =3D w++; - adev->mman.move_entity.gart_window_id1 =3D w++; - mutex_init(&adev->mman.move_entity.gart_window_lock); + for (i =3D 0; i < num_move_entities; i++) { + adev->mman.move_entities[i].gart_window_id0 =3D w++; + adev->mman.move_entities[i].gart_window_id1 =3D w++; + mutex_init(&adev->mman.move_entities[i].gart_window_lock); + } for (i =3D 0; i < num_clear_entities; i++) { /* Clearing entities don't use id0 */ adev->mman.clear_entities[i].gart_window_id1 =3D w++; @@ -2236,7 +2247,8 @@ u32 amdgpu_ttm_set_buffer_funcs_status(struct amdgpu_= device *adev, bool enable) WARN_ON(w !=3D windows); } else { drm_sched_entity_destroy(&adev->mman.default_entity.base); - drm_sched_entity_destroy(&adev->mman.move_entity.base); + for (i =3D 0; i < num_move_entities; i++) + drm_sched_entity_destroy(&adev->mman.move_entities[i].base); for (i =3D 0; i < num_clear_entities; i++) drm_sched_entity_destroy(&adev->mman.clear_entities[i].base); for (i =3D 0; i < TTM_NUM_MOVE_FENCES; i++) { diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h b/drivers/gpu/drm/amd/= amdgpu/amdgpu_ttm.h index 797f851a4578..9d4891e86675 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h @@ -72,9 +72,10 @@ struct amdgpu_mman { struct mutex gtt_window_lock; =20 struct amdgpu_ttm_buffer_entity default_entity; /* has no gart windows */ - struct amdgpu_ttm_buffer_entity move_entity; struct amdgpu_ttm_buffer_entity *clear_entities; u32 num_clear_entities; + struct amdgpu_ttm_buffer_entity move_entities[TTM_NUM_MOVE_FENCES]; + u32 num_move_entities; =20 struct amdgpu_vram_mgr vram_mgr; struct amdgpu_gtt_mgr gtt_mgr; diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_migrate.c b/drivers/gpu/drm/amd= /amdkfd/kfd_migrate.c index bc47fc362a17..943c3438c7ee 100644 --- a/drivers/gpu/drm/amd/amdkfd/kfd_migrate.c +++ b/drivers/gpu/drm/amd/amdkfd/kfd_migrate.c @@ -136,7 +136,7 @@ svm_migrate_copy_memory_gart(struct amdgpu_device *adev= , dma_addr_t *sys, u64 size; int r; =20 - entity =3D &adev->mman.move_entity; + entity =3D &adev->mman.move_entities[0]; =20 mutex_lock(&entity->gart_window_lock); =20 --=20 2.43.0 From nobody Sat Feb 7 20:28:07 2026 Received: from MW6PR02CU001.outbound.protection.outlook.com (mail-westus2azon11012044.outbound.protection.outlook.com [52.101.48.44]) (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 ECC252F39C3; Thu, 13 Nov 2025 16:09:51 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=52.101.48.44 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763050193; cv=fail; b=nS69QSkSEI2hcNinkOOSiRgSUXYnydFSNnKbW+aTyDE6GgMY8mHKn/maBkBCDvwumEvnQlhjrXygRs9GbSIJ34Ytd62BpZ7LpTkEeCrnbusHAGrUz8aNa3gEkdgzp0Rq8Lxg5JXvu0yHW78b6opPyWeBrKAppo5YnnObDYIYnjQ= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763050193; c=relaxed/simple; bh=C4CtFPKdQkB4ejzYORIIGGuiML4Q5/z1PjH3C2V9C9g=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=VD1c2PJeGn3537X0kN682m+tfRpSLQFgZN/5yAczGTpS8/uhT2HSCorzoX5v+fSk13z4+Lskz5h5urhF4M4ZRY81ErebRJ6usESY1DfLxpq5tN+QfNVTIvl5ee5HuK4nnrNjqPITnypwT1ervlQ+G/34DrxO+55811cHI3z0pBw= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amd.com; spf=fail smtp.mailfrom=amd.com; dkim=pass (1024-bit key) header.d=amd.com header.i=@amd.com header.b=qIlu081A; arc=fail smtp.client-ip=52.101.48.44 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amd.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=amd.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=amd.com header.i=@amd.com header.b="qIlu081A" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=VutxOXbY4r9hi4Va6VeE1Ts/dURqcUoTUqBxOl6fgHMDAhPkX2CwPI/aIcaxmlqZUDfG0uODRwM7mE+IaSEx6FFO56dc0YY7jMBya3Ce+R1i+hXbZWEIgcrEJyWWwq0VAYYqusBoygMWj+UC0mW4Rks3VT6MmF2dSF7e5x+4WA+MwkcqLkhlPC3JBIdcuu78Z7beEe4A4qbENuX3QLvKM1TGXAtZKRtZ1pUM9zaALaolvIb7/7zUNwJ6I0WmQi5ztl7DZsL89+bghcLI7N/j26QcKpRvwD0x97uE4J7TzVkM7BR8UuyF0OyJG6J9uAcuwNZW7QvQ+tg2+rIRaX4cyg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=mUxvo+68RLlm4QxNf4+0VZ38pUKHjU2RFgxB99KBbls=; b=IDAvHPvXSP/klw7Le/9X5J/EtfcauJtfgQfYhExii+09krGxntW17zb4STFMOJq6YG2Bs7HFm4uIgyrVW+gnpzxvkIvBReVEtKTtKgtfMSAsDbcoGMtSrB6PfXiCQki354pfp16JCxtao2E2F7fQRiRrn0PneIsRYibahbkYRYfYJ+z4R0vIAcF9k8wupdMABj9hu8EQ6lXzp8KPFqDX9t8PUsaHe6+ILuCAHQbu5yaPnk/2GktaeG98UYD9El4GFpqbsxl/RiL0Qf6EWTdUvTttwPUmV8y4DeSFDL30Wy+GhZS9od5H0XvWbYqJ3WagEmOtiddZazPdDvA9ncVkCA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=gmail.com smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=mUxvo+68RLlm4QxNf4+0VZ38pUKHjU2RFgxB99KBbls=; b=qIlu081AF/5nIKYPVuxuZgeYcm9M7h5UYoqko2Vn4PzrOn2k90hpnD+iIR5p94nHXFTYd4PS8liKqpL8dCP1rWXCUHACNuHCrNVV3Uf2zc6LZI8eY/JWNCuNB5BFB/IFPrMYu+R7xtFvDSf4cCAZBfOJG9SayhhhmhHhK/Hi+SU= Received: from CH2PR14CA0046.namprd14.prod.outlook.com (2603:10b6:610:56::26) by MN6PR12MB8514.namprd12.prod.outlook.com (2603:10b6:208:474::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9320.17; Thu, 13 Nov 2025 16:09:42 +0000 Received: from CH1PEPF0000A34C.namprd04.prod.outlook.com (2603:10b6:610:56:cafe::2b) by CH2PR14CA0046.outlook.office365.com (2603:10b6:610:56::26) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.9320.17 via Frontend Transport; Thu, 13 Nov 2025 16:09:37 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=satlexmb07.amd.com; pr=C Received: from satlexmb07.amd.com (165.204.84.17) by CH1PEPF0000A34C.mail.protection.outlook.com (10.167.244.6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9320.13 via Frontend Transport; Thu, 13 Nov 2025 16:09:39 +0000 Received: from FRAPPELLOUX01-WSLPUB.amd.com (10.180.168.240) by satlexmb07.amd.com (10.181.42.216) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.2562.17; Thu, 13 Nov 2025 08:09:36 -0800 From: Pierre-Eric Pelloux-Prayer To: Alex Deucher , =?UTF-8?q?Christian=20K=C3=B6nig?= , David Airlie , Simona Vetter , Sumit Semwal CC: Pierre-Eric Pelloux-Prayer , , , , , Subject: [PATCH v2 09/20] drm/amdgpu: pass optional dependency to amdgpu_fill_buffer Date: Thu, 13 Nov 2025 17:05:50 +0100 Message-ID: <20251113160632.5889-10-pierre-eric.pelloux-prayer@amd.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20251113160632.5889-1-pierre-eric.pelloux-prayer@amd.com> References: <20251113160632.5889-1-pierre-eric.pelloux-prayer@amd.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-ClientProxiedBy: satlexmb07.amd.com (10.181.42.216) To satlexmb07.amd.com (10.181.42.216) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CH1PEPF0000A34C:EE_|MN6PR12MB8514:EE_ X-MS-Office365-Filtering-Correlation-Id: 145e00ef-5d77-4932-4e93-08de22cf0c9c X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|82310400026|376014|1800799024|36860700013; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?UE4glrW/jYF59V0I9NNnxO2t/4wLmY0j6GrCXH1R9P+/4W0zA+sQxbQ43Ib+?= =?us-ascii?Q?Wk4FPsbyEAbxMB1J8SpTq6QnihRaW+/irTZfxyuqc/g8TIJmPP2QXgva8Al5?= =?us-ascii?Q?hRM0dT4g5HKUMb4r28bR6Qx18Yh4qL9p73LP3v8u+KqbHSxakoO1ia8uggFr?= =?us-ascii?Q?AFo8+JazMS8dnzskQpZTeJt4Y1xti96HM2AziuboJXuxSg6K1mKq+OzTBNSf?= =?us-ascii?Q?XTrYFRbCEki06usDSipnOiJHGbEyFVdxnB0kpa1W7+abgy5B19cAfQjTtgR7?= =?us-ascii?Q?i+yZgjMHyG4hQhY/qsDIbnspIBTrEjIx3/kxGiHjiDQQwgf/tGZL/LoSpx2K?= =?us-ascii?Q?vNmI5gYcoelv/EGYa5VHao194kH+ExQHwXpQ4awUh1mPVKzi2KTWt6KJO88L?= =?us-ascii?Q?X5GjnHaVqUQdumryANYtBmRdzCvQS3wED1NiZ0/kCfgDozgzNwEMIHwibFq+?= =?us-ascii?Q?aa8bvOmhml6MsfsJ8p6nwk3eFu2IJ/EIgYof07zP+XjJSrzMuCEDxQTiEY5l?= =?us-ascii?Q?yi0Hhvt8OEchDYR75SgtaavpSQoTmOMwHAbrvTkyj4AKSNl1nUDrgH+uwliI?= =?us-ascii?Q?EGfHEH2A9c24k5FxKF9MNtvB5xhxzLKvt9BhwwafWD+OPr9slo2xtpQYxnbU?= =?us-ascii?Q?qrS8JmygzmA9ObDWxt50AzRev39bdrKj6PGhbPt+gWjkJX4f/DOVC7e2hVV4?= =?us-ascii?Q?pv7GWBkhShewF2Ikn+KDRNrgEbJMJ0T8ShEuR0Q6U8MHuyzMI/WlQJRU9CB7?= =?us-ascii?Q?x0Zsuh/fr+/WkpgDtEW7wcupAvD3G4/Q9E6a0uFwGghiyDnjtk7SwThZDO0E?= =?us-ascii?Q?rEsYWLihNLoJtwS4nYKAMyytmoPanOlof25JCnaDUM4F189KIUlvOSvR1wVN?= =?us-ascii?Q?xU62AKh/T3deNVmCd/Gh+rxkJnLBK2AFdEV43cvh9aNcsxbrEBt643/9FdjO?= =?us-ascii?Q?LzLTTad8xnAgUNrx8bO7IWVqacDXv1shATXXJ1zKcht6SLs53PUo7yp6LG5O?= =?us-ascii?Q?Sv8G7mudo7/FFfLGm6TiYDPEVh88rMgOXgbnB5UO9HcZuIEhscqGMNI8FGCd?= =?us-ascii?Q?ArnqdYtedl8q0AojDPHPtdqk67HLk/rz/hVAOqkBemPm5Jrv1LVJKnK5QhEy?= =?us-ascii?Q?DELDx1QH0QmXeusBkcBoaTT6vAuruMYAW/uVdyPj7/B/WyxgZMyPh9kEiuHg?= =?us-ascii?Q?A3+s89of/8i/SKPyc62LYRR6fhnxZrhLTc00vqqqoj+Y3ZayhpLNPOk9tMJa?= =?us-ascii?Q?EVeUZaMPD62OnD6/uqyDXgmtZBMjdgZS1Red4a1aUkEIixZ9QhuyDg6rC7Mr?= =?us-ascii?Q?uvac3dxqRB2R8QmAT59DFJ1Q6aWGxKvcUnfnaOhPOYe4cIvi/NLA67xQ2hoa?= =?us-ascii?Q?9aZ/VDwTq1YR+xnZHniby3aqOhZ+F/p91EoSEk/6lEgH4oAsPCQYjdRbezNf?= =?us-ascii?Q?YTepxlzoENgptAaHilO0VqOElg+v9i+m42o0LmelCouWTNJc8VJc132kd1E6?= =?us-ascii?Q?JXsnLzzpE6BW2Bx+PwAJXCFxpUy1nvPnZXgdsiBI+lIzOf14vE035sy9pR6S?= =?us-ascii?Q?B/ZdjANPVpvS3bMuSAo=3D?= X-Forefront-Antispam-Report: CIP:165.204.84.17;CTRY:US;LANG:en;SCL:1;SRV:;IPV:CAL;SFV:NSPM;H:satlexmb07.amd.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230040)(82310400026)(376014)(1800799024)(36860700013);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Nov 2025 16:09:39.7782 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 145e00ef-5d77-4932-4e93-08de22cf0c9c X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d;Ip=[165.204.84.17];Helo=[satlexmb07.amd.com] X-MS-Exchange-CrossTenant-AuthSource: CH1PEPF0000A34C.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN6PR12MB8514 Content-Type: text/plain; charset="utf-8" In case the fill job depends on a previous fence, the caller can now pass it to make sure the ordering of the jobs is correct. Signed-off-by: Pierre-Eric Pelloux-Prayer --- drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 2 +- drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 22 ++++++++++++++++------ drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h | 1 + 3 files changed, 18 insertions(+), 7 deletions(-) diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c b/drivers/gpu/drm/a= md/amdgpu/amdgpu_object.c index e7b2cae031b3..be3532134e46 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c @@ -1322,7 +1322,7 @@ void amdgpu_bo_release_notify(struct ttm_buffer_objec= t *bo) goto out; =20 r =3D amdgpu_fill_buffer(&adev->mman.clear_entities[0], abo, 0, &bo->base= ._resv, - &fence, AMDGPU_KERNEL_JOB_ID_CLEAR_ON_RELEASE); + &fence, NULL, AMDGPU_KERNEL_JOB_ID_CLEAR_ON_RELEASE); if (WARN_ON(r)) goto out; =20 diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c b/drivers/gpu/drm/amd/= amdgpu/amdgpu_ttm.c index e1f0567fd2d5..b13f0993dbf1 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c @@ -173,6 +173,7 @@ static void amdgpu_evict_flags(struct ttm_buffer_object= *bo, * @tmz: if we should setup a TMZ enabled mapping * @size: in number of bytes to map, out number of bytes mapped * @addr: resulting address inside the MC address space + * @dep: optional dependency * * Setup one of the GART windows to access a specific piece of memory or r= eturn * the physical address for local memory. @@ -182,7 +183,8 @@ static int amdgpu_ttm_map_buffer(struct drm_sched_entit= y *entity, struct ttm_resource *mem, struct amdgpu_res_cursor *mm_cur, unsigned int window, struct amdgpu_ring *ring, - bool tmz, uint64_t *size, uint64_t *addr) + bool tmz, uint64_t *size, uint64_t *addr, + struct dma_fence *dep) { struct amdgpu_device *adev =3D ring->adev; unsigned int offset, num_pages, num_dw, num_bytes; @@ -234,6 +236,9 @@ static int amdgpu_ttm_map_buffer(struct drm_sched_entit= y *entity, if (r) return r; =20 + if (dep) + drm_sched_job_add_dependency(&job->base, dma_fence_get(dep)); + src_addr =3D num_dw * 4; src_addr +=3D job->ibs[0].gpu_addr; =20 @@ -326,13 +331,15 @@ static int amdgpu_ttm_copy_mem_to_mem(struct amdgpu_d= evice *adev, /* Map src to window 0 and dst to window 1. */ r =3D amdgpu_ttm_map_buffer(&entity->base, src->bo, src->mem, &src_mm, - entity->gart_window_id0, ring, tmz, &cur_size, &from); + entity->gart_window_id0, ring, tmz, &cur_size, &from, + NULL); if (r) goto error; =20 r =3D amdgpu_ttm_map_buffer(&entity->base, dst->bo, dst->mem, &dst_mm, - entity->gart_window_id1, ring, tmz, &cur_size, &to); + entity->gart_window_id1, ring, tmz, &cur_size, &to, + NULL); if (r) goto error; =20 @@ -415,7 +422,7 @@ static int amdgpu_move_blit(struct ttm_buffer_object *b= o, struct dma_fence *wipe_fence =3D NULL; =20 r =3D amdgpu_fill_buffer(&adev->mman.move_entities[0], - abo, 0, NULL, &wipe_fence, + abo, 0, NULL, &wipe_fence, fence, AMDGPU_KERNEL_JOB_ID_MOVE_BLIT); if (r) { goto error; @@ -2443,7 +2450,8 @@ int amdgpu_ttm_clear_buffer(struct amdgpu_bo *bo, =20 r =3D amdgpu_ttm_map_buffer(&entity->base, &bo->tbo, bo->tbo.resource, &cursor, - entity->gart_window_id1, ring, false, &size, &addr); + entity->gart_window_id1, ring, false, &size, &addr, + NULL); if (r) goto err; =20 @@ -2469,6 +2477,7 @@ int amdgpu_fill_buffer(struct amdgpu_ttm_buffer_entit= y *entity, uint32_t src_data, struct dma_resv *resv, struct dma_fence **f, + struct dma_fence *dependency, u64 k_job_id) { struct amdgpu_device *adev =3D amdgpu_ttm_adev(bo->tbo.bdev); @@ -2496,7 +2505,8 @@ int amdgpu_fill_buffer(struct amdgpu_ttm_buffer_entit= y *entity, r =3D amdgpu_ttm_map_buffer(&entity->base, &bo->tbo, bo->tbo.resource, &dst, entity->gart_window_id1, ring, false, - &cur_size, &to); + &cur_size, &to, + dependency); if (r) goto error; =20 diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h b/drivers/gpu/drm/amd/= amdgpu/amdgpu_ttm.h index 9d4891e86675..e8f8165f5bcf 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h @@ -186,6 +186,7 @@ int amdgpu_fill_buffer(struct amdgpu_ttm_buffer_entity = *entity, uint32_t src_data, struct dma_resv *resv, struct dma_fence **f, + struct dma_fence *dependency, u64 k_job_id); =20 int amdgpu_ttm_alloc_gart(struct ttm_buffer_object *bo); --=20 2.43.0 From nobody Sat Feb 7 20:28:07 2026 Received: from CH1PR05CU001.outbound.protection.outlook.com (mail-northcentralusazon11010062.outbound.protection.outlook.com [52.101.193.62]) (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 770B82F39C3; Thu, 13 Nov 2025 16:10:09 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=52.101.193.62 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763050210; cv=fail; b=fGEufN9cT3scOJvmluX2EIoAZMUydxzSK47lIKwBnzaFmsI0FKAwKa3qABwBBTiLAgw0hfa6zjrhCGHtA3Y/Js84fLHyPwHyRiynpdAxB3ueO4J01rtrfM51Vi5PIo/V9eufWEju0DfoztTct6RdDe9z6CqEmdRom5TvCBmDLVU= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763050210; c=relaxed/simple; bh=eI5we291TtHymN9FpWggfP+Kn1n1227Mz1ITmpN+0g4=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=Zz+63Cyl6xrmq4F+kDbcf/HGYVHpuo2Evu6E5cVB7IzJkm9gpqQNaUcxIcaWc77kK6xstcMAsta2biHytrBXlsdY/89wHG6s5k83nNAAyM/+0QCLloI5nrm/2gZxlsVqkvS5p0LFgpcUt/RfCdzNSKbb2JVXqjvteDOTfhZvKLI= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amd.com; spf=fail smtp.mailfrom=amd.com; dkim=pass (1024-bit key) header.d=amd.com header.i=@amd.com header.b=yCHqWtRI; arc=fail smtp.client-ip=52.101.193.62 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amd.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=amd.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=amd.com header.i=@amd.com header.b="yCHqWtRI" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=GstgmNMqLamSFbtEwBKhvshQpD5N2EnJO3WCAaWkKnC+YWxCH6QsCyMcZwdvvoGY2iTrjTg9tDlrsFDBhWcle9hjV8z3QSftMj1HifrdwWU8zTrvLLUsRdyaTsczQBBVedYT4KhQaJoa3qETBCldSSxh2OdRHuIj+NytluKat5cVSd8+eeeN/AiaYW0nfvRUGP7XRhCP6rB9CK5t0DlwUrEfnLcZ0jeaVzuNb750fodi//W77RMsebxQdd+i46FOvH2Vc080J6GyqLv4FFbJeDORxrRqxrgydCWlV/YTBV5DL+b483X6LigoY7FatM2dex9ly7vRhQEx9aI8dA72Ew== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=eXKHMuwCp88CYdzP4o6Ot64+FB4KTWJROkIjnjWgsL4=; b=fznFXnZva1FD0c2xo8i2tOsna91bw2/FsEaeL8bxohkDm9aLOUH1dt/go/JgMZGJWsjibws1W734slWoeSqL5BIvGywvLfsbodpUYez0EeKpbjFNBZwoprFK92eERV0UtHKU8aTsbVQDTtNXFsX2Yvw5Zr9ZhzG+uGMBqfzEMPsTLJPulIQKNzEcpgaZNL52xmyeiIdlUISOhlgT4wumdi8V+BBgDX8sUNSZ3nYgSeVSf2WyfSA7I55N3fhRhP1FInNLRypiQMiL+0KKNt/4OJTzvVOdW+2chk2yXA0fYqBV7dE9KOQc6UHM2rszqIciBFVuzeWOjI2QeUSQGVWbiA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=gmail.com smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=eXKHMuwCp88CYdzP4o6Ot64+FB4KTWJROkIjnjWgsL4=; b=yCHqWtRIIYiIdGGyoC8v0usfmC66ZP3zr6UoNZX2CDSth3QuNpL8fjW2UIydVUoB5z88hh+EgO8JrryGH8eXfqS43wJaZ/KN5J/yIZBvNsycU6WO5xyc9Z5Sul1AmtpVoMMRATGv8z1NOc4vfA+SwsDZNT1gJVOeFa9tS2xhx0A= Received: from BN9PR03CA0921.namprd03.prod.outlook.com (2603:10b6:408:107::26) by MW4PR12MB7333.namprd12.prod.outlook.com (2603:10b6:303:21b::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9320.17; Thu, 13 Nov 2025 16:10:06 +0000 Received: from BL02EPF0002992E.namprd02.prod.outlook.com (2603:10b6:408:107:cafe::25) by BN9PR03CA0921.outlook.office365.com (2603:10b6:408:107::26) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.9320.17 via Frontend Transport; Thu, 13 Nov 2025 16:10:06 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=satlexmb07.amd.com; pr=C Received: from satlexmb07.amd.com (165.204.84.17) by BL02EPF0002992E.mail.protection.outlook.com (10.167.249.59) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9320.13 via Frontend Transport; Thu, 13 Nov 2025 16:10:06 +0000 Received: from FRAPPELLOUX01-WSLPUB.amd.com (10.180.168.240) by satlexmb07.amd.com (10.181.42.216) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.2562.17; Thu, 13 Nov 2025 08:10:04 -0800 From: Pierre-Eric Pelloux-Prayer To: Alex Deucher , =?UTF-8?q?Christian=20K=C3=B6nig?= , David Airlie , Simona Vetter , Sumit Semwal CC: Pierre-Eric Pelloux-Prayer , , , , , Subject: [PATCH v2 10/20] drm/admgpu: handle resv dependencies in amdgpu_ttm_map_buffer Date: Thu, 13 Nov 2025 17:05:51 +0100 Message-ID: <20251113160632.5889-11-pierre-eric.pelloux-prayer@amd.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20251113160632.5889-1-pierre-eric.pelloux-prayer@amd.com> References: <20251113160632.5889-1-pierre-eric.pelloux-prayer@amd.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-ClientProxiedBy: satlexmb07.amd.com (10.181.42.216) To satlexmb07.amd.com (10.181.42.216) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BL02EPF0002992E:EE_|MW4PR12MB7333:EE_ X-MS-Office365-Filtering-Correlation-Id: fdbcde71-6c49-42b4-942e-08de22cf1c47 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|376014|82310400026|1800799024|36860700013; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?oKzOkQQI0vPTr6t3lXpAkd6CLpBw3x7CXte5ii3KxDXCrjsCwCqtBrDp4sfi?= =?us-ascii?Q?VdE/x4W8e5XVSqba8OOYqX7dp9oHsJq33aejv5r2yjWpxthCY7rirczKU0nV?= =?us-ascii?Q?O0kyrdJIkOZuXMlZfyTcYU2Zk3BWBvgtHAd4yTP8MbVlmXZ8KI7hLy5PUBF4?= =?us-ascii?Q?238Jg0ITlxXczrMqI4uRGuOpglkYKB1ALOOcwazWmKJiiBBP+N2b5iYHUBbI?= =?us-ascii?Q?IlTvCC4UVYEAftsN7BvMGrEBiSC+36aVLHYeTWLNYMCWTVXRrtcf1YclKjm7?= =?us-ascii?Q?ZmTrexxvhGDwIchIGglVKBeACUDYICuswcP2fEdlSSl1jdOZNVO7ijISNHCF?= =?us-ascii?Q?HoDBifaQAlIIHjzPLqverXfmP/BER/4tK74leYYTdVLwCMNBAcYr6e4bDyti?= =?us-ascii?Q?Vxf8v4wZH/G06tXocowbkpG80aOmLS2gsnRvFskCWa7z5EVM2m1XLSp/5Wr5?= =?us-ascii?Q?kFx5VtlXAfsVIMD8WDmeJfKtnCHQg62GmTypJ0Cx1yfgkv9QPWt9XgDZnTsx?= =?us-ascii?Q?CFB8YdkiqL4J7hY6hI0omKrsGoWbzdjaC6mynRac7HVVwYInFY+6fLM+slyx?= =?us-ascii?Q?xhAhcPtESG34rQzlWxrPa0Ufy87jTjax8hLNPx05kjudLrSm61K62jeh9WFn?= =?us-ascii?Q?IqLzkGBsu/DS7ATax/FI2W2OzSsgN/ya6Q/dm3WpqrSfNk4JfhqiU15pqeKo?= =?us-ascii?Q?vydSCD36ceBEy/0StGBwxesiiW7vj8YIN79Y6b03Vd/T452qtJ5Ba/vY8OXZ?= =?us-ascii?Q?9Sq1PJ5oVyqk1kkIdgMIylRhbNp0tzZh/5pGeqWOeC4KfLH9z8TUAkWVrs7m?= =?us-ascii?Q?+jVhRfSnmOcUHCG4QB3ULS/i94V2LA3vUl41zf92w5gSfX6T/u13YX9vqtfa?= =?us-ascii?Q?eQJvcvkE4MpDKxZL0QJAW2u9Kb3UefjOnD7mDpWwmx/TwIk1Q72p5c3c608C?= =?us-ascii?Q?zB851nyuRrzqo/SB9BV23iuIpW+jzVdPq/EymKlYQHw2EFXyGEjZkXHK7/59?= =?us-ascii?Q?p2CYP/C01q1L2wBmB/souOkFtbNl8d5yxFfK8f7juTNFA/jFP04Vz3RRp9K/?= =?us-ascii?Q?XO2AjAh4qM9W4sjoOsUk74lEpteT0Yz9/yVGyuJR6WRDgCA35HelZjmq04+c?= =?us-ascii?Q?IDlbEb4tNYT4yN7NqZHy3Od+mKDrU+3sc6xcf7jX5hd4xr0Qb0iP1ilGqyYl?= =?us-ascii?Q?kCgCafW7QNeAZppmcqaxweteNCqSZsKg+IVUoilrGbbvqK2ZinDK2Yh+Lud+?= =?us-ascii?Q?qXUNrwnb9++0vIoAxgN93nFCjzItxFY6RFg11FMjVW8wbEwR6sLDbMQfoj/F?= =?us-ascii?Q?I7cfG1gnqyXbe0iobBMTVEz0OoRtLtK8vVi4HkRWDwidFPySBqkyH6KhTs1n?= =?us-ascii?Q?G/OHnkuvie8vvcsrZulIEUQXHMaICLAAcNDwDRpSxmh8uBrcySagr7QsgQ8e?= =?us-ascii?Q?r+8S0YWukmFwmrQkjm2bZlJIExF3BxH8IZzkKoNok8JraZ1TM3V4d9WbqgOc?= =?us-ascii?Q?pq+eiqFGnrjbI3+wCbAa9ZkJjg9sAuEO5rdEvZmRozn8BulP/HhXA0Y1h75z?= =?us-ascii?Q?bqTByj7QCEVE1MLhhsY=3D?= X-Forefront-Antispam-Report: CIP:165.204.84.17;CTRY:US;LANG:en;SCL:1;SRV:;IPV:CAL;SFV:NSPM;H:satlexmb07.amd.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230040)(376014)(82310400026)(1800799024)(36860700013);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Nov 2025 16:10:06.0770 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: fdbcde71-6c49-42b4-942e-08de22cf1c47 X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d;Ip=[165.204.84.17];Helo=[satlexmb07.amd.com] X-MS-Exchange-CrossTenant-AuthSource: BL02EPF0002992E.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW4PR12MB7333 Content-Type: text/plain; charset="utf-8" If a resv object is passed, its fences are treated as a dependency for the amdgpu_ttm_map_buffer operation. This will be used by amdgpu_bo_release_notify through amdgpu_fill_buffer. Signed-off-by: Pierre-Eric Pelloux-Prayer --- drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c b/drivers/gpu/drm/amd/= amdgpu/amdgpu_ttm.c index b13f0993dbf1..411997db70eb 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c @@ -184,7 +184,8 @@ static int amdgpu_ttm_map_buffer(struct drm_sched_entit= y *entity, struct amdgpu_res_cursor *mm_cur, unsigned int window, struct amdgpu_ring *ring, bool tmz, uint64_t *size, uint64_t *addr, - struct dma_fence *dep) + struct dma_fence *dep, + struct dma_resv *resv) { struct amdgpu_device *adev =3D ring->adev; unsigned int offset, num_pages, num_dw, num_bytes; @@ -239,6 +240,10 @@ static int amdgpu_ttm_map_buffer(struct drm_sched_enti= ty *entity, if (dep) drm_sched_job_add_dependency(&job->base, dma_fence_get(dep)); =20 + if (resv) + drm_sched_job_add_resv_dependencies(&job->base, resv, + DMA_RESV_USAGE_BOOKKEEP); + src_addr =3D num_dw * 4; src_addr +=3D job->ibs[0].gpu_addr; =20 @@ -332,14 +337,14 @@ static int amdgpu_ttm_copy_mem_to_mem(struct amdgpu_d= evice *adev, r =3D amdgpu_ttm_map_buffer(&entity->base, src->bo, src->mem, &src_mm, entity->gart_window_id0, ring, tmz, &cur_size, &from, - NULL); + NULL, NULL); if (r) goto error; =20 r =3D amdgpu_ttm_map_buffer(&entity->base, dst->bo, dst->mem, &dst_mm, entity->gart_window_id1, ring, tmz, &cur_size, &to, - NULL); + NULL, NULL); if (r) goto error; =20 @@ -2451,7 +2456,7 @@ int amdgpu_ttm_clear_buffer(struct amdgpu_bo *bo, r =3D amdgpu_ttm_map_buffer(&entity->base, &bo->tbo, bo->tbo.resource, &cursor, entity->gart_window_id1, ring, false, &size, &addr, - NULL); + NULL, NULL); if (r) goto err; =20 @@ -2506,7 +2511,8 @@ int amdgpu_fill_buffer(struct amdgpu_ttm_buffer_entit= y *entity, &bo->tbo, bo->tbo.resource, &dst, entity->gart_window_id1, ring, false, &cur_size, &to, - dependency); + dependency, + resv); if (r) goto error; =20 --=20 2.43.0 From nobody Sat Feb 7 20:28:07 2026 Received: from BL0PR03CU003.outbound.protection.outlook.com (mail-eastusazon11012003.outbound.protection.outlook.com [52.101.53.3]) (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 F30263271F9 for ; Thu, 13 Nov 2025 16:10:32 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=52.101.53.3 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763050234; cv=fail; b=eVq0RR/QhOMh4dX5uoe7Zv5Knl8mzBokjlTvmi2guJPNqwsgJoNyWAyoxENXp5bWNt5A6NQC5bP/x99z0nYFo85kn0p2B/8gGbYl00nZGQyTmer5rqsb4WH+njoMOpqJz1T6KoAjstxh31PZrSxz9bBI7szzGZ9CIo0E3f53G5Y= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763050234; c=relaxed/simple; bh=xLbmZY2rL1ZjcYPKMQCFEPfwvJqL9NsHtBhmjqFE2so=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=cf9lEPyYck8QpIZEcjV4/PB9p6ds9xAILAuWuehLR42H4ZVa9jnLZq/A8csJ2FbhsfJsG0xWwSMsbK1rQeBJGPQAqYpsbBMeyiuaB+Qn5lCj7EZTxQflGlTSn1ioFCdXGkVcJTR+EuDIl1uefkjn85KzHtbactolzNk/us9W5Ik= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amd.com; spf=fail smtp.mailfrom=amd.com; dkim=pass (1024-bit key) header.d=amd.com header.i=@amd.com header.b=wSPECJpE; arc=fail smtp.client-ip=52.101.53.3 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amd.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=amd.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=amd.com header.i=@amd.com header.b="wSPECJpE" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=JJ7I6DItSdeuH0wARmNS2JFEub75TzW9ZuWzq3uk+aHMVnoXcrjYW2eB/HGU+kz0vX9rXvAR7coQpDTVFJwq24cBZR947LkKybuwW/Lu+GRet7msj8FhWFKTYWrEZSIv8N30s7QxXgU2ScsYqO7e8Qo2UPL83OiuCQ16BRh9xwr4qxWs37qDoHBzD4LDVV30SE/iZxwHdACx6a6jBnjfCn9A0i15rpJ7pdK2B97ZviOecCNuuwv8KbE9ZwF/Gns0Dv/MqXeMo5PvyROGPP/ucSQwHoEtlGVASfFIAkfs0f5b8ZEp9Yz0rYOU4AuF0lWzMktAII0J0CneEGjhNPRPYw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=WcCSBjhXx+F/WFOp5AaQlyGioCq9tq/pIwTPmy74awA=; b=idy3FF1OXqishKx9QRaFFmyUtRTya4uTjZplylzUVyOyx2iCBth0a0myW9DlSNHA/XUqc61gjoyp9+lu5eA/70dDkbL3n65QLihyUMDdAVNZcalA71RAkPmFemJ6yat+fgttXh3ij+icwFEaThUeSBtH4q1lzcB7TxZqRlPRPDcmFc19Fj/Ou6EC4E+wc3s/PT9owTBMGMvlWXsWjfNSfB0LV46Ftt7ZdqGcCqfAbAVeOlJKRRetqKt6Vf9A1qm63ZxS1jEkaDxzv9lfzU4HH4neSyeH+laVmJUoTUSYWFtlKJFqb9zQi/avIJJjaSQG88Um1MnSEOH3+qdpH9DgUA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=gmail.com smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=WcCSBjhXx+F/WFOp5AaQlyGioCq9tq/pIwTPmy74awA=; b=wSPECJpE0bL441A7izXH5M3vYOjrUL46Lq1KVTHsWhGX9odLspwb9JsBfZQGAcMImXj1/OPBA2A8jbhydfESJpegq1EL3tjFh07juYtvzfu8U8wkK/mZbKxwPtDhSpcU1HI1QZ2jwyKaR4RfEKTq/ies7hyhFBCsIUP4/PECyjw= Received: from MN2PR08CA0026.namprd08.prod.outlook.com (2603:10b6:208:239::31) by MN0PR12MB5836.namprd12.prod.outlook.com (2603:10b6:208:37b::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9320.17; Thu, 13 Nov 2025 16:10:27 +0000 Received: from BL02EPF00029927.namprd02.prod.outlook.com (2603:10b6:208:239:cafe::5a) by MN2PR08CA0026.outlook.office365.com (2603:10b6:208:239::31) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.9320.17 via Frontend Transport; Thu, 13 Nov 2025 16:10:22 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=satlexmb07.amd.com; pr=C Received: from satlexmb07.amd.com (165.204.84.17) by BL02EPF00029927.mail.protection.outlook.com (10.167.249.52) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9320.13 via Frontend Transport; Thu, 13 Nov 2025 16:10:27 +0000 Received: from FRAPPELLOUX01-WSLPUB.amd.com (10.180.168.240) by satlexmb07.amd.com (10.181.42.216) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.2562.17; Thu, 13 Nov 2025 08:10:25 -0800 From: Pierre-Eric Pelloux-Prayer To: Alex Deucher , =?UTF-8?q?Christian=20K=C3=B6nig?= , David Airlie , Simona Vetter CC: Pierre-Eric Pelloux-Prayer , , , Subject: [PATCH v2 11/20] drm/amdgpu: round robin through clear_entities in amdgpu_fill_buffer Date: Thu, 13 Nov 2025 17:05:52 +0100 Message-ID: <20251113160632.5889-12-pierre-eric.pelloux-prayer@amd.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20251113160632.5889-1-pierre-eric.pelloux-prayer@amd.com> References: <20251113160632.5889-1-pierre-eric.pelloux-prayer@amd.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-ClientProxiedBy: satlexmb07.amd.com (10.181.42.216) To satlexmb07.amd.com (10.181.42.216) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BL02EPF00029927:EE_|MN0PR12MB5836:EE_ X-MS-Office365-Filtering-Correlation-Id: 951616ea-c27c-4d44-b4d9-08de22cf28e3 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|82310400026|36860700013|376014; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?1kF93kxC6xqUZrRjVI4aAPl9t8W0UyTTk3X8uoV/8cZRqXq7oDGWtuMAZ13y?= =?us-ascii?Q?Y5Zj+X13apkf4t87nqj3Jw5d/F8Djxe9NxsVNpJovmmzL0EOtltnwqAncjZA?= =?us-ascii?Q?KZYuBDqywpt7j9v2bqmjRsavw6QziRXIOy080wWfO01Jn6GHUS6d5FpxZLXv?= =?us-ascii?Q?JM33qo3gjsW6GpNiw3Xl/Q+pRl+yTAHhN+zFZf148Ia35naw8ChCeQCJRqxc?= =?us-ascii?Q?CVxRCuCk/4czRpSlqxNxOBzf67O+yX9yA0rYMPxIDIsCn0RVinKrfUH3LnPj?= =?us-ascii?Q?0zfNddhFO6be6JYc99dzfdVi15t01mri/pKgDFZOGqWDM2Fuaacni78n24B2?= =?us-ascii?Q?5uc7I/dYcN5AfO9cWqrIogRwsa6Ij0vA6mFOt2QOaNjfr19MahKSXnWQfJ1p?= =?us-ascii?Q?vnhSgnT2aHsMtyWO9m+Ax8NjQIZcc/4htXHSO6Dgq61WtyxG+49eLOYtCyGV?= =?us-ascii?Q?TicPNe5PVltJIkvukH+vXiI1s9oT10yJeKR75pBkNObfD55kIXnNTcJkUN9Z?= =?us-ascii?Q?x9zHA///bNMFqKFRkzUHx1rLczi1DAis0dBs94r0eQJoWA7Ksw7aPKp/zrHs?= =?us-ascii?Q?vO/WkIkKDbEAKIbJbz9BXgCQvzJ11e5Hks3LPWqkbT6gFs0f7se87yKbdniP?= =?us-ascii?Q?pfnjB9u/fyElOXznBVTw2vujiujD/pjJm1rrEK51uwDL1UUdfgUfmU78DGAk?= =?us-ascii?Q?0m2ikZdri7icKvZMSlKJsPWT6kPX+obRvFBEBv+44HQevygHT+kgx0COSKVd?= =?us-ascii?Q?Ezj58ORor5ZZ5fcSIEPJe2ejJyKKXETXWBCIj7S2BQr1+PEdQww6ExouL7PD?= =?us-ascii?Q?v/LrapS72A1HL6yYzuXu72Ooj95IImYF659//I18Y4J39KgF0SvgqlxGaO2g?= =?us-ascii?Q?+CAzbbsM2S3SbqhMK1HoOGltc0af2ZsjOn9uXJyH+ZHISsFY0u4hVRAtyM85?= =?us-ascii?Q?8m6Ue5l7jWflFPcY+2lKlln7DclOcmVr0jIvts4/UWhJh4ntku2koHRX1YfV?= =?us-ascii?Q?lSa9AU+CzODq5EfE1dktEy4rlrY6wsC0TOssr2S6CwdoYQ8tb6OkMLf+hl1d?= =?us-ascii?Q?qlNS8ddUedMIDL+riC71eZhUhqN8+chc4/BqgIvz9ja2pxvrtRZCIhWIddmt?= =?us-ascii?Q?A7PWJDdjDQ0i1TKuhk/wEb6bTgLB8zGDyqEKdVYfeTAgym1QkAXnRKQSymDm?= =?us-ascii?Q?rbFI+72H5WoQFigoqjjVSNprKNFv7ffZK/aWCy0clyracFaaZsNMupYQ9flZ?= =?us-ascii?Q?NEEv0LHaMv17zBdWownT+o1Ku1J7AV9P9EOMcETdGRaxYsil9FhCFcxuhnoc?= =?us-ascii?Q?YqDkoEHNMVdPeDuYgVBc/5cj2eSuNc2OnfQG6ALvJ4jLvMBxG9scbmMw8DTJ?= =?us-ascii?Q?iDwYENaoUB6Cdgveua5lQ03YDi8vaA/8tKILAEYomNZ2I0cKuYvzvgnaCkJl?= =?us-ascii?Q?rj2+3f39xnHfsoXZymzNVpBLpfGQM4RQvYTVpx1M0CVq7iTF1QdzKVrOTXaA?= =?us-ascii?Q?AF9SVYE/Jiz/hXLNSGCol3JCl7WKRcOwkl5CTg2l0XuRSm3jDWcFd/TGp0aX?= =?us-ascii?Q?sJaHu0JNnMoz984UzzE=3D?= X-Forefront-Antispam-Report: CIP:165.204.84.17;CTRY:US;LANG:en;SCL:1;SRV:;IPV:CAL;SFV:NSPM;H:satlexmb07.amd.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230040)(1800799024)(82310400026)(36860700013)(376014);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Nov 2025 16:10:27.2337 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 951616ea-c27c-4d44-b4d9-08de22cf28e3 X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d;Ip=[165.204.84.17];Helo=[satlexmb07.amd.com] X-MS-Exchange-CrossTenant-AuthSource: BL02EPF00029927.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN0PR12MB5836 Content-Type: text/plain; charset="utf-8" This makes clear of different BOs run in parallel. Partial jobs to clear a single BO still execute sequentially. Signed-off-by: Pierre-Eric Pelloux-Prayer --- drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 2 +- drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 9 ++++++++- drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h | 1 + 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c b/drivers/gpu/drm/a= md/amdgpu/amdgpu_object.c index be3532134e46..33b397107778 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c @@ -1321,7 +1321,7 @@ void amdgpu_bo_release_notify(struct ttm_buffer_objec= t *bo) if (r) goto out; =20 - r =3D amdgpu_fill_buffer(&adev->mman.clear_entities[0], abo, 0, &bo->base= ._resv, + r =3D amdgpu_fill_buffer(NULL, abo, 0, &bo->base._resv, &fence, NULL, AMDGPU_KERNEL_JOB_ID_CLEAR_ON_RELEASE); if (WARN_ON(r)) goto out; diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c b/drivers/gpu/drm/amd/= amdgpu/amdgpu_ttm.c index 411997db70eb..486c701d0d5b 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c @@ -2224,6 +2224,7 @@ u32 amdgpu_ttm_set_buffer_funcs_status(struct amdgpu_= device *adev, bool enable) adev->mman.clear_entities =3D kcalloc(num_clear_entities, sizeof(struct amdgpu_ttm_buffer_entity), GFP_KERNEL); + atomic_set(&adev->mman.next_clear_entity, 0); if (!adev->mman.clear_entities) goto error_free_entity; =20 @@ -2489,7 +2490,7 @@ int amdgpu_fill_buffer(struct amdgpu_ttm_buffer_entit= y *entity, struct amdgpu_ring *ring =3D adev->mman.buffer_funcs_ring; struct dma_fence *fence =3D NULL; struct amdgpu_res_cursor dst; - int r; + int r, e; =20 if (!adev->mman.buffer_funcs_enabled) { dev_err(adev->dev, @@ -2497,6 +2498,12 @@ int amdgpu_fill_buffer(struct amdgpu_ttm_buffer_enti= ty *entity, return -EINVAL; } =20 + if (entity =3D=3D NULL) { + e =3D atomic_inc_return(&adev->mman.next_clear_entity) % + adev->mman.num_clear_entities; + entity =3D &adev->mman.clear_entities[e]; + } + amdgpu_res_first(bo->tbo.resource, 0, amdgpu_bo_size(bo), &dst); =20 mutex_lock(&entity->gart_window_lock); diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h b/drivers/gpu/drm/amd/= amdgpu/amdgpu_ttm.h index e8f8165f5bcf..781b0bdca56c 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h @@ -73,6 +73,7 @@ struct amdgpu_mman { =20 struct amdgpu_ttm_buffer_entity default_entity; /* has no gart windows */ struct amdgpu_ttm_buffer_entity *clear_entities; + atomic_t next_clear_entity; u32 num_clear_entities; struct amdgpu_ttm_buffer_entity move_entities[TTM_NUM_MOVE_FENCES]; u32 num_move_entities; --=20 2.43.0 From nobody Sat Feb 7 20:28:07 2026 Received: from PH0PR06CU001.outbound.protection.outlook.com (mail-westus3azon11011024.outbound.protection.outlook.com [40.107.208.24]) (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 9D2A135B145 for ; Thu, 13 Nov 2025 16:10:44 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.208.24 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763050246; cv=fail; b=b/PBUIJALRIpbL63Aka9cu+ejQfTejSJ9J5PIsT/2YQ2YWCfESyRF8nY+TtxD+/1+vFlx7KSy9eh8dF9gn/cXgLII9SHyQt7Vg95lcRp+cex4VJ5Tv8glZxkUb4zKIdNJ6NgMoCDT2jwgC2n1+2uEUIQmolrfIY7zGVLEu13k5o= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763050246; c=relaxed/simple; bh=FBzt7aOTM6aSec7v9fQ7roPCuU1KMz7iNHLS9UGCBTk=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=lQXImrn9jfyE0k/0T8uE/kMqpCrCXdM35PlP7z4+QPyhC65h0JmOVmQ4e3vZIeOoSuwQ/y999gVIHZFDN1iuhqXuDw6QBfx8FjGuqGkoQ/tZopdvIzbqB72AsSCq1IDqzbQ5jbuKlOi9X1PGKF6kRY5d0me3x962ZHYpr6hBjNM= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amd.com; spf=fail smtp.mailfrom=amd.com; dkim=pass (1024-bit key) header.d=amd.com header.i=@amd.com header.b=ShorlOGG; arc=fail smtp.client-ip=40.107.208.24 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amd.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=amd.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=amd.com header.i=@amd.com header.b="ShorlOGG" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=I2HJbICTJOnjk1A9vGeOM4lAoT9si1gM6GJdc6xizB0LHPlSltXHsFOMw2LHE8FjMcQ4KaRj1dfiOqT7QixmP+Uq4F1Wnm0eRpX6JARo3Du0AXIE7ZLktOQDCaD+F5e6noixtl3nYWTWMTRHY+72gnNT2t92id8XQdV2+R5WsHj2DpDEKsEiVPxGJEMmqU14ba7TSh6f72RGbV5JRkBOl3wPPI8m4sJh9XkkB/sujAL5AOARamknqX4u1cXmHVlIsekts5q3zbqIDVLEX5LoegyBXdW5TfGOf/mD045/8Ui8Bu3nxTYksff9Q82IbL14uVHBYv+xvqmQqgQo7wTUDQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=00Mne1DShvZEWNCnfotiRsrtnQ+gqsxefSJtA7U1RRU=; b=AFUKMUe+I23hAa94xE9x8c8fTUAFQPo5VXPW9/3aSHaDfQhQHROVuUteuDSrtEPr28Fb9aNMpT9Z2blPUn0fiY8CK4k0prQGzs57cAbtGeys/7lDknvNawvKQtMPD0D/8tOVU6lBUQFGZDgsqetJyqPS4BjO4Lr3mvid/xE12hqORofTQdg7B2g6T8DSNW7w6eHpl57Ja2BwA6T1HjRPJ94YuhdFmNov5bO0TWzKJmUd3N8vfArDkM+x0EnCvXtjGoeSC9yyfvSU7LXWq+du/AVyGj6M/MBbrJQCzxOM2F36+Cb50HxPl0QZd0xGqBrmXxZyRyE413nHusbYSebEQg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=gmail.com smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=00Mne1DShvZEWNCnfotiRsrtnQ+gqsxefSJtA7U1RRU=; b=ShorlOGGOKRkgM6E/5J86wQ012sjz7FKf2rf71mEYmxUAHipRqEV7/yWpxm0wVdDDiNU+qmDnjlcJAbUiHkXMXT+Dhmg5aCnI90Crcm0bkm8hdoT9DprzrcTgzfIhaS+FWqn4Uu4gjU29ITmgQlTmWKEsmiemRkim2fvn8TT6+k= Received: from BN9PR03CA0588.namprd03.prod.outlook.com (2603:10b6:408:10d::23) by PH7PR12MB8156.namprd12.prod.outlook.com (2603:10b6:510:2b5::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9320.17; Thu, 13 Nov 2025 16:10:38 +0000 Received: from BL02EPF0002992C.namprd02.prod.outlook.com (2603:10b6:408:10d:cafe::fc) by BN9PR03CA0588.outlook.office365.com (2603:10b6:408:10d::23) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.9320.17 via Frontend Transport; Thu, 13 Nov 2025 16:10:36 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=satlexmb07.amd.com; pr=C Received: from satlexmb07.amd.com (165.204.84.17) by BL02EPF0002992C.mail.protection.outlook.com (10.167.249.57) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9320.13 via Frontend Transport; Thu, 13 Nov 2025 16:10:38 +0000 Received: from FRAPPELLOUX01-WSLPUB.amd.com (10.180.168.240) by satlexmb07.amd.com (10.181.42.216) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.2562.17; Thu, 13 Nov 2025 08:10:36 -0800 From: Pierre-Eric Pelloux-Prayer To: Alex Deucher , =?UTF-8?q?Christian=20K=C3=B6nig?= , David Airlie , Simona Vetter , Felix Kuehling , Harry Wentland , Leo Li , Rodrigo Siqueira CC: Pierre-Eric Pelloux-Prayer , , , Subject: [PATCH v2 12/20] drm/amdgpu: use TTM_NUM_MOVE_FENCES when reserving fences Date: Thu, 13 Nov 2025 17:05:53 +0100 Message-ID: <20251113160632.5889-13-pierre-eric.pelloux-prayer@amd.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20251113160632.5889-1-pierre-eric.pelloux-prayer@amd.com> References: <20251113160632.5889-1-pierre-eric.pelloux-prayer@amd.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-ClientProxiedBy: satlexmb07.amd.com (10.181.42.216) To satlexmb07.amd.com (10.181.42.216) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BL02EPF0002992C:EE_|PH7PR12MB8156:EE_ X-MS-Office365-Filtering-Correlation-Id: 63555095-06a4-4380-77b4-08de22cf2f6e X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|82310400026|376014|1800799024|36860700013; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?bFQKhEKhRaWo3+lElmNZkxp7+ljS4XsjIyQK5HxdfNrw7wgcFhIZBgFaPTZR?= =?us-ascii?Q?BgPSiMSXx2r6eO7EE4YXXsWTT8PVPjpx+y7KgaQqA9URhAnPOhAvkFItZzNF?= =?us-ascii?Q?o6w98WRH6RJQw1PR/G3ZpqtN2c2HQYNlG6BnyMEpaONAgsXa+WVCFvvzusPL?= =?us-ascii?Q?GIq2A9RHHHEt25zLp4KSh7bKu83QnpxZi1UzKNsd9IQPM9lxLROh4KoVqpAa?= =?us-ascii?Q?7e4Xe1/FJ0cuBsTTaA29vQq0hKGkWpZtIZsuxWYIpciYzHfENREV/JWfBYD2?= =?us-ascii?Q?C9wa6zj5QK4C7GTT6xQiexU4Ni8+MAOaiNawxuuP8fowS5mwUaGiwLE9eNwz?= =?us-ascii?Q?drrll+q4lzEJWfxJMENG+IXkCDzvyFJxjQN1kljmWW8kuUYa7BHGbBemfr7f?= =?us-ascii?Q?bqVRWMSOVqy82hmWlv6qJg1stzg0TXv+Ina7MtcqFpNw+ZQnvsovzz2lQo9b?= =?us-ascii?Q?ve8LFUb7f6IUI9zDIBX7lYD8zOaMg9dlJNRrVy3ZMsIjZtwNAEjNhdVCSFam?= =?us-ascii?Q?MM06k+V4fL8xDXZ+oZFRqeiD276JTsYl8I3oZC5tk7dxowH+tay0yokkmMG2?= =?us-ascii?Q?0LrldoVIstWOmTtonKAY0T4cotM/sC8HMn4xHb9KOUEEkb61jTUu8FmbgLWq?= =?us-ascii?Q?5ZoRpz8cYzodaGU6G4k7EsHwpoeLivGDLlhp+Ql/lEQEyCgDRHACwrltb0E4?= =?us-ascii?Q?BXfpJVLWZW5K7LvbKOvryJt4pjDsTNUHB2w2mYHo+U4Nnl4sKLJ0m7kP/BgI?= =?us-ascii?Q?IOyRsw4Gz1Ay4TCVOvYs4HBBU7ZxDm8WuFuAANMmosbVEL6XOtuWVB2rZrWz?= =?us-ascii?Q?UqUkXameHQsG9iDtL8csrF5duFEYFnurmVuw91W26xFLJAV7kwvt2ZGIKr4Q?= =?us-ascii?Q?/19WZtDy0jPfn5EX6S/ig5TMqmE3O9cj3dv8dIv/k8FDaKIqoy6v4R9v+TIR?= =?us-ascii?Q?m+P4mtiV1v/PNEu5UHoyoWFbPoCMOhFQgwm0Rwswo4OFczrw90zRnF94/J9c?= =?us-ascii?Q?k3eHD8hZXs+ciTx6Q1PTNCBCDp8Nx+biK6RwQ+Vi3kKA8A+2P05HJlP5Bg93?= =?us-ascii?Q?IUE/6RyuuP0+ezzfXkTnnqyElrrYMCPeDAtNV0vLFff4Dco7+42xrXVf/r15?= =?us-ascii?Q?hjwof/SeHluB/ea9FRSdb7tXoUS7gaQ1p5jp2msx3mOSGJB20zkD1iMVm0y7?= =?us-ascii?Q?C9IBHWOcaJU95HVlI7j7KGes9J/AkYRlHLxmnU8TmXmvZetlPTPcdRQDS445?= =?us-ascii?Q?kJvOrQlit17mhq51q1DlONzmPLpvrABl8MCAszv92pimwV0DiHs6OUe7eU6R?= =?us-ascii?Q?NwauXLDw+2+RjqHJDfz8OtsjKq2HeSsjGwUxaTjIitfRwBUANkC9ByGHBnjh?= =?us-ascii?Q?QqkxVngfmRX+z8AJjwu+saznglKKAkUiMIXN7vTRzStaZDPfAj0Keatx9Lt3?= =?us-ascii?Q?e/LISUrk/nElGr+adbG7t+DdUvhd7urOZ1sh84OsHckIiUcq4WEKXkmR2pqs?= =?us-ascii?Q?S8H2gEz9g1AGsaY5J94gSAZiJzhoUAVMYFUp+Zv2U0yauniT75vGvgwDFmMJ?= =?us-ascii?Q?qIdqBf/Vpg+/gFdxuJI=3D?= X-Forefront-Antispam-Report: CIP:165.204.84.17;CTRY:US;LANG:en;SCL:1;SRV:;IPV:CAL;SFV:NSPM;H:satlexmb07.amd.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230040)(82310400026)(376014)(1800799024)(36860700013);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Nov 2025 16:10:38.2082 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 63555095-06a4-4380-77b4-08de22cf2f6e X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d;Ip=[165.204.84.17];Helo=[satlexmb07.amd.com] X-MS-Exchange-CrossTenant-AuthSource: BL02EPF0002992C.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH7PR12MB8156 Content-Type: text/plain; charset="utf-8" Use TTM_NUM_MOVE_FENCES as an upperbound of how many fences ttm might need to deal with moves/evictions. Acked-by: Felix Kuehling Reviewed-by: Christian K=C3=B6nig --- v2: removed drm_err calls --- Signed-off-by: Pierre-Eric Pelloux-Prayer --- drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 5 ++--- drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c | 2 +- drivers/gpu/drm/amd/amdgpu/amdgpu_vkms.c | 6 ++---- drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 3 ++- drivers/gpu/drm/amd/amdkfd/kfd_svm.c | 3 +-- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_plane.c | 6 ++---- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_wb.c | 6 ++---- 7 files changed, 12 insertions(+), 19 deletions(-) diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c b/drivers/gpu/drm/amd/a= mdgpu/amdgpu_cs.c index ecdfe6cb36cc..0338522761bc 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c @@ -916,9 +916,8 @@ static int amdgpu_cs_parser_bos(struct amdgpu_cs_parser= *p, goto out_free_user_pages; =20 amdgpu_bo_list_for_each_entry(e, p->bo_list) { - /* One fence for TTM and one for each CS job */ r =3D drm_exec_prepare_obj(&p->exec, &e->bo->tbo.base, - 1 + p->gang_size); + TTM_NUM_MOVE_FENCES + p->gang_size); drm_exec_retry_on_contention(&p->exec); if (unlikely(r)) goto out_free_user_pages; @@ -928,7 +927,7 @@ static int amdgpu_cs_parser_bos(struct amdgpu_cs_parser= *p, =20 if (p->uf_bo) { r =3D drm_exec_prepare_obj(&p->exec, &p->uf_bo->tbo.base, - 1 + p->gang_size); + TTM_NUM_MOVE_FENCES + p->gang_size); drm_exec_retry_on_contention(&p->exec); if (unlikely(r)) goto out_free_user_pages; diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c b/drivers/gpu/drm/amd/= amdgpu/amdgpu_gem.c index ce073e894584..2fe6899f6344 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c @@ -353,7 +353,7 @@ static void amdgpu_gem_object_close(struct drm_gem_obje= ct *obj, =20 drm_exec_init(&exec, DRM_EXEC_IGNORE_DUPLICATES, 0); drm_exec_until_all_locked(&exec) { - r =3D drm_exec_prepare_obj(&exec, &bo->tbo.base, 1); + r =3D drm_exec_prepare_obj(&exec, &bo->tbo.base, TTM_NUM_MOVE_FENCES); drm_exec_retry_on_contention(&exec); if (unlikely(r)) goto out_unlock; diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vkms.c b/drivers/gpu/drm/amd= /amdgpu/amdgpu_vkms.c index 79bad9cbe2ab..b92561eea3da 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vkms.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vkms.c @@ -326,11 +326,9 @@ static int amdgpu_vkms_prepare_fb(struct drm_plane *pl= ane, return r; } =20 - r =3D dma_resv_reserve_fences(rbo->tbo.base.resv, 1); - if (r) { - dev_err(adev->dev, "allocating fence slot failed (%d)\n", r); + r =3D dma_resv_reserve_fences(rbo->tbo.base.resv, TTM_NUM_MOVE_FENCES); + if (r) goto error_unlock; - } =20 if (plane->type !=3D DRM_PLANE_TYPE_CURSOR) domain =3D amdgpu_display_supported_domains(adev, rbo->flags); diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c b/drivers/gpu/drm/amd/a= mdgpu/amdgpu_vm.c index 2f8e83f840a8..aaa44199e9f4 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c @@ -2630,7 +2630,8 @@ int amdgpu_vm_init(struct amdgpu_device *adev, struct= amdgpu_vm *vm, } =20 amdgpu_vm_bo_base_init(&vm->root, vm, root_bo); - r =3D dma_resv_reserve_fences(root_bo->tbo.base.resv, 1); + r =3D dma_resv_reserve_fences(root_bo->tbo.base.resv, + TTM_NUM_MOVE_FENCES); if (r) goto error_free_root; =20 diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_svm.c b/drivers/gpu/drm/amd/amd= kfd/kfd_svm.c index ffb7b36e577c..968cef1cbea6 100644 --- a/drivers/gpu/drm/amd/amdkfd/kfd_svm.c +++ b/drivers/gpu/drm/amd/amdkfd/kfd_svm.c @@ -627,9 +627,8 @@ svm_range_vram_node_new(struct kfd_node *node, struct s= vm_range *prange, } } =20 - r =3D dma_resv_reserve_fences(bo->tbo.base.resv, 1); + r =3D dma_resv_reserve_fences(bo->tbo.base.resv, TTM_NUM_MOVE_FENCES); if (r) { - pr_debug("failed %d to reserve bo\n", r); amdgpu_bo_unreserve(bo); goto reserve_bo_failed; } diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_plane.c b/driv= ers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_plane.c index 56cb866ac6f8..ceb55dd183ed 100644 --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_plane.c +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_plane.c @@ -952,11 +952,9 @@ static int amdgpu_dm_plane_helper_prepare_fb(struct dr= m_plane *plane, return r; } =20 - r =3D dma_resv_reserve_fences(rbo->tbo.base.resv, 1); - if (r) { - drm_err(adev_to_drm(adev), "reserving fence slot failed (%d)\n", r); + r =3D dma_resv_reserve_fences(rbo->tbo.base.resv, TTM_NUM_MOVE_FENCES); + if (r) goto error_unlock; - } =20 if (plane->type !=3D DRM_PLANE_TYPE_CURSOR) domain =3D amdgpu_display_supported_domains(adev, rbo->flags); diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_wb.c b/drivers= /gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_wb.c index d9527c05fc87..110f0173eee6 100644 --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_wb.c +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_wb.c @@ -106,11 +106,9 @@ static int amdgpu_dm_wb_prepare_job(struct drm_writeba= ck_connector *wb_connector return r; } =20 - r =3D dma_resv_reserve_fences(rbo->tbo.base.resv, 1); - if (r) { - drm_err(adev_to_drm(adev), "reserving fence slot failed (%d)\n", r); + r =3D dma_resv_reserve_fences(rbo->tbo.base.resv, TTM_NUM_MOVE_FENCES); + if (r) goto error_unlock; - } =20 domain =3D amdgpu_display_supported_domains(adev, rbo->flags); =20 --=20 2.43.0 From nobody Sat Feb 7 20:28:07 2026 Received: from BL0PR03CU003.outbound.protection.outlook.com (mail-eastusazon11012006.outbound.protection.outlook.com [52.101.53.6]) (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 D9CC5342C92 for ; Thu, 13 Nov 2025 16:10:54 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=52.101.53.6 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763050256; cv=fail; b=na9qXVUADRmgNrl8m8P/fM/Gp7+NwoYUEywlS9Fzm6Wab1KJ/xnlse30HJq4wDSPaGOlCTYRUDol+L+AXqF0ukQDOQsEQwcvxuJ+uObWuY7wVYlylkENBkic+MYrzv00m0PN9qKkXW7LexsNFEuaRLLofzKmBbYM5jXLx4mSKhY= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763050256; c=relaxed/simple; bh=fCp3r/Gh/+KcrDBHicpaBwh03+apEu8vjwlItOXS90w=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=adxan6kqpSMvPrXgQwisgzQaXwyLOFARMVn6RvhwRbyl/IBPc5993VpTASsWQcPfdNq9aCyzcOkIyOvjVOFQkShnZ4vW9CR7bQPSZdZN/TloNjtHtRh+19hkTQUnfHf+kJhQewsftR14WZQK6Ie9aBDLCBoAXmE6M+zld5pd/7s= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amd.com; spf=fail smtp.mailfrom=amd.com; dkim=pass (1024-bit key) header.d=amd.com header.i=@amd.com header.b=OutNvI0G; arc=fail smtp.client-ip=52.101.53.6 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amd.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=amd.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=amd.com header.i=@amd.com header.b="OutNvI0G" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=VMlT912tXMYZ/0N/StWXk0ABk0POfG/u2lZJl629FQ+4mYcxPgOSgy0U0S+l6GtBBP61LwNbY6eIHJzpPADGm5+HTKGcflWwm6lOEeTWwF6TbOZxITsH+0OTsHWCAqq23Xbd1E5IU8hZoKerabPj1AZNpYwqEudKUY8DFzHQCg0ETzYbGv9tKmO15irJ7w6VvU69WKRCUqQsPHqgDto/l7gsZP+44stApWyYdBjsxQDvHjaiX3/paRg5agCE4YhLgOTp+YxaV4QdylLZGFzuaMHKvz/Di4GEcgM0leFRIuIyEPFtsOyKU0ZY2prygEsSEjcesC9gGWxsIr811sfzmQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=sQAmRoSEjxJJbaf0qnFuA+SynIf1jE3xmSg+bMdtVf0=; b=tR9G/z8+lTiCRrMQWu0Nl9HUl8WwWAOmPh11oGfCHp2v7AqO4lL+mFqtR13WLqcFebpIVaVjYzpjq0fD07BD6lXcYjRtE/WvBGj+p8XylF9Z8Gx2GvqSwAFCECY4gtcD03E3IpeZymG0W6BPM/05yzUU6dzjqnDROuwVn2XPQbLIDXhwpSGkjoIbBdO6jHj/VOxNdP6xjakpw1kSPi+wG0rMEpV5opSF270dfDXgiyMqFvAoXz0rJrm63FgRKReeeyVEiiFjvsS75qXQ9/1CrYjHoYO64Gvp36MNDvPZ0nk+PKDfr8VjCYIzlRTwxr5Zb4vh0MqnCS7FM+fMyIuBvQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=gmail.com smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=sQAmRoSEjxJJbaf0qnFuA+SynIf1jE3xmSg+bMdtVf0=; b=OutNvI0GrgVKpGQHyBNNmojj9htQStkHz0bbGR6VaGJwRTry8/7KQ1PGbcHnfRl7aZJjAkevefWuUhh/H/I+Ajdn8S/ofAp/edOxvzEUf7pUStLhq3g/WnPomqL94/pmtzaeOpzuYO+AwcL7xiBnrQDIbP1U38xQg/9nXUcMUNo= Received: from BN0PR04CA0071.namprd04.prod.outlook.com (2603:10b6:408:ea::16) by BL3PR12MB6643.namprd12.prod.outlook.com (2603:10b6:208:38f::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9320.17; Thu, 13 Nov 2025 16:10:49 +0000 Received: from BL02EPF0002992B.namprd02.prod.outlook.com (2603:10b6:408:ea:cafe::d8) by BN0PR04CA0071.outlook.office365.com (2603:10b6:408:ea::16) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.9320.17 via Frontend Transport; Thu, 13 Nov 2025 16:10:49 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=satlexmb07.amd.com; pr=C Received: from satlexmb07.amd.com (165.204.84.17) by BL02EPF0002992B.mail.protection.outlook.com (10.167.249.56) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9320.13 via Frontend Transport; Thu, 13 Nov 2025 16:10:49 +0000 Received: from FRAPPELLOUX01-WSLPUB.amd.com (10.180.168.240) by satlexmb07.amd.com (10.181.42.216) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.2562.17; Thu, 13 Nov 2025 08:10:47 -0800 From: Pierre-Eric Pelloux-Prayer To: Alex Deucher , =?UTF-8?q?Christian=20K=C3=B6nig?= , David Airlie , Simona Vetter CC: Pierre-Eric Pelloux-Prayer , , , Subject: [PATCH v2 13/20] drm/amdgpu: use multiple entities in amdgpu_move_blit Date: Thu, 13 Nov 2025 17:05:54 +0100 Message-ID: <20251113160632.5889-14-pierre-eric.pelloux-prayer@amd.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20251113160632.5889-1-pierre-eric.pelloux-prayer@amd.com> References: <20251113160632.5889-1-pierre-eric.pelloux-prayer@amd.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-ClientProxiedBy: satlexmb07.amd.com (10.181.42.216) To satlexmb07.amd.com (10.181.42.216) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BL02EPF0002992B:EE_|BL3PR12MB6643:EE_ X-MS-Office365-Filtering-Correlation-Id: 306dea2a-56ef-49c4-b121-08de22cf3644 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|36860700013|376014|82310400026; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?haCKpKZPAfsjsroPw5ASLkDKjtLsDAj/3TKaA6cgY4Xz3z5ZLozVpquewgRR?= =?us-ascii?Q?/GWJ1Ci/du8GX3JqYpsLISAQVBlL3GSRSEd/PtAH7PIJZlb6+riAwCbMCPXb?= =?us-ascii?Q?SqkffizPUtj1/HjGRdvsEASxSeu+WmstkE1IHC3qmwY4OJjrtqjXfKFjDGEO?= =?us-ascii?Q?/UZ+/VduhyyhSHjIp/QoRJ8bLq+ywoOMmvF6EVsxRPMxXBC65bCZhdYNM/PN?= =?us-ascii?Q?gbLUaQdQMbUHiDL1OIqNhM5xiIrmeXlFyG8+M/yponbTPHzCX2c7OgdSDLFh?= =?us-ascii?Q?9fnQXjyYnWqe2dIrQjiiEP8T6L21rRzGo8v7Xw/jVZ639+BkmnOx1SjVK7/h?= =?us-ascii?Q?/otJYjmM67DXJpzadqiGxAanBT9lbqZ2036sj0qPLQ2bcei0tCCpd38QR8jx?= =?us-ascii?Q?a9oy7vP0KB5eu4gojLnn7fccFdlaJpyj3zM71fFJSEXGAApRSOxghIYzHEB/?= =?us-ascii?Q?oEzotda1jAlH8HmKQCfslbe+HeKpoeYEcME7KXCD0m02q64KdIVcMvJD1cPn?= =?us-ascii?Q?H0pziM8/VvvmGn7w56yjNRV4+TyOmUGjVV8otLfmHwPs83GbfWI3gm5hadSU?= =?us-ascii?Q?QkszZWl0/5yrGsko/K+U8+knRbVt399ccJhaDvIKnw2kfjWRJ9QJMKwI7iNB?= =?us-ascii?Q?mD0IMJTGOcui1PApsspPbp++hfH28CKXMbCwhReM90cdmWTPIA09hKOQdpEE?= =?us-ascii?Q?4M/3dTzgU1wtATW54OvsePi/dlu00f1KvNVBeqqorZM4UeLNs2mooWYRadvh?= =?us-ascii?Q?XxhlLyZxiDvEle0R5yDXZs6Q1hIRmEEp/Y5zbuEZiReYoYj3qX5mhdbe6mvK?= =?us-ascii?Q?wqZTzbPGV4tvO0k8OaPcGdD7cZGVyh9ag6RTOy5uDLiTHUvl5abEJi8EJL9j?= =?us-ascii?Q?PlLHxV0RWaqstRuB//aP1yLHdwH9i+Ouya9Zp7Af7Qqqx3FTuz6z+5TdD+CD?= =?us-ascii?Q?k62pE6x2pPDrzGkmMETT+arho9lnCzfjuHvaIWYg4BJXvJgIKeQuXw+lAcsB?= =?us-ascii?Q?ZWp74/yV+ZT2Ec4s/vbLhG5RV9Tq50z8JUjqy14qSoV5j/UcnH88fN7TCF/Z?= =?us-ascii?Q?KRnMe9vpOeWgaDrBEWdya7DdhccxpQUooXSnBNpIqWxSQsRGGzxkr4N15FB5?= =?us-ascii?Q?6KgRkUm3F6B37se/TLYQldjBajsrAV795bwKh9BIcALYFbc4suCUeOCTTPUh?= =?us-ascii?Q?5U3m0JLQZpCRrZM7Mhbb/A4R5SP6TnGZm6I4mNV8VNz60qCf6H4n3Vy9rggS?= =?us-ascii?Q?sdnzMILyAuoTDxDa4plYQPojwOqu40qn0ILAlYTU4uStPQi6PE29nvjvFssw?= =?us-ascii?Q?OWDgXmOsp7ysPsx4teeybgZEbgASZBJ5gczQNz0XedtB5DCTkb2USAiapecJ?= =?us-ascii?Q?PVZSRr5ZwwCYgsd70HxdXUtH2E0yAFMS+kSGnk3Q36piaNtYPAG1TbrCiMW9?= =?us-ascii?Q?Sg2dCOIeryhz2m4YThvSdZiw3SymTZdwDk85HDRhQXt9YE0jPnelgr56V+lr?= =?us-ascii?Q?0eBPqrrtv8msyDbPNW536/YiC6s2lUSaTKB/pc+VXHOIaEPulDGsIv3Iov0/?= =?us-ascii?Q?xD8vZMmfHoEDotHIsOo=3D?= X-Forefront-Antispam-Report: CIP:165.204.84.17;CTRY:US;LANG:en;SCL:1;SRV:;IPV:CAL;SFV:NSPM;H:satlexmb07.amd.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230040)(1800799024)(36860700013)(376014)(82310400026);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Nov 2025 16:10:49.6313 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 306dea2a-56ef-49c4-b121-08de22cf3644 X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d;Ip=[165.204.84.17];Helo=[satlexmb07.amd.com] X-MS-Exchange-CrossTenant-AuthSource: BL02EPF0002992B.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BL3PR12MB6643 Content-Type: text/plain; charset="utf-8" Thanks to "drm/ttm: rework pipelined eviction fence handling", ttm can deal correctly with moves and evictions being executed from different contexts. Create several entities and use them in a round-robin fashion. Signed-off-by: Pierre-Eric Pelloux-Prayer Reviewed-by: Christian K=C3=B6nig either way. --- drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 13 ++++++++++--- drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h | 1 + 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c b/drivers/gpu/drm/amd/= amdgpu/amdgpu_ttm.c index 486c701d0d5b..6c333dba7a35 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c @@ -401,6 +401,7 @@ static int amdgpu_move_blit(struct ttm_buffer_object *b= o, { struct amdgpu_device *adev =3D amdgpu_ttm_adev(bo->bdev); struct amdgpu_bo *abo =3D ttm_to_amdgpu_bo(bo); + struct amdgpu_ttm_buffer_entity *entity; struct amdgpu_copy_mem src, dst; struct dma_fence *fence =3D NULL; int r; @@ -412,8 +413,12 @@ static int amdgpu_move_blit(struct ttm_buffer_object *= bo, src.offset =3D 0; dst.offset =3D 0; =20 + int e =3D atomic_inc_return(&adev->mman.next_move_entity) % + adev->mman.num_move_entities; + entity =3D &adev->mman.move_entities[e]; + r =3D amdgpu_ttm_copy_mem_to_mem(adev, - &adev->mman.move_entities[0], + entity, &src, &dst, new_mem->size, amdgpu_bo_encrypted(abo), @@ -426,7 +431,7 @@ static int amdgpu_move_blit(struct ttm_buffer_object *b= o, (abo->flags & AMDGPU_GEM_CREATE_VRAM_WIPE_ON_RELEASE)) { struct dma_fence *wipe_fence =3D NULL; =20 - r =3D amdgpu_fill_buffer(&adev->mman.move_entities[0], + r =3D amdgpu_fill_buffer(entity, abo, 0, NULL, &wipe_fence, fence, AMDGPU_KERNEL_JOB_ID_MOVE_BLIT); if (r) { @@ -2179,7 +2184,8 @@ u32 amdgpu_ttm_set_buffer_funcs_status(struct amdgpu_= device *adev, bool enable) struct ttm_resource_manager *man =3D ttm_manager_type(&adev->mman.bdev, T= TM_PL_VRAM); uint64_t size; int r, i, j; - u32 num_clear_entities, num_move_entities, windows, w; + u32 num_clear_entities, num_move_entities; + u32 windows, w; =20 num_clear_entities =3D adev->sdma.num_instances; num_move_entities =3D MIN(adev->sdma.num_instances, TTM_NUM_MOVE_FENCES); @@ -2205,6 +2211,7 @@ u32 amdgpu_ttm_set_buffer_funcs_status(struct amdgpu_= device *adev, bool enable) } =20 adev->mman.num_move_entities =3D num_move_entities; + atomic_set(&adev->mman.next_move_entity, 0); for (i =3D 0; i < num_move_entities; i++) { r =3D drm_sched_entity_init(&adev->mman.move_entities[i].base, DRM_SCHED_PRIORITY_NORMAL, &sched, diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h b/drivers/gpu/drm/amd/= amdgpu/amdgpu_ttm.h index 781b0bdca56c..4844f001f590 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h @@ -76,6 +76,7 @@ struct amdgpu_mman { atomic_t next_clear_entity; u32 num_clear_entities; struct amdgpu_ttm_buffer_entity move_entities[TTM_NUM_MOVE_FENCES]; + atomic_t next_move_entity; u32 num_move_entities; =20 struct amdgpu_vram_mgr vram_mgr; --=20 2.43.0 From nobody Sat Feb 7 20:28:07 2026 Received: from DM1PR04CU001.outbound.protection.outlook.com (mail-centralusazon11010040.outbound.protection.outlook.com [52.101.61.40]) (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 213A12FA0DF for ; Thu, 13 Nov 2025 16:11:36 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=52.101.61.40 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763050298; cv=fail; b=cE7MxhJX1ltYC5QKDzl22QalApZcw+MceVOSEX/0goHEa+5I+DRxyxLeWyQDe0vN3VRY1YzG/nHPeUXlEo5mpS5P5zxg2GBHz0pN8FQaQUyGwe0vWGi05pzhz86pLxvdYAqdd+lup8rAkHq7xAS5tfuv8WLwtt+/ve1gGJ5D4WU= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763050298; c=relaxed/simple; bh=/rle/+/xYpVdhwDa6/0zQ69stBiNRrS4VMuBZ6cM71g=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=hUw9r8RiT5lwbrz01JvREugwirr31ehkSLWbW8OS1xpmGrjg3Lk1x78imtdbVnVPktwHwJZWh7Rd8A96mvZB8S/VC7J1HpOWAsN8Cye151qoT98+iQgqjm0wJYySN1KW9sDkxygz0FTDHUXQVD8T9gunV2d9DEsGPnkjvSrDXgY= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amd.com; spf=fail smtp.mailfrom=amd.com; dkim=pass (1024-bit key) header.d=amd.com header.i=@amd.com header.b=vMJHph8E; arc=fail smtp.client-ip=52.101.61.40 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amd.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=amd.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=amd.com header.i=@amd.com header.b="vMJHph8E" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=HVDgRL8OIWyHQCTCWTupN2YFHRN6YdEaXv2inp2bvolWPti+Zsf77OY5LTsWwVLiH5WcsVATo7QIBcNgJkOdz0mD5HSV4mWprbXoUB7wM7+6CElYFn56CC7sCZthk1Ot065/irX+K3xLe2qYl3xUIUmnAdZCoen7aaYDW+BJGYk+p7Z4RW45ZDdqSy7c5Cs9qIW3TbtW6s3vyoidFTrgPTTifHxhOvdWpVnIiePetbn7Yiw1TrQ5u+eC5X0icVJTcoSlF3nAamWLeNtMz004/zA+7TOPq6l/PkjKULfuJ670le77KDyTgxA3BWAn1haLxT2EBS5L11rkLe2yIPv22w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=k62Zm/CESU3z+3bssB7l3iKZCfCJd5cB7pWm/VLjpuE=; b=QoRODjwXdIVjxsKrA+Qx7omL23CntJTDKJUYpfkl8GRhPucnJ1tywIGXFtYsWSfj82P1mAxRJPkkleqmvPhHjfcIouZa9LIupioYV6d+bJ/rgZoY6Ey3fON7izSJ0hmXBtsauyXG8wMMAIjs1r96BQgLqhzjrFN/K2W4jVsGRR2z5A0s1usxJTfln3s7GNvzvTnAZbQynvkuuwStf4ock4O0A/wplIiHuqTikeqgeUULP3VLmep3ghRskDIv58l4z2LY7XgjSIJlCl5HACI8uOudErcqmeiXJFqOSglSVci96e13iTJHuYJDe5zpAK1r1+JPoH+OPwpAQXKw2+2ERw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=gmail.com smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=k62Zm/CESU3z+3bssB7l3iKZCfCJd5cB7pWm/VLjpuE=; b=vMJHph8EYk2gFhf5LkDKJeWvjiiv56Hnaw2gBdWXhlOuKlaUPhAi86KBArYdWeFVdgCRZcbj4o0ubsyO8ixaktEIr1EatP8JY5TfKuCgwZUTx4Cv97h2sMmY4rMNrZGmAu69vR4jvZGAlnYLQaQNB1JMJkXUTD1caP88zl5CH9Y= Received: from MN2PR08CA0018.namprd08.prod.outlook.com (2603:10b6:208:239::23) by MN6PR12MB8541.namprd12.prod.outlook.com (2603:10b6:208:47a::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9320.15; Thu, 13 Nov 2025 16:11:29 +0000 Received: from BL02EPF00029927.namprd02.prod.outlook.com (2603:10b6:208:239:cafe::14) by MN2PR08CA0018.outlook.office365.com (2603:10b6:208:239::23) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.9320.17 via Frontend Transport; Thu, 13 Nov 2025 16:11:22 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=satlexmb07.amd.com; pr=C Received: from satlexmb07.amd.com (165.204.84.17) by BL02EPF00029927.mail.protection.outlook.com (10.167.249.52) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9320.13 via Frontend Transport; Thu, 13 Nov 2025 16:11:29 +0000 Received: from FRAPPELLOUX01-WSLPUB.amd.com (10.180.168.240) by satlexmb07.amd.com (10.181.42.216) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.2562.17; Thu, 13 Nov 2025 08:11:28 -0800 From: Pierre-Eric Pelloux-Prayer To: Alex Deucher , =?UTF-8?q?Christian=20K=C3=B6nig?= , David Airlie , Simona Vetter CC: Pierre-Eric Pelloux-Prayer , , , Subject: [PATCH v2 14/20] drm/amdgpu: introduce amdgpu_sdma_set_vm_pte_scheds Date: Thu, 13 Nov 2025 17:05:55 +0100 Message-ID: <20251113160632.5889-15-pierre-eric.pelloux-prayer@amd.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20251113160632.5889-1-pierre-eric.pelloux-prayer@amd.com> References: <20251113160632.5889-1-pierre-eric.pelloux-prayer@amd.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-ClientProxiedBy: satlexmb07.amd.com (10.181.42.216) To satlexmb07.amd.com (10.181.42.216) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BL02EPF00029927:EE_|MN6PR12MB8541:EE_ X-MS-Office365-Filtering-Correlation-Id: 0ad9dd87-f478-4ccf-196d-08de22cf4e31 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|36860700013|1800799024|82310400026|376014; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?YVp/TNrblRixm3bU79y6gYxDVRMp5wlwL53PsmRYPoadtYQv+w5Ee4hhqjpd?= =?us-ascii?Q?RyHd+zB3jrKOANXC/ApAkJT14k/abazQn1m4IIrTvx+ubnRwdhTo0CCda3NG?= =?us-ascii?Q?9qzXidDE37bs+y5j/ertN9op5yRcRsWLZDHnF/wC1nj7Qo20XnSIQNODRjEX?= =?us-ascii?Q?cuwBkyHd6zfL9nv7OXzEmq5KSHWFrGRVNwVmeadXfQrxy0nSxQ69lTFTnjKl?= =?us-ascii?Q?7gNitbzan+eE+TnrZPhgF+KULdiLq2gMgCcWT4RdnZsnfpCcxx+eLfsxSvgr?= =?us-ascii?Q?ML7+ZZ7Onk17KtP7wyadftcHuZ5pRMfCLVCXksLpJB3/fs995rR81yIFD5jz?= =?us-ascii?Q?adIBGucZKqhW3wCxJCeYk+UGMo+FCD7auJf4axh1XhE0/diw9FydfdauI+WP?= =?us-ascii?Q?xpOghRG6Zr11l6Y4E1fZkiutqgxKboosIf3N5i/YED/GPEJerxvJtFfETmOf?= =?us-ascii?Q?e7k4bcNaZSuvB2t9BXOi6SKbucSInh+lGle6gUlvTX3IPEmnIJITcESqEnAC?= =?us-ascii?Q?bCLUsPBHIuG8EZBGhh9X4SVawDAtXd/bO6seHMTLt/iNrhtTK1Nx/n+HvGfE?= =?us-ascii?Q?bePRNMyGv1XaoUI0zu+O3x2X2/ErJw6NwEeZbBKEfAxfW7ltK4YwQLrz9AAr?= =?us-ascii?Q?PjzCi9RUqFd/tSIJ8jETxdWAdjbIWhfiaY3XiRRXK9iPMiYY1LjLLXwJtkTL?= =?us-ascii?Q?KHv8SCUju3g/28ItxUKjN/2MhU053xNm4uG1MaGtSlbiYcsD5fe3fHH6kkkM?= =?us-ascii?Q?ym1HOkwkYHqafTapxBMqt6pb2pU7a9mvDcpM/6h4KrdpYy+SgIwPoQy6ZBAF?= =?us-ascii?Q?K+UZxHjeTfA7A6qbLhcprN01UzqytGAe1AY9YjBnYXvqrqFgFfxRpw4YbDcP?= =?us-ascii?Q?9J+gQcOAxRfS6r4th3/vdrs9VW7qYwo7VcbRdjPJN+Z54vxNZyeZj3dVa0YM?= =?us-ascii?Q?Egwy0eEGZihmAcOZDVs3A+jJJx7MXRhilcoEwgGzcfsVHo+DRFlC+DCZl+El?= =?us-ascii?Q?OIAa52vaeaV8Sk5pcWmvHOrR+Av585VhOcHBkHTxpoXqjKq3l6OrRZmXal0j?= =?us-ascii?Q?xInWAMY++TP/QnGwfypjZEi71OqPCJI+r8SUH7tbF/1CYCdt/qgSiiThAjF3?= =?us-ascii?Q?AcSFBTwu11sECMdJzOyh4K7IbIyy22U016BN8eLFgZXQUC7oOLcERrQ49c6N?= =?us-ascii?Q?2xOEAZcu7uYvfjFvS1ti3WKDEmYAJ+JKY+7ReryqJ5kDutVrcqHENUYB/KAj?= =?us-ascii?Q?5l8dwpFIZKIwlU95CO/rsRK+EcxFft1jxKG18TI/7Drl8ZtpUH4KuSxCcjA5?= =?us-ascii?Q?Ndm9ZOsuzKFjq+QFOEJwC0aRIotLbvbYg/YJyXTwLa9KuYV059tPGFhylwz6?= =?us-ascii?Q?pIbEjJOS07RTpiEMzDw2gdnXVOJy+v2Gk/juHcfDrl5CvbO5mROXUJ39//c4?= =?us-ascii?Q?lPCDFjIAGeXYNmFG2IZk87xkgHT3eRJUjtWw7zae3wTYxO1AcREXPIh475Wo?= =?us-ascii?Q?ZP01S59VEB8OyVW50qV9IUr8qHtp+rwtdHyj8voxK+zaxTpZn+qSso6AaTYb?= =?us-ascii?Q?Xnb8eS6G9azZ7Ppv99A=3D?= X-Forefront-Antispam-Report: CIP:165.204.84.17;CTRY:US;LANG:en;SCL:1;SRV:;IPV:CAL;SFV:NSPM;H:satlexmb07.amd.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230040)(36860700013)(1800799024)(82310400026)(376014);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Nov 2025 16:11:29.8026 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 0ad9dd87-f478-4ccf-196d-08de22cf4e31 X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d;Ip=[165.204.84.17];Helo=[satlexmb07.amd.com] X-MS-Exchange-CrossTenant-AuthSource: BL02EPF00029927.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN6PR12MB8541 Content-Type: text/plain; charset="utf-8" All sdma versions used the same logic, so add a helper and move the common code to a single place. --- v2: pass amdgpu_vm_pte_funcs as well --- Signed-off-by: Pierre-Eric Pelloux-Prayer --- drivers/gpu/drm/amd/amdgpu/amdgpu.h | 2 ++ drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 17 +++++++++++++++++ drivers/gpu/drm/amd/amdgpu/cik_sdma.c | 9 +-------- drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c | 9 +-------- drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c | 9 +-------- drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c | 13 +------------ drivers/gpu/drm/amd/amdgpu/sdma_v4_4_2.c | 13 +------------ drivers/gpu/drm/amd/amdgpu/sdma_v5_0.c | 12 ++---------- drivers/gpu/drm/amd/amdgpu/sdma_v5_2.c | 12 ++---------- drivers/gpu/drm/amd/amdgpu/sdma_v6_0.c | 9 +-------- drivers/gpu/drm/amd/amdgpu/sdma_v7_0.c | 9 +-------- drivers/gpu/drm/amd/amdgpu/si_dma.c | 9 +-------- 12 files changed, 31 insertions(+), 92 deletions(-) diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu.h b/drivers/gpu/drm/amd/amdg= pu/amdgpu.h index 50079209c472..3fab3dc9f3e4 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu.h +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu.h @@ -1613,6 +1613,8 @@ struct dma_fence *amdgpu_device_enforce_isolation(str= uct amdgpu_device *adev, bool amdgpu_device_has_display_hardware(struct amdgpu_device *adev); ssize_t amdgpu_get_soft_full_reset_mask(struct amdgpu_ring *ring); ssize_t amdgpu_show_reset_mask(char *buf, uint32_t supported_reset); +void amdgpu_sdma_set_vm_pte_scheds(struct amdgpu_device *adev, + const struct amdgpu_vm_pte_funcs *vm_pte_funcs); =20 /* atpx handler */ #if defined(CONFIG_VGA_SWITCHEROO) diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c b/drivers/gpu/drm/amd/a= mdgpu/amdgpu_vm.c index aaa44199e9f4..3d29c3642d1a 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c @@ -3210,3 +3210,20 @@ void amdgpu_vm_print_task_info(struct amdgpu_device = *adev, task_info->process_name, task_info->tgid, task_info->task.comm, task_info->task.pid); } + +void amdgpu_sdma_set_vm_pte_scheds(struct amdgpu_device *adev, + const struct amdgpu_vm_pte_funcs *vm_pte_funcs) +{ + struct drm_gpu_scheduler *sched; + int i; + + for (i =3D 0; i < adev->sdma.num_instances; i++) { + if (adev->sdma.has_page_queue) + sched =3D &adev->sdma.instance[i].page.sched; + else + sched =3D &adev->sdma.instance[i].ring.sched; + adev->vm_manager.vm_pte_scheds[i] =3D sched; + } + adev->vm_manager.vm_pte_num_scheds =3D adev->sdma.num_instances; + adev->vm_manager.vm_pte_funcs =3D vm_pte_funcs; +} diff --git a/drivers/gpu/drm/amd/amdgpu/cik_sdma.c b/drivers/gpu/drm/amd/am= dgpu/cik_sdma.c index 9e8715b4739d..5fe162f52c92 100644 --- a/drivers/gpu/drm/amd/amdgpu/cik_sdma.c +++ b/drivers/gpu/drm/amd/amdgpu/cik_sdma.c @@ -1347,14 +1347,7 @@ static const struct amdgpu_vm_pte_funcs cik_sdma_vm_= pte_funcs =3D { =20 static void cik_sdma_set_vm_pte_funcs(struct amdgpu_device *adev) { - unsigned i; - - adev->vm_manager.vm_pte_funcs =3D &cik_sdma_vm_pte_funcs; - for (i =3D 0; i < adev->sdma.num_instances; i++) { - adev->vm_manager.vm_pte_scheds[i] =3D - &adev->sdma.instance[i].ring.sched; - } - adev->vm_manager.vm_pte_num_scheds =3D adev->sdma.num_instances; + amdgpu_sdma_set_vm_pte_scheds(adev, &cik_sdma_vm_pte_funcs); } =20 const struct amdgpu_ip_block_version cik_sdma_ip_block =3D diff --git a/drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c b/drivers/gpu/drm/amd/a= mdgpu/sdma_v2_4.c index 92ce580647cd..63636643db3d 100644 --- a/drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c +++ b/drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c @@ -1242,14 +1242,7 @@ static const struct amdgpu_vm_pte_funcs sdma_v2_4_vm= _pte_funcs =3D { =20 static void sdma_v2_4_set_vm_pte_funcs(struct amdgpu_device *adev) { - unsigned i; - - adev->vm_manager.vm_pte_funcs =3D &sdma_v2_4_vm_pte_funcs; - for (i =3D 0; i < adev->sdma.num_instances; i++) { - adev->vm_manager.vm_pte_scheds[i] =3D - &adev->sdma.instance[i].ring.sched; - } - adev->vm_manager.vm_pte_num_scheds =3D adev->sdma.num_instances; + amdgpu_sdma_set_vm_pte_scheds(adev, &sdma_v2_4_vm_pte_funcs); } =20 const struct amdgpu_ip_block_version sdma_v2_4_ip_block =3D { diff --git a/drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c b/drivers/gpu/drm/amd/a= mdgpu/sdma_v3_0.c index 1c076bd1cf73..0153626b5df2 100644 --- a/drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c +++ b/drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c @@ -1684,14 +1684,7 @@ static const struct amdgpu_vm_pte_funcs sdma_v3_0_vm= _pte_funcs =3D { =20 static void sdma_v3_0_set_vm_pte_funcs(struct amdgpu_device *adev) { - unsigned i; - - adev->vm_manager.vm_pte_funcs =3D &sdma_v3_0_vm_pte_funcs; - for (i =3D 0; i < adev->sdma.num_instances; i++) { - adev->vm_manager.vm_pte_scheds[i] =3D - &adev->sdma.instance[i].ring.sched; - } - adev->vm_manager.vm_pte_num_scheds =3D adev->sdma.num_instances; + amdgpu_sdma_set_vm_pte_scheds(adev, &sdma_v3_0_vm_pte_funcs); } =20 const struct amdgpu_ip_block_version sdma_v3_0_ip_block =3D diff --git a/drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c b/drivers/gpu/drm/amd/a= mdgpu/sdma_v4_0.c index f38004e6064e..96a67b30854c 100644 --- a/drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c +++ b/drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c @@ -2625,18 +2625,7 @@ static const struct amdgpu_vm_pte_funcs sdma_v4_0_vm= _pte_funcs =3D { =20 static void sdma_v4_0_set_vm_pte_funcs(struct amdgpu_device *adev) { - struct drm_gpu_scheduler *sched; - unsigned i; - - adev->vm_manager.vm_pte_funcs =3D &sdma_v4_0_vm_pte_funcs; - for (i =3D 0; i < adev->sdma.num_instances; i++) { - if (adev->sdma.has_page_queue) - sched =3D &adev->sdma.instance[i].page.sched; - else - sched =3D &adev->sdma.instance[i].ring.sched; - adev->vm_manager.vm_pte_scheds[i] =3D sched; - } - adev->vm_manager.vm_pte_num_scheds =3D adev->sdma.num_instances; + amdgpu_sdma_set_vm_pte_scheds(adev, &sdma_v4_0_vm_pte_funcs); } =20 static void sdma_v4_0_get_ras_error_count(uint32_t value, diff --git a/drivers/gpu/drm/amd/amdgpu/sdma_v4_4_2.c b/drivers/gpu/drm/amd= /amdgpu/sdma_v4_4_2.c index 36b1ca73c2ed..04dc8a8f4d66 100644 --- a/drivers/gpu/drm/amd/amdgpu/sdma_v4_4_2.c +++ b/drivers/gpu/drm/amd/amdgpu/sdma_v4_4_2.c @@ -2326,18 +2326,7 @@ static const struct amdgpu_vm_pte_funcs sdma_v4_4_2_= vm_pte_funcs =3D { =20 static void sdma_v4_4_2_set_vm_pte_funcs(struct amdgpu_device *adev) { - struct drm_gpu_scheduler *sched; - unsigned i; - - adev->vm_manager.vm_pte_funcs =3D &sdma_v4_4_2_vm_pte_funcs; - for (i =3D 0; i < adev->sdma.num_instances; i++) { - if (adev->sdma.has_page_queue) - sched =3D &adev->sdma.instance[i].page.sched; - else - sched =3D &adev->sdma.instance[i].ring.sched; - adev->vm_manager.vm_pte_scheds[i] =3D sched; - } - adev->vm_manager.vm_pte_num_scheds =3D adev->sdma.num_instances; + amdgpu_sdma_set_vm_pte_scheds(adev, &sdma_v4_4_2_vm_pte_funcs); } =20 /** diff --git a/drivers/gpu/drm/amd/amdgpu/sdma_v5_0.c b/drivers/gpu/drm/amd/a= mdgpu/sdma_v5_0.c index 7dc67a22a7a0..19c717f2c602 100644 --- a/drivers/gpu/drm/amd/amdgpu/sdma_v5_0.c +++ b/drivers/gpu/drm/amd/amdgpu/sdma_v5_0.c @@ -2081,16 +2081,8 @@ static const struct amdgpu_vm_pte_funcs sdma_v5_0_vm= _pte_funcs =3D { =20 static void sdma_v5_0_set_vm_pte_funcs(struct amdgpu_device *adev) { - unsigned i; - - if (adev->vm_manager.vm_pte_funcs =3D=3D NULL) { - adev->vm_manager.vm_pte_funcs =3D &sdma_v5_0_vm_pte_funcs; - for (i =3D 0; i < adev->sdma.num_instances; i++) { - adev->vm_manager.vm_pte_scheds[i] =3D - &adev->sdma.instance[i].ring.sched; - } - adev->vm_manager.vm_pte_num_scheds =3D adev->sdma.num_instances; - } + if (adev->vm_manager.vm_pte_funcs =3D=3D NULL) + amdgpu_sdma_set_vm_pte_scheds(adev, &sdma_v5_0_vm_pte_funcs); } =20 const struct amdgpu_ip_block_version sdma_v5_0_ip_block =3D { diff --git a/drivers/gpu/drm/amd/amdgpu/sdma_v5_2.c b/drivers/gpu/drm/amd/a= mdgpu/sdma_v5_2.c index 3bd44c24f692..7a07b8f4e86d 100644 --- a/drivers/gpu/drm/amd/amdgpu/sdma_v5_2.c +++ b/drivers/gpu/drm/amd/amdgpu/sdma_v5_2.c @@ -2091,16 +2091,8 @@ static const struct amdgpu_vm_pte_funcs sdma_v5_2_vm= _pte_funcs =3D { =20 static void sdma_v5_2_set_vm_pte_funcs(struct amdgpu_device *adev) { - unsigned i; - - if (adev->vm_manager.vm_pte_funcs =3D=3D NULL) { - adev->vm_manager.vm_pte_funcs =3D &sdma_v5_2_vm_pte_funcs; - for (i =3D 0; i < adev->sdma.num_instances; i++) { - adev->vm_manager.vm_pte_scheds[i] =3D - &adev->sdma.instance[i].ring.sched; - } - adev->vm_manager.vm_pte_num_scheds =3D adev->sdma.num_instances; - } + if (adev->vm_manager.vm_pte_funcs =3D=3D NULL) + amdgpu_sdma_set_vm_pte_scheds(adev, &sdma_v5_2_vm_pte_funcs); } =20 const struct amdgpu_ip_block_version sdma_v5_2_ip_block =3D { diff --git a/drivers/gpu/drm/amd/amdgpu/sdma_v6_0.c b/drivers/gpu/drm/amd/a= mdgpu/sdma_v6_0.c index db6e41967f12..8f8228c7adee 100644 --- a/drivers/gpu/drm/amd/amdgpu/sdma_v6_0.c +++ b/drivers/gpu/drm/amd/amdgpu/sdma_v6_0.c @@ -1897,14 +1897,7 @@ static const struct amdgpu_vm_pte_funcs sdma_v6_0_vm= _pte_funcs =3D { =20 static void sdma_v6_0_set_vm_pte_funcs(struct amdgpu_device *adev) { - unsigned i; - - adev->vm_manager.vm_pte_funcs =3D &sdma_v6_0_vm_pte_funcs; - for (i =3D 0; i < adev->sdma.num_instances; i++) { - adev->vm_manager.vm_pte_scheds[i] =3D - &adev->sdma.instance[i].ring.sched; - } - adev->vm_manager.vm_pte_num_scheds =3D adev->sdma.num_instances; + amdgpu_sdma_set_vm_pte_scheds(adev, &sdma_v6_0_vm_pte_funcs); } =20 const struct amdgpu_ip_block_version sdma_v6_0_ip_block =3D { diff --git a/drivers/gpu/drm/amd/amdgpu/sdma_v7_0.c b/drivers/gpu/drm/amd/a= mdgpu/sdma_v7_0.c index 326ecc8d37d2..cf412d8fb0ed 100644 --- a/drivers/gpu/drm/amd/amdgpu/sdma_v7_0.c +++ b/drivers/gpu/drm/amd/amdgpu/sdma_v7_0.c @@ -1839,14 +1839,7 @@ static const struct amdgpu_vm_pte_funcs sdma_v7_0_vm= _pte_funcs =3D { =20 static void sdma_v7_0_set_vm_pte_funcs(struct amdgpu_device *adev) { - unsigned i; - - adev->vm_manager.vm_pte_funcs =3D &sdma_v7_0_vm_pte_funcs; - for (i =3D 0; i < adev->sdma.num_instances; i++) { - adev->vm_manager.vm_pte_scheds[i] =3D - &adev->sdma.instance[i].ring.sched; - } - adev->vm_manager.vm_pte_num_scheds =3D adev->sdma.num_instances; + amdgpu_sdma_set_vm_pte_scheds(adev, &sdma_v7_0_vm_pte_funcs); } =20 const struct amdgpu_ip_block_version sdma_v7_0_ip_block =3D { diff --git a/drivers/gpu/drm/amd/amdgpu/si_dma.c b/drivers/gpu/drm/amd/amdg= pu/si_dma.c index 7f18e4875287..863e00086c30 100644 --- a/drivers/gpu/drm/amd/amdgpu/si_dma.c +++ b/drivers/gpu/drm/amd/amdgpu/si_dma.c @@ -840,14 +840,7 @@ static const struct amdgpu_vm_pte_funcs si_dma_vm_pte_= funcs =3D { =20 static void si_dma_set_vm_pte_funcs(struct amdgpu_device *adev) { - unsigned i; - - adev->vm_manager.vm_pte_funcs =3D &si_dma_vm_pte_funcs; - for (i =3D 0; i < adev->sdma.num_instances; i++) { - adev->vm_manager.vm_pte_scheds[i] =3D - &adev->sdma.instance[i].ring.sched; - } - adev->vm_manager.vm_pte_num_scheds =3D adev->sdma.num_instances; + amdgpu_sdma_set_vm_pte_scheds(adev, &si_dma_vm_pte_funcs); } =20 const struct amdgpu_ip_block_version si_dma_ip_block =3D --=20 2.43.0 From nobody Sat Feb 7 20:28:07 2026 Received: from BL0PR03CU003.outbound.protection.outlook.com (mail-eastusazon11012009.outbound.protection.outlook.com [52.101.53.9]) (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 2DEA72FA0DF for ; Thu, 13 Nov 2025 16:12:05 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=52.101.53.9 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763050328; cv=fail; b=dBWnLHQIvxTa3r7s9t+0YBKJg3Wc+PfpuLVTAly3ARYQxB0eNXwRmPMs0N1TNycRPqS0Ir/FiCefP3DieB56pvFo2Y18IdaJDCYBxRCsQkV5uX4oo0UEmPgxctFlGf43Kao4JK7O7Mqc7iCTSMgEqInKouBwlUjbaudRqJfkalU= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763050328; c=relaxed/simple; bh=SeSPQrVDTvPyXbCEEel4kkrq3Hg+8sZvJHU6b8pNbEw=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=iN5HlG2QZhPgFGTA/GGTesTv7z9dAtABXCvKpR3DntmA5Yfo9tamr4HuZNM2jQ13Zeh5s7Bpu36F0x1TgwCjtHDfDFnnatfb2uYkaF8MMop2kaXdGMLtwb3gYLfnCwN9FeEAZD3/TQVcVnRv9jwe470uc5PPkRFz190XIVVHTlo= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amd.com; spf=fail smtp.mailfrom=amd.com; dkim=pass (1024-bit key) header.d=amd.com header.i=@amd.com header.b=C1llwbQE; arc=fail smtp.client-ip=52.101.53.9 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amd.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=amd.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=amd.com header.i=@amd.com header.b="C1llwbQE" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=eTkzNId76t5T908Ne+VKPbDbJSJXfzmDALuunBxG6VGXr3DeoA0TzIxMBdqRcy/SS06kDsuJ+cLyztH1t3/QgqKMVwNxpLgnBvwkpVt6hdVhni3bqvWW5to4LFfbFpb5MAHTVhvK3DKETdSpr1FnNFl/Ajsc6yzvFR2pZT27Y+fiygMV1PkyPxfl6uuf57bQAJ6FGfZ0vMQBepx88JOqBOMq1C5Qpd31MYh7XMZBVT55PkMY9mKVIrCijk8JYd92TJawsIm5J4WGQbRozrwZBbXYEVOSJOWL8qFd8oR1VCEODky48BU+IEhLrsxVD2F1wIv+Q2wSpDQNRwXrPKTshg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=fFZ2eaw//3WCmkB7SjUIMEagBrNAQ4dospOtvl02RhY=; b=jtMEzDc3ItzdoIk+7y0BFf16pHi5rxPit6tHzazFgbjKEt/bzWTo9VPHS0Afs/t60QLeVr0VZ/bY/A03RsE/AGr9CuWxaWsY4ZxzO7r34TWRnLW0TNtb2PUxMZekABoxw9yJIFgJb1HZgVZEPeCH1EYrzTHK+6VnO7Td/nO69CNm8kr/TfVnRfWav1D6zgh66MxQKrbozy3wd9S37DmnUxCOn3OWLwlmaksKXDdxrZ0mQe++wRtbfSV4piIlIuFitZtJVqM+SMiUZAXLiKBLX7laVB78WX1XM6Q0d0RqRtyL+mOBom6LJsJ4GX8z5IsmA38lxe7EJNu2IgJP2TZ+SA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=gmail.com smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=fFZ2eaw//3WCmkB7SjUIMEagBrNAQ4dospOtvl02RhY=; b=C1llwbQEEoRBGk2xQZbTf3TknRid5JkNafTidkQe/enaDxrJ9JCtJLR8U7LT9Gslbts/XU5TJk6Lbzibs1jDP823WbNbc03CZB/4O5u9cycTGQYqRAK70Ud3io80yvG3mo4Dn/n5cTMIKE0Rso3fEX4kTNPg9ln/LKOvqCTrzok= Received: from MN2PR07CA0021.namprd07.prod.outlook.com (2603:10b6:208:1a0::31) by LV8PR12MB9359.namprd12.prod.outlook.com (2603:10b6:408:1fe::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9320.17; Thu, 13 Nov 2025 16:12:02 +0000 Received: from BL02EPF0002992E.namprd02.prod.outlook.com (2603:10b6:208:1a0:cafe::11) by MN2PR07CA0021.outlook.office365.com (2603:10b6:208:1a0::31) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.9320.16 via Frontend Transport; Thu, 13 Nov 2025 16:11:58 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=satlexmb07.amd.com; pr=C Received: from satlexmb07.amd.com (165.204.84.17) by BL02EPF0002992E.mail.protection.outlook.com (10.167.249.59) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9320.13 via Frontend Transport; Thu, 13 Nov 2025 16:12:01 +0000 Received: from FRAPPELLOUX01-WSLPUB.amd.com (10.180.168.240) by satlexmb07.amd.com (10.181.42.216) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.2562.17; Thu, 13 Nov 2025 08:11:55 -0800 From: Pierre-Eric Pelloux-Prayer To: Alex Deucher , =?UTF-8?q?Christian=20K=C3=B6nig?= , David Airlie , Simona Vetter , Felix Kuehling CC: Pierre-Eric Pelloux-Prayer , , , Subject: [PATCH v2 15/20] drm/amdgpu: pass all the sdma scheds to amdgpu_mman Date: Thu, 13 Nov 2025 17:05:56 +0100 Message-ID: <20251113160632.5889-16-pierre-eric.pelloux-prayer@amd.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20251113160632.5889-1-pierre-eric.pelloux-prayer@amd.com> References: <20251113160632.5889-1-pierre-eric.pelloux-prayer@amd.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-ClientProxiedBy: satlexmb07.amd.com (10.181.42.216) To satlexmb07.amd.com (10.181.42.216) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BL02EPF0002992E:EE_|LV8PR12MB9359:EE_ X-MS-Office365-Filtering-Correlation-Id: c3a5ca59-50fe-4746-0165-08de22cf60f7 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|36860700013|82310400026|376014; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?vj4gtnBVfg9KYNtwNh80Fa9Pyzj5oYuNYyZEkJiRrUHWEQb/O4lx1ookZlUQ?= =?us-ascii?Q?zsB4wlFEkWxF3mNw2bingAr0aoVP0SCzI9+du/nfU1c8TcqyfJP/GlpWZSOV?= =?us-ascii?Q?1H7/StZm3haCuy6V+4PMrWHOUSAvOso2wk8Fvc0UA7gJm6O1TSfLCxij+hSC?= =?us-ascii?Q?nmer0bWlHP4cAT5vj3B2HAFc07XGLWI6TA/mI6WQ4TplQKKFH2pn4GYq2aQS?= =?us-ascii?Q?35nSSx0S7pW5+OketYwe0lZ5/ZBF6Q6JIloOezCMQ7tExa6ISL9oQKS7anEq?= =?us-ascii?Q?G3gFASXxAO8TDhAqdqc/MdduXmzBojshe1rFQ20YYNhIKcqZ4HeDjHGRLplb?= =?us-ascii?Q?gt2NWPobOqw4J3ixrRfso3I4C5owdj5/MyLPj8UWUuBCcia8ZbwFPwWIuS6Q?= =?us-ascii?Q?Lk7B/gTyi8PgpRmYefk1ZhHQGIEg6AjIXdVABkbSmTcsaHHg0z/uk+OU0BBB?= =?us-ascii?Q?Yo8j7bMtqoCmaNjhpriZHOiw/4VbF872uM/UR7eC07yEHZCm/Lp5vbUBEbni?= =?us-ascii?Q?6fwSWchzna+W2ygTWr81H+A+QxCuwFwiyg3cb4HOy/71tQl7qI3Bkt5fOnK4?= =?us-ascii?Q?AnGQLhiEomVajbBxh3f5fGO3o380udVr7RwcdecS9g5luEBJo8Cb1DauNDU0?= =?us-ascii?Q?CEog0sowTdCBRZV9tge11YsgJXrJO0g1FwG2MfmZFfvXCQhuWC5sSZ4qjHmw?= =?us-ascii?Q?hXmLtsBMOzN7+k1jF/NqXe1SeIbkPYwn2L+GeEyrLTTGi+WnZ2mr8wY+TxKY?= =?us-ascii?Q?+4cbe/4f4wR9ysDU3BI3XJOtJPDsi3y4S5l6Tbdl9N1ea2Exb6b1R5GgCDYw?= =?us-ascii?Q?iQsM+5FIQ+Fqaaw8BJIFgSdqfhtuMl4zw3vrHlBk/CobOMDsGLxo5fJjaYSm?= =?us-ascii?Q?0esKBeHp/KydLHWsv8n857U+4U5ArRFl8te/Iz15wkPPNA1cA2K0l/lQgVd2?= =?us-ascii?Q?QolNuFCavqnrUDAATM1n5guQNd5zSMGsb95fzMR5v01ccyempyZjxtjBAyIH?= =?us-ascii?Q?LX11XJGqO4QLXLq4sFihzPbXYXCOAM6ECH2XXn3+9clG4nNba4sMMuYWBOBi?= =?us-ascii?Q?tZIF46Yzil623/q63pvf/qln1aYiXIZlizQlGY3d2f1jwn3TUy/cn2CB9RjO?= =?us-ascii?Q?nJuvUuPutdNukfxXXwuD5ySyot4vGUVbxipnGKupCzXqSj3fEc5YxbcKqbVt?= =?us-ascii?Q?Kp8t5erBfyFqaDcT5tXnVk5X70GZf7ERNtoc8RLCN/Rxf/UFCHiwLFH4zzor?= =?us-ascii?Q?tP1FTLPreHnokX4N6m9ucxIzL1rbKm0r6t1GSdoBjQtwK6PdaMYsPXCu1R4K?= =?us-ascii?Q?I4htcaATEcB9JSZ9mJcENOBRBFUm0JCeUPfMsgACTGykM7W62KjZklRT3S8f?= =?us-ascii?Q?ZcaKIa1sNC69WXcyvqzgpGHNIhqrOReSLgobE20EwBYPr6HzFf3wENTQxNRp?= =?us-ascii?Q?RUSJ8C/GjBfC3Iw982tXIFL39AqZNmBn/0Grzl6htCJKq5X2n5wcjm+K/Qr1?= =?us-ascii?Q?l/C950rkCKTNnry4PNH9DUxUDMVRZVUM0Vfx31crf2RLWTcN/uEBvZ8Z7Ggn?= =?us-ascii?Q?ES+ddJW+5oi1TnwFjMY=3D?= X-Forefront-Antispam-Report: CIP:165.204.84.17;CTRY:US;LANG:en;SCL:1;SRV:;IPV:CAL;SFV:NSPM;H:satlexmb07.amd.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230040)(1800799024)(36860700013)(82310400026)(376014);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Nov 2025 16:12:01.3121 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: c3a5ca59-50fe-4746-0165-08de22cf60f7 X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d;Ip=[165.204.84.17];Helo=[satlexmb07.amd.com] X-MS-Exchange-CrossTenant-AuthSource: BL02EPF0002992E.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: LV8PR12MB9359 Content-Type: text/plain; charset="utf-8" This will allow the use of all of them for clear/fill buffer operations. Since drm_sched_entity_init requires a scheduler array, we store schedulers rather than rings. For the few places that need access to a ring, we can get it from the sched using container_of. Since the code is the same for all sdma versions, add a new helper amdgpu_sdma_set_buffer_funcs_scheds to set buffer_funcs_scheds based on the number of sdma instances. Note: the new sched array is identical to the amdgpu_vm_manager one. These 2 could be merged. Signed-off-by: Pierre-Eric Pelloux-Prayer Acked-by: Felix Kuehling --- drivers/gpu/drm/amd/amdgpu/amdgpu.h | 2 + drivers/gpu/drm/amd/amdgpu/amdgpu_benchmark.c | 4 +- drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 8 ++-- drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c | 4 +- drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 41 +++++++++++++++---- drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h | 3 +- drivers/gpu/drm/amd/amdgpu/cik_sdma.c | 3 +- drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c | 3 +- drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c | 3 +- drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c | 6 +-- drivers/gpu/drm/amd/amdgpu/sdma_v4_4_2.c | 6 +-- drivers/gpu/drm/amd/amdgpu/sdma_v5_0.c | 6 +-- drivers/gpu/drm/amd/amdgpu/sdma_v5_2.c | 6 +-- drivers/gpu/drm/amd/amdgpu/sdma_v6_0.c | 3 +- drivers/gpu/drm/amd/amdgpu/sdma_v7_0.c | 3 +- drivers/gpu/drm/amd/amdgpu/si_dma.c | 3 +- drivers/gpu/drm/amd/amdkfd/kfd_migrate.c | 3 +- 17 files changed, 62 insertions(+), 45 deletions(-) diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu.h b/drivers/gpu/drm/amd/amdg= pu/amdgpu.h index 3fab3dc9f3e4..05c13fb0e6bf 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu.h +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu.h @@ -1615,6 +1615,8 @@ ssize_t amdgpu_get_soft_full_reset_mask(struct amdgpu= _ring *ring); ssize_t amdgpu_show_reset_mask(char *buf, uint32_t supported_reset); void amdgpu_sdma_set_vm_pte_scheds(struct amdgpu_device *adev, const struct amdgpu_vm_pte_funcs *vm_pte_funcs); +void amdgpu_sdma_set_buffer_funcs_scheds(struct amdgpu_device *adev, + const struct amdgpu_buffer_funcs *buffer_funcs); =20 /* atpx handler */ #if defined(CONFIG_VGA_SWITCHEROO) diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_benchmark.c b/drivers/gpu/dr= m/amd/amdgpu/amdgpu_benchmark.c index b59040a8771f..9ea927e07a77 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_benchmark.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_benchmark.c @@ -32,12 +32,14 @@ static int amdgpu_benchmark_do_move(struct amdgpu_devic= e *adev, unsigned size, uint64_t saddr, uint64_t daddr, int n, s64 *time_ms) { ktime_t stime, etime; + struct amdgpu_ring *ring; struct dma_fence *fence; int i, r; =20 + ring =3D container_of(adev->mman.buffer_funcs_scheds[0], struct amdgpu_ri= ng, sched); + stime =3D ktime_get(); for (i =3D 0; i < n; i++) { - struct amdgpu_ring *ring =3D adev->mman.buffer_funcs_ring; r =3D amdgpu_copy_buffer(ring, &adev->mman.default_entity.base, saddr, daddr, size, NULL, &fence, false, 0); diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/a= md/amdgpu/amdgpu_device.c index b92234d63562..1927d940fbca 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c @@ -3303,7 +3303,7 @@ static int amdgpu_device_ip_init(struct amdgpu_device= *adev) if (r) goto init_failed; =20 - if (adev->mman.buffer_funcs_ring->sched.ready) + if (adev->mman.buffer_funcs_scheds[0]->ready) amdgpu_ttm_set_buffer_funcs_status(adev, true); =20 /* Don't init kfd if whole hive need to be reset during init */ @@ -4143,7 +4143,7 @@ static int amdgpu_device_ip_resume(struct amdgpu_devi= ce *adev) =20 r =3D amdgpu_device_ip_resume_phase2(adev); =20 - if (adev->mman.buffer_funcs_ring->sched.ready) + if (adev->mman.buffer_funcs_scheds[0]->ready) amdgpu_ttm_set_buffer_funcs_status(adev, true); =20 if (r) @@ -4493,7 +4493,7 @@ int amdgpu_device_init(struct amdgpu_device *adev, adev->num_rings =3D 0; RCU_INIT_POINTER(adev->gang_submit, dma_fence_get_stub()); adev->mman.buffer_funcs =3D NULL; - adev->mman.buffer_funcs_ring =3D NULL; + adev->mman.num_buffer_funcs_scheds =3D 0; adev->vm_manager.vm_pte_funcs =3D NULL; adev->vm_manager.vm_pte_num_scheds =3D 0; adev->gmc.gmc_funcs =3D NULL; @@ -5965,7 +5965,7 @@ int amdgpu_device_reinit_after_reset(struct amdgpu_re= set_context *reset_context) if (r) goto out; =20 - if (tmp_adev->mman.buffer_funcs_ring->sched.ready) + if (tmp_adev->mman.buffer_funcs_scheds[0]->ready) amdgpu_ttm_set_buffer_funcs_status(tmp_adev, true); =20 r =3D amdgpu_device_ip_resume_phase3(tmp_adev); diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c b/drivers/gpu/drm/amd/= amdgpu/amdgpu_gmc.c index 2713dd51ab9a..4433d8620129 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c @@ -651,12 +651,14 @@ int amdgpu_gmc_allocate_vm_inv_eng(struct amdgpu_devi= ce *adev) void amdgpu_gmc_flush_gpu_tlb(struct amdgpu_device *adev, uint32_t vmid, uint32_t vmhub, uint32_t flush_type) { - struct amdgpu_ring *ring =3D adev->mman.buffer_funcs_ring; + struct amdgpu_ring *ring; struct amdgpu_vmhub *hub =3D &adev->vmhub[vmhub]; struct dma_fence *fence; struct amdgpu_job *job; int r, i; =20 + ring =3D container_of(adev->mman.buffer_funcs_scheds[0], struct amdgpu_ri= ng, sched); + if (!hub->sdma_invalidation_workaround || vmid || !adev->mman.buffer_funcs_enabled || !adev->ib_pool_ready || !ring->sched.ready) { diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c b/drivers/gpu/drm/amd/= amdgpu/amdgpu_ttm.c index 6c333dba7a35..11fec0fa4c11 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c @@ -308,7 +308,7 @@ static int amdgpu_ttm_copy_mem_to_mem(struct amdgpu_dev= ice *adev, struct dma_resv *resv, struct dma_fence **f) { - struct amdgpu_ring *ring =3D adev->mman.buffer_funcs_ring; + struct amdgpu_ring *ring; struct amdgpu_res_cursor src_mm, dst_mm; struct dma_fence *fence =3D NULL; int r =3D 0; @@ -321,6 +321,8 @@ static int amdgpu_ttm_copy_mem_to_mem(struct amdgpu_dev= ice *adev, return -EINVAL; } =20 + ring =3D container_of(adev->mman.buffer_funcs_scheds[0], struct amdgpu_ri= ng, sched); + amdgpu_res_first(src->mem, src->offset, size, &src_mm); amdgpu_res_first(dst->mem, dst->offset, size, &dst_mm); =20 @@ -1493,6 +1495,7 @@ static int amdgpu_ttm_access_memory_sdma(struct ttm_b= uffer_object *bo, struct amdgpu_bo *abo =3D ttm_to_amdgpu_bo(bo); struct amdgpu_device *adev =3D amdgpu_ttm_adev(abo->tbo.bdev); struct amdgpu_res_cursor src_mm; + struct amdgpu_ring *ring; struct amdgpu_job *job; struct dma_fence *fence; uint64_t src_addr, dst_addr; @@ -1530,7 +1533,8 @@ static int amdgpu_ttm_access_memory_sdma(struct ttm_b= uffer_object *bo, amdgpu_emit_copy_buffer(adev, &job->ibs[0], src_addr, dst_addr, PAGE_SIZE, 0); =20 - amdgpu_ring_pad_ib(adev->mman.buffer_funcs_ring, &job->ibs[0]); + ring =3D container_of(adev->mman.buffer_funcs_scheds[0], struct amdgpu_ri= ng, sched); + amdgpu_ring_pad_ib(ring, &job->ibs[0]); WARN_ON(job->ibs[0].length_dw > num_dw); =20 fence =3D amdgpu_job_submit(job); @@ -2196,11 +2200,9 @@ u32 amdgpu_ttm_set_buffer_funcs_status(struct amdgpu= _device *adev, bool enable) return windows; =20 if (enable) { - struct amdgpu_ring *ring; struct drm_gpu_scheduler *sched; =20 - ring =3D adev->mman.buffer_funcs_ring; - sched =3D &ring->sched; + sched =3D adev->mman.buffer_funcs_scheds[0]; r =3D drm_sched_entity_init(&adev->mman.default_entity.base, DRM_SCHED_PRIORITY_KERNEL, &sched, 1, NULL); @@ -2432,7 +2434,7 @@ int amdgpu_ttm_clear_buffer(struct amdgpu_bo *bo, struct dma_fence **fence) { struct amdgpu_device *adev =3D amdgpu_ttm_adev(bo->tbo.bdev); - struct amdgpu_ring *ring =3D adev->mman.buffer_funcs_ring; + struct amdgpu_ring *ring; struct amdgpu_ttm_buffer_entity *entity; struct amdgpu_res_cursor cursor; u64 addr; @@ -2443,6 +2445,8 @@ int amdgpu_ttm_clear_buffer(struct amdgpu_bo *bo, =20 if (!fence) return -EINVAL; + + ring =3D container_of(adev->mman.buffer_funcs_scheds[0], struct amdgpu_ri= ng, sched); entity =3D &adev->mman.clear_entities[0]; *fence =3D dma_fence_get_stub(); =20 @@ -2494,9 +2498,9 @@ int amdgpu_fill_buffer(struct amdgpu_ttm_buffer_entit= y *entity, u64 k_job_id) { struct amdgpu_device *adev =3D amdgpu_ttm_adev(bo->tbo.bdev); - struct amdgpu_ring *ring =3D adev->mman.buffer_funcs_ring; struct dma_fence *fence =3D NULL; struct amdgpu_res_cursor dst; + struct amdgpu_ring *ring; int r, e; =20 if (!adev->mman.buffer_funcs_enabled) { @@ -2505,6 +2509,8 @@ int amdgpu_fill_buffer(struct amdgpu_ttm_buffer_entit= y *entity, return -EINVAL; } =20 + ring =3D container_of(adev->mman.buffer_funcs_scheds[0], struct amdgpu_ri= ng, sched); + if (entity =3D=3D NULL) { e =3D atomic_inc_return(&adev->mman.next_clear_entity) % adev->mman.num_clear_entities; @@ -2579,6 +2585,27 @@ int amdgpu_ttm_evict_resources(struct amdgpu_device = *adev, int mem_type) return ttm_resource_manager_evict_all(&adev->mman.bdev, man); } =20 +void amdgpu_sdma_set_buffer_funcs_scheds(struct amdgpu_device *adev, + const struct amdgpu_buffer_funcs *buffer_funcs) +{ + struct amdgpu_vmhub *hub =3D &adev->vmhub[AMDGPU_GFXHUB(0)]; + struct drm_gpu_scheduler *sched; + int i; + + adev->mman.buffer_funcs =3D buffer_funcs; + + for (i =3D 0; i < adev->sdma.num_instances; i++) { + if (adev->sdma.has_page_queue) + sched =3D &adev->sdma.instance[i].page.sched; + else + sched =3D &adev->sdma.instance[i].ring.sched; + adev->mman.buffer_funcs_scheds[i] =3D sched; + } + + adev->mman.num_buffer_funcs_scheds =3D hub->sdma_invalidation_workaround ? + 1 : adev->sdma.num_instances; +} + #if defined(CONFIG_DEBUG_FS) =20 static int amdgpu_ttm_page_pool_show(struct seq_file *m, void *unused) diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h b/drivers/gpu/drm/amd/= amdgpu/amdgpu_ttm.h index 4844f001f590..63c3e2466708 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h @@ -66,7 +66,8 @@ struct amdgpu_mman { =20 /* buffer handling */ const struct amdgpu_buffer_funcs *buffer_funcs; - struct amdgpu_ring *buffer_funcs_ring; + struct drm_gpu_scheduler *buffer_funcs_scheds[AMDGPU_MAX_RINGS]; + u32 num_buffer_funcs_scheds; bool buffer_funcs_enabled; =20 struct mutex gtt_window_lock; diff --git a/drivers/gpu/drm/amd/amdgpu/cik_sdma.c b/drivers/gpu/drm/amd/am= dgpu/cik_sdma.c index 5fe162f52c92..a36385ad8da8 100644 --- a/drivers/gpu/drm/amd/amdgpu/cik_sdma.c +++ b/drivers/gpu/drm/amd/amdgpu/cik_sdma.c @@ -1333,8 +1333,7 @@ static const struct amdgpu_buffer_funcs cik_sdma_buff= er_funcs =3D { =20 static void cik_sdma_set_buffer_funcs(struct amdgpu_device *adev) { - adev->mman.buffer_funcs =3D &cik_sdma_buffer_funcs; - adev->mman.buffer_funcs_ring =3D &adev->sdma.instance[0].ring; + amdgpu_sdma_set_buffer_funcs_scheds(adev, &cik_sdma_buffer_funcs); } =20 static const struct amdgpu_vm_pte_funcs cik_sdma_vm_pte_funcs =3D { diff --git a/drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c b/drivers/gpu/drm/amd/a= mdgpu/sdma_v2_4.c index 63636643db3d..4a3ba136a36c 100644 --- a/drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c +++ b/drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c @@ -1228,8 +1228,7 @@ static const struct amdgpu_buffer_funcs sdma_v2_4_buf= fer_funcs =3D { =20 static void sdma_v2_4_set_buffer_funcs(struct amdgpu_device *adev) { - adev->mman.buffer_funcs =3D &sdma_v2_4_buffer_funcs; - adev->mman.buffer_funcs_ring =3D &adev->sdma.instance[0].ring; + amdgpu_sdma_set_buffer_funcs_scheds(adev, &sdma_v2_4_buffer_funcs); } =20 static const struct amdgpu_vm_pte_funcs sdma_v2_4_vm_pte_funcs =3D { diff --git a/drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c b/drivers/gpu/drm/amd/a= mdgpu/sdma_v3_0.c index 0153626b5df2..3cf527bcadf6 100644 --- a/drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c +++ b/drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c @@ -1670,8 +1670,7 @@ static const struct amdgpu_buffer_funcs sdma_v3_0_buf= fer_funcs =3D { =20 static void sdma_v3_0_set_buffer_funcs(struct amdgpu_device *adev) { - adev->mman.buffer_funcs =3D &sdma_v3_0_buffer_funcs; - adev->mman.buffer_funcs_ring =3D &adev->sdma.instance[0].ring; + amdgpu_sdma_set_buffer_funcs_scheds(adev, &sdma_v3_0_buffer_funcs); } =20 static const struct amdgpu_vm_pte_funcs sdma_v3_0_vm_pte_funcs =3D { diff --git a/drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c b/drivers/gpu/drm/amd/a= mdgpu/sdma_v4_0.c index 96a67b30854c..7e106baecad5 100644 --- a/drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c +++ b/drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c @@ -2608,11 +2608,7 @@ static const struct amdgpu_buffer_funcs sdma_v4_0_bu= ffer_funcs =3D { =20 static void sdma_v4_0_set_buffer_funcs(struct amdgpu_device *adev) { - adev->mman.buffer_funcs =3D &sdma_v4_0_buffer_funcs; - if (adev->sdma.has_page_queue) - adev->mman.buffer_funcs_ring =3D &adev->sdma.instance[0].page; - else - adev->mman.buffer_funcs_ring =3D &adev->sdma.instance[0].ring; + amdgpu_sdma_set_buffer_funcs_scheds(adev, &sdma_v4_0_buffer_funcs); } =20 static const struct amdgpu_vm_pte_funcs sdma_v4_0_vm_pte_funcs =3D { diff --git a/drivers/gpu/drm/amd/amdgpu/sdma_v4_4_2.c b/drivers/gpu/drm/amd= /amdgpu/sdma_v4_4_2.c index 04dc8a8f4d66..7cb0e213bab2 100644 --- a/drivers/gpu/drm/amd/amdgpu/sdma_v4_4_2.c +++ b/drivers/gpu/drm/amd/amdgpu/sdma_v4_4_2.c @@ -2309,11 +2309,7 @@ static const struct amdgpu_buffer_funcs sdma_v4_4_2_= buffer_funcs =3D { =20 static void sdma_v4_4_2_set_buffer_funcs(struct amdgpu_device *adev) { - adev->mman.buffer_funcs =3D &sdma_v4_4_2_buffer_funcs; - if (adev->sdma.has_page_queue) - adev->mman.buffer_funcs_ring =3D &adev->sdma.instance[0].page; - else - adev->mman.buffer_funcs_ring =3D &adev->sdma.instance[0].ring; + amdgpu_sdma_set_buffer_funcs_scheds(adev, &sdma_v4_4_2_buffer_funcs); } =20 static const struct amdgpu_vm_pte_funcs sdma_v4_4_2_vm_pte_funcs =3D { diff --git a/drivers/gpu/drm/amd/amdgpu/sdma_v5_0.c b/drivers/gpu/drm/amd/a= mdgpu/sdma_v5_0.c index 19c717f2c602..eab09c5fc762 100644 --- a/drivers/gpu/drm/amd/amdgpu/sdma_v5_0.c +++ b/drivers/gpu/drm/amd/amdgpu/sdma_v5_0.c @@ -2066,10 +2066,8 @@ static const struct amdgpu_buffer_funcs sdma_v5_0_bu= ffer_funcs =3D { =20 static void sdma_v5_0_set_buffer_funcs(struct amdgpu_device *adev) { - if (adev->mman.buffer_funcs =3D=3D NULL) { - adev->mman.buffer_funcs =3D &sdma_v5_0_buffer_funcs; - adev->mman.buffer_funcs_ring =3D &adev->sdma.instance[0].ring; - } + if (adev->mman.buffer_funcs =3D=3D NULL) + amdgpu_sdma_set_buffer_funcs_scheds(adev, &sdma_v5_0_buffer_funcs); } =20 static const struct amdgpu_vm_pte_funcs sdma_v5_0_vm_pte_funcs =3D { diff --git a/drivers/gpu/drm/amd/amdgpu/sdma_v5_2.c b/drivers/gpu/drm/amd/a= mdgpu/sdma_v5_2.c index 7a07b8f4e86d..e843da1dce59 100644 --- a/drivers/gpu/drm/amd/amdgpu/sdma_v5_2.c +++ b/drivers/gpu/drm/amd/amdgpu/sdma_v5_2.c @@ -2076,10 +2076,8 @@ static const struct amdgpu_buffer_funcs sdma_v5_2_bu= ffer_funcs =3D { =20 static void sdma_v5_2_set_buffer_funcs(struct amdgpu_device *adev) { - if (adev->mman.buffer_funcs =3D=3D NULL) { - adev->mman.buffer_funcs =3D &sdma_v5_2_buffer_funcs; - adev->mman.buffer_funcs_ring =3D &adev->sdma.instance[0].ring; - } + if (adev->mman.buffer_funcs =3D=3D NULL) + amdgpu_sdma_set_buffer_funcs_scheds(adev, &sdma_v5_2_buffer_funcs); } =20 static const struct amdgpu_vm_pte_funcs sdma_v5_2_vm_pte_funcs =3D { diff --git a/drivers/gpu/drm/amd/amdgpu/sdma_v6_0.c b/drivers/gpu/drm/amd/a= mdgpu/sdma_v6_0.c index 8f8228c7adee..d078bff42983 100644 --- a/drivers/gpu/drm/amd/amdgpu/sdma_v6_0.c +++ b/drivers/gpu/drm/amd/amdgpu/sdma_v6_0.c @@ -1884,8 +1884,7 @@ static const struct amdgpu_buffer_funcs sdma_v6_0_buf= fer_funcs =3D { =20 static void sdma_v6_0_set_buffer_funcs(struct amdgpu_device *adev) { - adev->mman.buffer_funcs =3D &sdma_v6_0_buffer_funcs; - adev->mman.buffer_funcs_ring =3D &adev->sdma.instance[0].ring; + amdgpu_sdma_set_buffer_funcs_scheds(adev, &sdma_v6_0_buffer_funcs); } =20 static const struct amdgpu_vm_pte_funcs sdma_v6_0_vm_pte_funcs =3D { diff --git a/drivers/gpu/drm/amd/amdgpu/sdma_v7_0.c b/drivers/gpu/drm/amd/a= mdgpu/sdma_v7_0.c index cf412d8fb0ed..77ad6f128e75 100644 --- a/drivers/gpu/drm/amd/amdgpu/sdma_v7_0.c +++ b/drivers/gpu/drm/amd/amdgpu/sdma_v7_0.c @@ -1826,8 +1826,7 @@ static const struct amdgpu_buffer_funcs sdma_v7_0_buf= fer_funcs =3D { =20 static void sdma_v7_0_set_buffer_funcs(struct amdgpu_device *adev) { - adev->mman.buffer_funcs =3D &sdma_v7_0_buffer_funcs; - adev->mman.buffer_funcs_ring =3D &adev->sdma.instance[0].ring; + amdgpu_sdma_set_buffer_funcs_scheds(adev, &sdma_v7_0_buffer_funcs); } =20 static const struct amdgpu_vm_pte_funcs sdma_v7_0_vm_pte_funcs =3D { diff --git a/drivers/gpu/drm/amd/amdgpu/si_dma.c b/drivers/gpu/drm/amd/amdg= pu/si_dma.c index 863e00086c30..4f6d7eeceb37 100644 --- a/drivers/gpu/drm/amd/amdgpu/si_dma.c +++ b/drivers/gpu/drm/amd/amdgpu/si_dma.c @@ -826,8 +826,7 @@ static const struct amdgpu_buffer_funcs si_dma_buffer_f= uncs =3D { =20 static void si_dma_set_buffer_funcs(struct amdgpu_device *adev) { - adev->mman.buffer_funcs =3D &si_dma_buffer_funcs; - adev->mman.buffer_funcs_ring =3D &adev->sdma.instance[0].ring; + amdgpu_sdma_set_buffer_funcs_scheds(adev, &si_dma_buffer_funcs); } =20 static const struct amdgpu_vm_pte_funcs si_dma_vm_pte_funcs =3D { diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_migrate.c b/drivers/gpu/drm/amd= /amdkfd/kfd_migrate.c index 943c3438c7ee..3f7b85aabb72 100644 --- a/drivers/gpu/drm/amd/amdkfd/kfd_migrate.c +++ b/drivers/gpu/drm/amd/amdkfd/kfd_migrate.c @@ -129,13 +129,14 @@ svm_migrate_copy_memory_gart(struct amdgpu_device *ad= ev, dma_addr_t *sys, struct dma_fence **mfence) { const u64 GTT_MAX_PAGES =3D AMDGPU_GTT_MAX_TRANSFER_SIZE; - struct amdgpu_ring *ring =3D adev->mman.buffer_funcs_ring; + struct amdgpu_ring *ring; struct amdgpu_ttm_buffer_entity *entity; u64 gart_s, gart_d; struct dma_fence *next; u64 size; int r; =20 + ring =3D container_of(adev->mman.buffer_funcs_scheds[0], struct amdgpu_ri= ng, sched); entity =3D &adev->mman.move_entities[0]; =20 mutex_lock(&entity->gart_window_lock); --=20 2.43.0 From nobody Sat Feb 7 20:28:07 2026 Received: from CH4PR04CU002.outbound.protection.outlook.com (mail-northcentralusazon11013017.outbound.protection.outlook.com [40.107.201.17]) (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 CB93A350A1C for ; Thu, 13 Nov 2025 16:12:12 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.201.17 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763050334; cv=fail; b=PGnydyar59WH4pl2/3tvdqY5CY5H4e2DHFnmsi1zhZvU8MyvnPhvODsgza/ZP+2Y6F+JVwkEeahmIibfaQ59Dh+ptFw6Mge/Qb9E8DsCkEr1xBjOxRVCYwGJMaud8AQk0joYkaSfSf6cyYKCSDja47TpSjcYJfkp5tCkcF1lkgA= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763050334; c=relaxed/simple; bh=x61oDHm++qa4rhyBPlh+Enn7hi74CXctIpBVj5qUfww=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=emNFzRcF/BD6m6viQW8nQNaZYJE6GB7hAOdiXzxelWatYQCO7q46UN/AsjvBddPn0+nP8o30OUMmp+xh0vayOHltnvLEA0Mp9bVZnchR4O7nz0FWsxMu9geG25CClu/vdl8YQsMiBPi3eQi/rSh4u6+ypE+2mlwtxcsOS93Rl3s= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amd.com; spf=fail smtp.mailfrom=amd.com; dkim=pass (1024-bit key) header.d=amd.com header.i=@amd.com header.b=GiA+PTHt; arc=fail smtp.client-ip=40.107.201.17 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amd.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=amd.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=amd.com header.i=@amd.com header.b="GiA+PTHt" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=OSkZ94v1pbcHwO1tq+HT+LUUEFj80yGXmjxdN0HDx7u8+5CmxAKHKECi/feXCCzrqHluZ5XGZCbfdOafqbUNP32lC1c+7Mjc5RAHWWaguO7aJ2PlaQMnFqhp1hMFyQpc7C8QHJzaGUz/SlQ/4NWXe22QxidDbXwmH8K0TGH6R4Oqq1i7MRCkxnpDGWfT7De2WdV0oz+AlwglATEL7NP3AMHGmR8zaTEmTqR6O0xXmFxOkZQsZKdGt8L1ZsJ4Lb+s7epXHm66F2PJ/Q4+rEnLkIM6o7MudR04wvk1xOXDXTKOMIzIn94wmfMhdYya4LSAbIKtBjG2NrfnUKKKyI28aw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=Vi6kzTohJDqzQIqJAizejnb6nifXlBVSgsaBxsI/cts=; b=ZRsXN4JXQVHAlJrzt3/kfeHrqBK9lrut/tACQnfsflX6lBwKz4IZxn7Iiz5p9C4TKQwID7dEIpgjHyQim/tdqXyoYR3kHyq1wMxdg3DlGMhD05jaSNav6Ghn8jkIJVdJIoL6a1CCuKMewSYdpC41yOfFj6EHY91krLbKtiIwVZiwj3zsG91ut3X+yJgGkTqF5193QG+RngLq4zISEl1R/Nqh66j60eP+DQIqKZED3D6sw1vdEd5NSYzdR2ZKAwdit+9KBXIJ9eJonC3RPi0kNCR1W3W+4dttOjeXN+xoN79/Ay+1eqS8T+odRwtJpr48OXXOcmlmqsgYswRwYpAQRQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=gmail.com smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=Vi6kzTohJDqzQIqJAizejnb6nifXlBVSgsaBxsI/cts=; b=GiA+PTHtH/cEOXeGoTuAdRd2AmjpaLA/GRmX1AVBfKbcCqdPqEpOyQZVTFr+YVqowVeDgahl1Yx0mjTC8lBYl1NGPTpnak4ImYd1VjpNKmiYVgPVvsue4F6W83DGYX9iwUkFL6mggBczO29RmA3PgoeG6IiyDOKj651R4DTRM7A= Received: from MN2PR07CA0009.namprd07.prod.outlook.com (2603:10b6:208:1a0::19) by CY5PR12MB6084.namprd12.prod.outlook.com (2603:10b6:930:28::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9320.17; Thu, 13 Nov 2025 16:12:08 +0000 Received: from BL02EPF0002992E.namprd02.prod.outlook.com (2603:10b6:208:1a0:cafe::6c) by MN2PR07CA0009.outlook.office365.com (2603:10b6:208:1a0::19) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.9320.17 via Frontend Transport; Thu, 13 Nov 2025 16:12:07 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=satlexmb07.amd.com; pr=C Received: from satlexmb07.amd.com (165.204.84.17) by BL02EPF0002992E.mail.protection.outlook.com (10.167.249.59) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9320.13 via Frontend Transport; Thu, 13 Nov 2025 16:12:08 +0000 Received: from FRAPPELLOUX01-WSLPUB.amd.com (10.180.168.240) by satlexmb07.amd.com (10.181.42.216) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.2562.17; Thu, 13 Nov 2025 08:12:04 -0800 From: Pierre-Eric Pelloux-Prayer To: Alex Deucher , =?UTF-8?q?Christian=20K=C3=B6nig?= , David Airlie , Simona Vetter CC: Pierre-Eric Pelloux-Prayer , , , Subject: [PATCH v2 16/20] drm/amdgpu: give ttm entities access to all the sdma scheds Date: Thu, 13 Nov 2025 17:05:57 +0100 Message-ID: <20251113160632.5889-17-pierre-eric.pelloux-prayer@amd.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20251113160632.5889-1-pierre-eric.pelloux-prayer@amd.com> References: <20251113160632.5889-1-pierre-eric.pelloux-prayer@amd.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-ClientProxiedBy: satlexmb07.amd.com (10.181.42.216) To satlexmb07.amd.com (10.181.42.216) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BL02EPF0002992E:EE_|CY5PR12MB6084:EE_ X-MS-Office365-Filtering-Correlation-Id: 0ced9930-9144-4538-60f7-08de22cf64fa X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|82310400026|376014|36860700013|1800799024; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?E93NRp790q2+yIrdZ4EO4zmMX72k5RrpcoLRQvY7jbcTWhcqtvJcX7e5WeN4?= =?us-ascii?Q?6Xqb+ilbHm8MRcxS2j5u1+zEf4aRQD5IeWxbmDM/sUjFtydCnCee2jt2yXgx?= =?us-ascii?Q?sQPaLs97enniUjUjFqUj/IWcmwurpTZiPZaq1UM9Q+/jwkjt1qieCl6cYnxw?= =?us-ascii?Q?BtgciKmpebTZFV4V9/ZvvPuk7n4ldunBgw3oI8tPYPk0GeArqAyQ0UA6ge+j?= =?us-ascii?Q?T/nPq4GfohXgr2M0wIkwbollDNr0IY3309NB9p43hvfAxVPvigO2EvCzG7Yf?= =?us-ascii?Q?DuIYXq1TGnsNZcYhtuRjW3VAxQeg2OMWLdo0BZuk9lZ6sSkqzatQApyPQoj9?= =?us-ascii?Q?Jh2Mvumm9SvBU2qir85tA+vpMZFBrGltelbNkdeSSP9kLGzFeZJWG49fOX0d?= =?us-ascii?Q?MmV6FQYk5ak4s7a4HW2CYAT0HTU3Gvppy/YiiDS56YYJ30Jt0CRVGunQJF6L?= =?us-ascii?Q?oovbgHcstngWGdcp/mFZ+3vLKoS+34oBxxgHSMhl/VN7XgOm4ydn3qkARrl4?= =?us-ascii?Q?tfAIIR51tYWMrXplGIiMbLP0pZieXave5wcWKfTcmwWPCs8rHy2RUXOVbJFX?= =?us-ascii?Q?HJrxzaDx8PcGtK8KWWmcRmS0y/CUwp84k77R3xnCKZqqW0LjPNTmlhriU7nn?= =?us-ascii?Q?iJnb4u53KK2cVawD67Wb2MqqzdOuTDaCo6k7GQ532SnfJPE26GPDlGL5rP24?= =?us-ascii?Q?KCqikLEnzhwj+ULZ9tBfZphzSv46mX/GQ6+B2DMELBx2Z0FJAdR4s10/U0Tn?= =?us-ascii?Q?ws7UPtgg9836blj3S/Jstyb+q62pIw3w6VkrgUfLtYnnwSeW/LKsXv4a4hi/?= =?us-ascii?Q?HpDT885oBp8sb1KKLHT9hQ/iEPtI2SR/waVS+YZ6cvq6Cx0+e+Xt6tgLHMQj?= =?us-ascii?Q?CSm1cbE0Ry/KMhTcp/xXfCT+mHpE2BN+pO+GOOalhi2XcZxp7I+ubQp88Woa?= =?us-ascii?Q?JJpCp4q8mQs+mte/wLAvwUcq5WVPZSOFPjT0IQk21GlK86b5WewPDJcrCF0W?= =?us-ascii?Q?s0UqaMUhJSEwctzeM6tg31fmmSyNN2NEmXXBPTzybuKfZF3KjwMdS3WtDh4T?= =?us-ascii?Q?iQtPH9Sx7G5ySk2WGbVN/gFnTi+QCA5PJzJB2WS15ChQH9hLqd0C76H0Z+Av?= =?us-ascii?Q?2mJPQePD4Bh5LcDNKdKS2bRRSKfkXj+YbySAngJoS9MavTvzM3n6dHdTxZmQ?= =?us-ascii?Q?UuinNONNSX8f6EfJxW0iBV8o8VfGlxS1aX9NtlW25exjFawoDT4ZXSUTpvzo?= =?us-ascii?Q?VdXpGGBffzNQ8UMSKiS9OlFwnB++acWLkLdC7NN1vLalDBZTaIHjQYTh7Y1q?= =?us-ascii?Q?EJSJNgfi8lyD+tAPJ9AP9KoxVARpRyENRe9eVbuk+6IZRPTLymyym2dg9luL?= =?us-ascii?Q?h8yfWaX9ku3PVtbwwpo1Kp5s4ENCELNcHZNthzLGwNbNJK43LsKLcvyv7ykU?= =?us-ascii?Q?CnmrDuYlmIKNHD5dY0IpHqxvSB1RWmsk7hgGWSbL0K/YuwpYYxsfANVPST/T?= =?us-ascii?Q?Xq+boXIJxM6tTSRXcRPb8UcNbGwW06IF5RbYKxGb4LVNsZPoL5bcFJlNxrzz?= =?us-ascii?Q?d92BvjfkLpiXXez1BUY=3D?= X-Forefront-Antispam-Report: CIP:165.204.84.17;CTRY:US;LANG:en;SCL:1;SRV:;IPV:CAL;SFV:NSPM;H:satlexmb07.amd.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230040)(82310400026)(376014)(36860700013)(1800799024);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Nov 2025 16:12:08.0451 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 0ced9930-9144-4538-60f7-08de22cf64fa X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d;Ip=[165.204.84.17];Helo=[satlexmb07.amd.com] X-MS-Exchange-CrossTenant-AuthSource: BL02EPF0002992E.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY5PR12MB6084 Content-Type: text/plain; charset="utf-8" Signed-off-by: Pierre-Eric Pelloux-Prayer --- drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c b/drivers/gpu/drm/amd/= amdgpu/amdgpu_ttm.c index 11fec0fa4c11..94d0ff34593f 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c @@ -2191,8 +2191,8 @@ u32 amdgpu_ttm_set_buffer_funcs_status(struct amdgpu_= device *adev, bool enable) u32 num_clear_entities, num_move_entities; u32 windows, w; =20 - num_clear_entities =3D adev->sdma.num_instances; - num_move_entities =3D MIN(adev->sdma.num_instances, TTM_NUM_MOVE_FENCES); + num_clear_entities =3D MIN(adev->mman.num_buffer_funcs_scheds, TTM_NUM_MO= VE_FENCES); + num_move_entities =3D MIN(adev->mman.num_buffer_funcs_scheds, TTM_NUM_MOV= E_FENCES); windows =3D adev->gmc.is_app_apu ? 0 : (2 * num_move_entities + num_clear= _entities); =20 if (!adev->mman.initialized || amdgpu_in_reset(adev) || @@ -2200,11 +2200,8 @@ u32 amdgpu_ttm_set_buffer_funcs_status(struct amdgpu= _device *adev, bool enable) return windows; =20 if (enable) { - struct drm_gpu_scheduler *sched; - - sched =3D adev->mman.buffer_funcs_scheds[0]; r =3D drm_sched_entity_init(&adev->mman.default_entity.base, - DRM_SCHED_PRIORITY_KERNEL, &sched, + DRM_SCHED_PRIORITY_KERNEL, adev->mman.buffer_funcs_scheds, 1, NULL); if (r) { dev_err(adev->dev, "Failed setting up entity (%d)\n", @@ -2216,8 +2213,9 @@ u32 amdgpu_ttm_set_buffer_funcs_status(struct amdgpu_= device *adev, bool enable) atomic_set(&adev->mman.next_move_entity, 0); for (i =3D 0; i < num_move_entities; i++) { r =3D drm_sched_entity_init(&adev->mman.move_entities[i].base, - DRM_SCHED_PRIORITY_NORMAL, &sched, - 1, NULL); + DRM_SCHED_PRIORITY_NORMAL, + adev->mman.buffer_funcs_scheds, + adev->mman.num_buffer_funcs_scheds, NULL); if (r) { dev_err(adev->dev, "Failed setting up TTM BO move entities (%d)\n", @@ -2239,8 +2237,9 @@ u32 amdgpu_ttm_set_buffer_funcs_status(struct amdgpu_= device *adev, bool enable) =20 for (i =3D 0; i < num_clear_entities; i++) { r =3D drm_sched_entity_init(&adev->mman.clear_entities[i].base, - DRM_SCHED_PRIORITY_NORMAL, &sched, - 1, NULL); + DRM_SCHED_PRIORITY_NORMAL, + adev->mman.buffer_funcs_scheds, + adev->mman.num_buffer_funcs_scheds, NULL); if (r) { for (j =3D 0; j < num_move_entities; j++) drm_sched_entity_destroy( --=20 2.43.0 From nobody Sat Feb 7 20:28:07 2026 Received: from BN1PR04CU002.outbound.protection.outlook.com (mail-eastus2azon11010068.outbound.protection.outlook.com [52.101.56.68]) (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 08D0B28FFFB; Thu, 13 Nov 2025 16:12:49 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=52.101.56.68 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763050371; cv=fail; b=V806ofl32+RdNhXfoGZ3YKLKTz5W8M2KzGac4bAsFddOoJBN8zgnr+z8fi7AR4G5LT6cxsdqE3aAXgsaOowYI0EzY6P4POu0tq2XOxUeBKoNtvFfpYJVq+5AtteceK4uagmGUHnarQUv/iFbAoHAA5mHTwV9GKM0CaGeJ0EvEcA= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763050371; c=relaxed/simple; bh=IL6q/fC37J2PQCzpUmv+YhaLKbSBQrJ6N7Bf9oUKHNM=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=FuvKtUt+F1IIznbkTxcnd4dZ1mJxMfjaPhWDyfd8o7Pxg1Gv8aFa/4uX82zHvLzTM9OhvQeC3dWNXiAzNV7gG7ykuucRUB782CM+d64ZwiLSazXUiVXGhwxNcly7CcNorKlY5Hx10oEQ7Kqpac79HftZIrGVtPvKMZ44etHmv5Y= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amd.com; spf=fail smtp.mailfrom=amd.com; dkim=pass (1024-bit key) header.d=amd.com header.i=@amd.com header.b=hinifJsQ; arc=fail smtp.client-ip=52.101.56.68 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amd.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=amd.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=amd.com header.i=@amd.com header.b="hinifJsQ" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=E7mjUiMe+EO7Hym8a53ZsK4Aw9Bp4AKsZQZWRogcGMRzCYBn8dczJopxGpdo7IXZRF3BoZIzyTA0saRt8wGu6SvkXz9ivQx6zGKqdubHgHrtQKlxlxm58R0hrxjj8jCzGna5oBpreZiuSYQ3tfsYqOb2iA3y580b7gdsQxgM7gKAg5K5KomzvppJy9luW9knC5XBhuMTl2qgbDHqqWiCinpvSf+KWRFTFTjpXxkIlHUqsb9r2D0lVl+ZwvdyrqC0olyXzjFGWxnifBtgnGOmZDRQPdxy0z+jk2EmjEpzGhuFRH05dCMUAMrq1seNhyJnAhbH98LgKKwOgkgF+gfJ/g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=SWLs2o1IzYfaMqS8lva7ajK5a6j8ul1oGIRd/zK4Ir8=; b=gehtvPk5nEHYsosC/ED1DkMZ2Wym4dJOw4HfRLJYHUE6WpnMazaE1W+XHfVR09hkRfjR4wE2vpTc8gufWiUeqLGp/qF6Vc1r1cjc8qxor65hXNEVyvf7Qg+DPJy3Klq/fUQog/epv+7V2tfAGPLPysrxyhNddS6J9kR0HGxPzLdhPd7tH+BiGd70vLUTrEZ3EWH4ICryMjlD+LaQswpOuGcSvKkiUpFjN+o0w34h6SdiPQEj56/9AvaO1SoYbjaDWnZ97FFQ6nWCki8Y6RQQFJqkXa3M2+W1jUIY85wEF/23cpVQxwyMNN75yYQPLuyrOl9+CeJ75sFVB6+fn8eq/Q== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=gmail.com smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=SWLs2o1IzYfaMqS8lva7ajK5a6j8ul1oGIRd/zK4Ir8=; b=hinifJsQkaH6I2YjOzNog0/WubxobSAJ6QG9aBtATVqQ6/MtafLAzDkHfcPyQl+pv/JvhL+GS1zUTodGI2Vk76pCFqvPmXQw5ml4elEm2cg5wExg1fd/l1/R9AHGF+vQvjjLLc5REwPOBYmNTgbcHll4+bQkCMdE9/G8taYQXSY= Received: from BL1PR13CA0424.namprd13.prod.outlook.com (2603:10b6:208:2c3::9) by MW4PR12MB5603.namprd12.prod.outlook.com (2603:10b6:303:16a::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9320.17; Thu, 13 Nov 2025 16:12:41 +0000 Received: from BL02EPF0002992B.namprd02.prod.outlook.com (2603:10b6:208:2c3:cafe::74) by BL1PR13CA0424.outlook.office365.com (2603:10b6:208:2c3::9) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.9343.7 via Frontend Transport; Thu, 13 Nov 2025 16:12:37 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=satlexmb07.amd.com; pr=C Received: from satlexmb07.amd.com (165.204.84.17) by BL02EPF0002992B.mail.protection.outlook.com (10.167.249.56) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9320.13 via Frontend Transport; Thu, 13 Nov 2025 16:12:40 +0000 Received: from FRAPPELLOUX01-WSLPUB.amd.com (10.180.168.240) by satlexmb07.amd.com (10.181.42.216) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.2562.17; Thu, 13 Nov 2025 08:12:38 -0800 From: Pierre-Eric Pelloux-Prayer To: Alex Deucher , =?UTF-8?q?Christian=20K=C3=B6nig?= , David Airlie , Simona Vetter , Sumit Semwal CC: Pierre-Eric Pelloux-Prayer , , , , , Subject: [PATCH v2 17/20] drm/amdgpu: get rid of amdgpu_ttm_clear_buffer Date: Thu, 13 Nov 2025 17:05:58 +0100 Message-ID: <20251113160632.5889-18-pierre-eric.pelloux-prayer@amd.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20251113160632.5889-1-pierre-eric.pelloux-prayer@amd.com> References: <20251113160632.5889-1-pierre-eric.pelloux-prayer@amd.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-ClientProxiedBy: satlexmb07.amd.com (10.181.42.216) To satlexmb07.amd.com (10.181.42.216) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BL02EPF0002992B:EE_|MW4PR12MB5603:EE_ X-MS-Office365-Filtering-Correlation-Id: 053b0fb9-e757-4b55-6638-08de22cf7857 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|82310400026|376014|1800799024|36860700013; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?m3lHdW0+MzlBi9IoXzjv4v8L1cXeIvOi7TjaKuEmTMQW0TpFS4SEgQGMkbKU?= =?us-ascii?Q?ybRAgBZAOXMN2Jk8RXqLIn/wPUcWOrgPreTQ27c8wab0ZXBfMgr+BghTGwFR?= =?us-ascii?Q?BLe1Tb7kN0yzfXeYPl3HQrS8QoXUurtihu6B7op+x73T8c5qEK9wBg6MiQXb?= =?us-ascii?Q?0XrUGzI3E4hhrFaWG39w+T6jYfvnvhV2YB7+aBCfXuHWo2OWApTOEf56tQ5m?= =?us-ascii?Q?MRuUEGX5NuW3VHwZK5hVKcy5UKlRGdaTW+49cTuWyRqdN9Qw4P/wI6iusxPF?= =?us-ascii?Q?TKZ0ydgKd2HiVY9HzoAK/Hgdm2ZvvuTl89nNemnGjiehS/L5M1sbOa7W4cyk?= =?us-ascii?Q?XHbEeMhSPsewqleqG/7+WiYxbMWDboIA2b9B6iMQfYstQBZ6bSZVI9vAoRTG?= =?us-ascii?Q?YJKXTW9wBJuIFeu9XGaaz7sVTXpiuigWp3lU4FWa6aom5jfOpq06ySz02oH4?= =?us-ascii?Q?CZAdpeSJm9tIkmG3ibBzjlPxrfyo4Ghmqxwy0vqGSKUZ85bzSMcB2n1cZAon?= =?us-ascii?Q?UIskyV4Cd7mc9dmr6L+Wvq2h4a6pnbZ6u5rzFP491aRqd4jGuD0xE4Jr15N1?= =?us-ascii?Q?v7V0tSWeV3zjFYzkj2272qLlg4Ixso109mN0b+hNVWJgA8gTGXcpy/EsVWlu?= =?us-ascii?Q?IfsYHoINnUrOGs2+YDypFFIp3HGM+QLn5wRv8JXwiTSAH08YClIg2zzmJ3pe?= =?us-ascii?Q?esXrPpumaadffzOoI+lNl1WJQBr8IBiH/G0qFNAuIBAu33JNBH679BW4Y2bw?= =?us-ascii?Q?Ae1LoELxUrOgXT8+F6KdveCBxpjA2pHwwnFwppNqsgCat3uDa1b8TjK2bpgm?= =?us-ascii?Q?vKg0Y2ZUghfDRTrq+Dj+56BZWMOWoUC/NSVXsmbSct72i1ENR/NxbQMYKf0P?= =?us-ascii?Q?ZHjcdz96dIt1Yg/eoh1zf2JB7kDUxpoL/QLgXYzP96cwiDZFHqc0sKt7zRe5?= =?us-ascii?Q?bT9OiS1PRuhkCajGjOz5m7CGEqbeaOUxiBP7sPejj87X6/8y1Docxu4P3OfT?= =?us-ascii?Q?RtnfWKt28L8U/JfHikepSogwSSe1Zia4vtZBJxvE1pzvbfEaZs5aZMLum+Sg?= =?us-ascii?Q?SPIIMKR1ElkOz/JdcyI4b8xD4JLRzVwURZZrOZGR5rVKiYba/TEEbUSvNASe?= =?us-ascii?Q?8aoUQRs9HDezgQQfNB9n1FkOqMsXfRB9Nfk5U0xtR+xFc3a+GQDAHQPLbiL/?= =?us-ascii?Q?giWHDcz5j0RI8TZiOE/AwO4SIxkT4QfkyJvKhGG+LWPxbwLJLybA3JOxps5M?= =?us-ascii?Q?JD0FTsLOlx6U96eGfwNx1TuUngFxkjNpMbM0qyUs0xoT60MH+2giIPFopPTd?= =?us-ascii?Q?hHmcxncEU+Vj9ExxxnpnybuuXb5eHaoeHQ96u+Cz+P70V8QD3h8XwyG73Yis?= =?us-ascii?Q?EW6x54Ir5YVf0jg49vrWHKZrqy/XCiKCeQ7NXCgy9yLZUll8O5NQ8F1VIqRq?= =?us-ascii?Q?MsHbqNDBdPAMzxoES+ZiKfoQJqSPN1Z1nCBafov0QYKaHB6A/BhwwdBq3Ua3?= =?us-ascii?Q?Hj7lSzWohd8mp5qBDZWwIH2RS148vISx9kZU2GYc+8c99mvaV5ETZ0axCQys?= =?us-ascii?Q?zy6PKJf02sCiP52rs9A=3D?= X-Forefront-Antispam-Report: CIP:165.204.84.17;CTRY:US;LANG:en;SCL:1;SRV:;IPV:CAL;SFV:NSPM;H:satlexmb07.amd.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230040)(82310400026)(376014)(1800799024)(36860700013);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Nov 2025 16:12:40.5319 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 053b0fb9-e757-4b55-6638-08de22cf7857 X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d;Ip=[165.204.84.17];Helo=[satlexmb07.amd.com] X-MS-Exchange-CrossTenant-AuthSource: BL02EPF0002992B.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW4PR12MB5603 Content-Type: text/plain; charset="utf-8" It's doing the same thing as amdgpu_fill_buffer(src_data=3D0), so drop it. The only caveat is that amdgpu_res_cleared() return value is only valid right after allocation. --- v2: introduce new "bool consider_clear_status" arg --- Signed-off-by: Pierre-Eric Pelloux-Prayer --- drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 15 ++-- drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 94 +++++----------------- drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h | 6 +- 3 files changed, 32 insertions(+), 83 deletions(-) diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c b/drivers/gpu/drm/a= md/amdgpu/amdgpu_object.c index 33b397107778..4490b19752b8 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c @@ -725,13 +725,16 @@ int amdgpu_bo_create(struct amdgpu_device *adev, bo->tbo.resource->mem_type =3D=3D TTM_PL_VRAM) { struct dma_fence *fence; =20 - r =3D amdgpu_ttm_clear_buffer(bo, bo->tbo.base.resv, &fence); + r =3D amdgpu_fill_buffer(NULL, bo, 0, NULL, &fence, NULL, + true, AMDGPU_KERNEL_JOB_ID_TTM_CLEAR_BUFFER); if (unlikely(r)) goto fail_unreserve; =20 - dma_resv_add_fence(bo->tbo.base.resv, fence, - DMA_RESV_USAGE_KERNEL); - dma_fence_put(fence); + if (fence) { + dma_resv_add_fence(bo->tbo.base.resv, fence, + DMA_RESV_USAGE_KERNEL); + dma_fence_put(fence); + } } if (!bp->resv) amdgpu_bo_unreserve(bo); @@ -1321,8 +1324,8 @@ void amdgpu_bo_release_notify(struct ttm_buffer_objec= t *bo) if (r) goto out; =20 - r =3D amdgpu_fill_buffer(NULL, abo, 0, &bo->base._resv, - &fence, NULL, AMDGPU_KERNEL_JOB_ID_CLEAR_ON_RELEASE); + r =3D amdgpu_fill_buffer(NULL, abo, 0, &bo->base._resv, &fence, NULL, + false, AMDGPU_KERNEL_JOB_ID_CLEAR_ON_RELEASE); if (WARN_ON(r)) goto out; =20 diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c b/drivers/gpu/drm/amd/= amdgpu/amdgpu_ttm.c index 94d0ff34593f..df05768c3817 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c @@ -435,7 +435,7 @@ static int amdgpu_move_blit(struct ttm_buffer_object *b= o, =20 r =3D amdgpu_fill_buffer(entity, abo, 0, NULL, &wipe_fence, fence, - AMDGPU_KERNEL_JOB_ID_MOVE_BLIT); + false, AMDGPU_KERNEL_JOB_ID_MOVE_BLIT); if (r) { goto error; } else if (wipe_fence) { @@ -2418,82 +2418,27 @@ static int amdgpu_ttm_fill_mem(struct amdgpu_ring *= ring, } =20 /** - * amdgpu_ttm_clear_buffer - clear memory buffers - * @bo: amdgpu buffer object - * @resv: reservation object - * @fence: dma_fence associated with the operation + * amdgpu_fill_buffer - fill a buffer with a given value + * @entity: optional entity to use. If NULL, the clearing entities will be + * used to load-balance the partial clears + * @bo: the bo to fill + * @src_data: the value to set + * @resv: fences contained in this reservation will be used as dependencie= s. + * @out_fence: the fence from the last clear will be stored here. It might= be + * NULL if no job was run. + * @dependency: optional input dependency fence. + * @consider_clear_status: true if region reported as cleared by amdgpu_re= s_cleared() + * are skipped. + * @k_job_id: trace id * - * Clear the memory buffer resource. - * - * Returns: - * 0 for success or a negative error code on failure. */ -int amdgpu_ttm_clear_buffer(struct amdgpu_bo *bo, - struct dma_resv *resv, - struct dma_fence **fence) -{ - struct amdgpu_device *adev =3D amdgpu_ttm_adev(bo->tbo.bdev); - struct amdgpu_ring *ring; - struct amdgpu_ttm_buffer_entity *entity; - struct amdgpu_res_cursor cursor; - u64 addr; - int r =3D 0; - - if (!adev->mman.buffer_funcs_enabled) - return -EINVAL; - - if (!fence) - return -EINVAL; - - ring =3D container_of(adev->mman.buffer_funcs_scheds[0], struct amdgpu_ri= ng, sched); - entity =3D &adev->mman.clear_entities[0]; - *fence =3D dma_fence_get_stub(); - - amdgpu_res_first(bo->tbo.resource, 0, amdgpu_bo_size(bo), &cursor); - - mutex_lock(&entity->gart_window_lock); - while (cursor.remaining) { - struct dma_fence *next =3D NULL; - u64 size; - - if (amdgpu_res_cleared(&cursor)) { - amdgpu_res_next(&cursor, cursor.size); - continue; - } - - /* Never clear more than 256MiB at once to avoid timeouts */ - size =3D min(cursor.size, 256ULL << 20); - - r =3D amdgpu_ttm_map_buffer(&entity->base, - &bo->tbo, bo->tbo.resource, &cursor, - entity->gart_window_id1, ring, false, &size, &addr, - NULL, NULL); - if (r) - goto err; - - r =3D amdgpu_ttm_fill_mem(ring, &entity->base, 0, addr, size, resv, - &next, true, - AMDGPU_KERNEL_JOB_ID_TTM_CLEAR_BUFFER); - if (r) - goto err; - - dma_fence_put(*fence); - *fence =3D next; - - amdgpu_res_next(&cursor, size); - } -err: - mutex_unlock(&entity->gart_window_lock); - - return r; -} - int amdgpu_fill_buffer(struct amdgpu_ttm_buffer_entity *entity, struct amdgpu_bo *bo, uint32_t src_data, struct dma_resv *resv, - struct dma_fence **f, + struct dma_fence **out_fence, struct dma_fence *dependency, + bool consider_clear_status, u64 k_job_id) { struct amdgpu_device *adev =3D amdgpu_ttm_adev(bo->tbo.bdev); @@ -2523,6 +2468,11 @@ int amdgpu_fill_buffer(struct amdgpu_ttm_buffer_enti= ty *entity, struct dma_fence *next; uint64_t cur_size, to; =20 + if (consider_clear_status && amdgpu_res_cleared(&dst)) { + amdgpu_res_next(&dst, dst.size); + continue; + } + /* Never fill more than 256MiB at once to avoid timeouts */ cur_size =3D min(dst.size, 256ULL << 20); =20 @@ -2548,9 +2498,7 @@ int amdgpu_fill_buffer(struct amdgpu_ttm_buffer_entit= y *entity, } error: mutex_unlock(&entity->gart_window_lock); - if (f) - *f =3D dma_fence_get(fence); - dma_fence_put(fence); + *out_fence =3D fence; return r; } =20 diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h b/drivers/gpu/drm/amd/= amdgpu/amdgpu_ttm.h index 63c3e2466708..e01c2173d79f 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h @@ -181,15 +181,13 @@ int amdgpu_copy_buffer(struct amdgpu_ring *ring, struct dma_resv *resv, struct dma_fence **fence, bool vm_needs_flush, uint32_t copy_flags); -int amdgpu_ttm_clear_buffer(struct amdgpu_bo *bo, - struct dma_resv *resv, - struct dma_fence **fence); int amdgpu_fill_buffer(struct amdgpu_ttm_buffer_entity *entity, struct amdgpu_bo *bo, uint32_t src_data, struct dma_resv *resv, - struct dma_fence **f, + struct dma_fence **out_fence, struct dma_fence *dependency, + bool consider_clear_status, u64 k_job_id); =20 int amdgpu_ttm_alloc_gart(struct ttm_buffer_object *bo); --=20 2.43.0 From nobody Sat Feb 7 20:28:07 2026 Received: from CY3PR05CU001.outbound.protection.outlook.com (mail-westcentralusazon11013057.outbound.protection.outlook.com [40.93.201.57]) (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 5370635C187; Thu, 13 Nov 2025 16:13:04 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.93.201.57 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763050385; cv=fail; b=UMbFVKdzkPVLZGWfZm93/tH8axWcfiE5JvABQ4ljvqbc/zXXPZ1ruDWoPqqAcST7w6RA4JmpS2IiSnIq/qfrTt79zIiAqc03u4jdxbcjY8huk/4bR9dj2Bcp9jbP8eAjkfZNF9DTM5MUrfajfhlsma+QFyv65b7Q8IX95CPyFpA= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763050385; c=relaxed/simple; bh=AZXT3YendIKPv6mpBE4lr7l4XXX3wttLm1tz+umRtRM=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=Z4aQc06xuQ8EpzkC9EGalwqJqX15gtyPwJRRvHHUc1e20IGoUQQL7nKxe/dqLuffO/+5aaDsYj20FRysYBwkZBOWCmH0WQFD/Aj/r+kF8tyW031rsnq1WHArk852PpQ9XFZmHD+RU/hOEvLpHdfhqq/ntwF4gGOv21GhBGceIPY= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amd.com; spf=fail smtp.mailfrom=amd.com; dkim=pass (1024-bit key) header.d=amd.com header.i=@amd.com header.b=xLKMEyua; arc=fail smtp.client-ip=40.93.201.57 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amd.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=amd.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=amd.com header.i=@amd.com header.b="xLKMEyua" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=TxFbrq/2aC4tG3Y80cEmU2nXOb1xfs0TunOGT0Ag9G5Lmst9Bqxn+yqcsWxBe5C02SZpTzklDLQNvD6yd+xDZ8ZTiLfjaqe+eus3q1E9fPK1IF/BvFaj2q1lCX0Qd/yDD/SaoYqGFXp86pJoZvr+zQ0DywG8CY7iTXTG2lhXxn8h7MaYAONBAWIKThRG6URt/mQ/sfLlwgHYa/JiLY6+nPui9nJXj5t7hmnU3ZH6T8Hz4aSIzJhom9vnGP0p/+PP4Z3FQpDyTMGTIHXluSbyfAzCC7gZ4xw/+hY3rhCbspBqLAeP5m4u00FRbxaWSSQhQeeBJKxKMLfWNm3VxwrciA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=WmfxQXGjTBVDXa/swxlMJa/RFBmk6wh92nSPBNpIpsY=; b=mZt+Fl1a3/IOnq/3B9w9a1w00MR6Jskw4JZgQOuvbO3Yb7z2JKl7V5D+Sxi6v2JV0r72dZlcH/NXGZYKRdUHSukQ/+YbaMVtrFVBlOEakS12J4A9AaLt0HdEdQy2y/rXO9I4NBzxDEbX/abmd9s41jfT8uZGcPstD98TgHbTIbIobs91mbUyHQFOGK55LGqh+rDXx5MYFYlCG2WMH3r34CNH1TzXyPxTovfg1Dhqw4yMZJKaCkSW8yQ2mbTlWendNGAooDrCSiIfmrMRgzGNl05vPojRX8zl7p4cYKIHDYFkgghhudUInZQ+vjOHDt5vuw+nzEKBukmuxSMYkVMM+w== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=gmail.com smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=WmfxQXGjTBVDXa/swxlMJa/RFBmk6wh92nSPBNpIpsY=; b=xLKMEyuaRRMpluYg8qgtDjg9i2Y2qrKur2hmN0CcMZSixEW0ffL4LfVEixarqXFuMfg/uAbFhYb7q4jMC0b3mR5t+vG2y/h50B9jNVp1uFqinj1G4U8RZoa2u36LjpxKCkkCobSAaQWKwMq7oBWWGx39rdCAs6CrzEcxrnSSz/o= Received: from MN2PR07CA0002.namprd07.prod.outlook.com (2603:10b6:208:1a0::12) by DM4PR12MB5818.namprd12.prod.outlook.com (2603:10b6:8:62::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9298.13; Thu, 13 Nov 2025 16:13:01 +0000 Received: from BL02EPF0002992E.namprd02.prod.outlook.com (2603:10b6:208:1a0:cafe::98) by MN2PR07CA0002.outlook.office365.com (2603:10b6:208:1a0::12) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.9320.17 via Frontend Transport; Thu, 13 Nov 2025 16:12:56 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=satlexmb07.amd.com; pr=C Received: from satlexmb07.amd.com (165.204.84.17) by BL02EPF0002992E.mail.protection.outlook.com (10.167.249.59) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9320.13 via Frontend Transport; Thu, 13 Nov 2025 16:13:01 +0000 Received: from FRAPPELLOUX01-WSLPUB.amd.com (10.180.168.240) by satlexmb07.amd.com (10.181.42.216) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.2562.17; Thu, 13 Nov 2025 08:12:58 -0800 From: Pierre-Eric Pelloux-Prayer To: Alex Deucher , =?UTF-8?q?Christian=20K=C3=B6nig?= , David Airlie , Simona Vetter , Sumit Semwal CC: Pierre-Eric Pelloux-Prayer , , , , , Subject: [PATCH v2 18/20] drm/amdgpu: rename amdgpu_fill_buffer as amdgpu_ttm_clear_buffer Date: Thu, 13 Nov 2025 17:05:59 +0100 Message-ID: <20251113160632.5889-19-pierre-eric.pelloux-prayer@amd.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20251113160632.5889-1-pierre-eric.pelloux-prayer@amd.com> References: <20251113160632.5889-1-pierre-eric.pelloux-prayer@amd.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-ClientProxiedBy: satlexmb07.amd.com (10.181.42.216) To satlexmb07.amd.com (10.181.42.216) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BL02EPF0002992E:EE_|DM4PR12MB5818:EE_ X-MS-Office365-Filtering-Correlation-Id: 2006af19-fb8b-4ae6-d57f-08de22cf84ac X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|36860700013|376014|82310400026; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?yStdPGPr6xWTTV1to6p1YShKy2oXPGnSgHNtUky9ob6abdx776LnGQsL9dCd?= =?us-ascii?Q?ga4/zrEunkIMUC6epxjAEPfR2AZxD0uVXmakMLzT3aM0MK0DVtx+tApvORCI?= =?us-ascii?Q?cjB+gFWmnPhD/0YMc5N4l3PGscWNDyBFg7RMxDDemWHGLj47jMgW54c9gm87?= =?us-ascii?Q?sLnWPIgjXtNwXBdrCSfTI/wILy8QqpAy1m7SqrrGLiFge1rzgLqdB/S/2QKU?= =?us-ascii?Q?ByNhLFD6I6Jk+RriETLWNDh1pR9R08Oz8IaqFDhYr+KMbbjB2832/X7pNvbf?= =?us-ascii?Q?FPKSO0RDXykPEXHDPeuqfCixxqEpO0gamKBsmmZWYogyvkvgAJNiLcixGO/r?= =?us-ascii?Q?Y9NVuy1MOuZ2yB1v7g+YZOMyb5+DUv/0E6LcfHeBYFkRr3iZgDmXYhGHoBQU?= =?us-ascii?Q?dWgy/6YgIhPowoLBDE9MBXgbYAkFEPUgi42IsggF72x39MQ1gDsSoVf5DLlL?= =?us-ascii?Q?y1P6SmwFoxoXKXpDw0mYUHKjV31yEZVDgqUsqDjvGoOEqdZVfIOPWkJCRzKn?= =?us-ascii?Q?u4n3x8oWxCV76ZIZpuouhcYrSRPKQ5+A8xdliDl4nalpxiKs0uk1YKl9NaRK?= =?us-ascii?Q?CJSWhoiz/daj8zQWcEhxWg6VXtw8yIWh33EE9/WJhGfYirW8wm1be0Rjkd2g?= =?us-ascii?Q?qerss7ExgmWimSjWJzjOq0GF0FYQjl7V3I+Z+lDHbtVygnNx7EAAbCEe6RTC?= =?us-ascii?Q?oRDPpko6ObG7oMUHiurh2vSKxt6VIvP28UzPQhvoiqzFhPm7dzQ5soFlXaIS?= =?us-ascii?Q?BFaksR0Igq1uM8DIsPqP4NpIw0Glz5FQVP8v+g+uaHP6ikrW6GzP2hCjFDo6?= =?us-ascii?Q?xi7sSn7AxPMHKvmBQPILV4yccvyy4DV7lxPzXBX+4qGSIP/d/AZmC3ChvcNX?= =?us-ascii?Q?pqco3KQqMsXYlGRXKr6olEZxc2r6hR1VoqHUzedLX8hwHyzkU/LcGtatkQX0?= =?us-ascii?Q?uuiwrqveWdaNSHvS6R3wII0AXB0n1ASntaR5myFtyunyKomp7BgSvEIa9yan?= =?us-ascii?Q?fVi3wugL3fKE2Kf7SyHRcD77P/VCzssiKCldNIAX3kyzzDxHgRqftmun0B9I?= =?us-ascii?Q?FT5kUcqobYKHJ1Y+m2z9l/BOYJp77jQeaROD1Wn3YIEUYFbunZdIT7Q6Yu9Y?= =?us-ascii?Q?z1Z+X4dCn1hJlnGfxLl1OrlrU3veHUV0mqZuznWUcESuTfm70apNdCd7iaAB?= =?us-ascii?Q?UmPio0tCH8n3Ee6HkQ0PrOdmr1hCqCrtH+OaT6RcQAxgqiU6PkMxBWDE3WcR?= =?us-ascii?Q?jXCVwVBrOOytm3RDhI8xsv+WixfAYVAK2669+qWabSg4NrKSwH8uYD9YlBBK?= =?us-ascii?Q?zS6bY0akKY5QVDDJPPaf3/AmWKRoueqe4pL2Co7OVlHUbrn42T8Hw4J/suhX?= =?us-ascii?Q?wLqDrERKifTfHUTOApLyAHKgAGWEClloZGc5T613i16dlYJ7eZfHlIC3EqRU?= =?us-ascii?Q?DuHnBB2dKH54E9YtqEWzgCr6FDkk8GQYCoaPblBY85X2fkkyxEVX1kQG5D83?= =?us-ascii?Q?/wWv/a5LHFQTQfzKa/wxWc6kvvv1cqnWD2nJZVDdgg6kD2Tf8CxH/yvFz3jF?= =?us-ascii?Q?STzAC0YEf2Zz5Jn3h6g=3D?= X-Forefront-Antispam-Report: CIP:165.204.84.17;CTRY:US;LANG:en;SCL:1;SRV:;IPV:CAL;SFV:NSPM;H:satlexmb07.amd.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230040)(1800799024)(36860700013)(376014)(82310400026);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Nov 2025 16:13:01.2260 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 2006af19-fb8b-4ae6-d57f-08de22cf84ac X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d;Ip=[165.204.84.17];Helo=[satlexmb07.amd.com] X-MS-Exchange-CrossTenant-AuthSource: BL02EPF0002992E.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM4PR12MB5818 Content-Type: text/plain; charset="utf-8" This is the only use case for this function. Reviewed-by: Christian K=C3=B6nig --- v2: amdgpu_ttm_clear_buffer instead of amdgpu_clear_buffer --- Signed-off-by: Pierre-Eric Pelloux-Prayer --- drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 8 +++---- drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 26 ++++++++++------------ drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h | 15 ++++++------- 3 files changed, 23 insertions(+), 26 deletions(-) diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c b/drivers/gpu/drm/a= md/amdgpu/amdgpu_object.c index 4490b19752b8..4b9518097899 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c @@ -725,8 +725,8 @@ int amdgpu_bo_create(struct amdgpu_device *adev, bo->tbo.resource->mem_type =3D=3D TTM_PL_VRAM) { struct dma_fence *fence; =20 - r =3D amdgpu_fill_buffer(NULL, bo, 0, NULL, &fence, NULL, - true, AMDGPU_KERNEL_JOB_ID_TTM_CLEAR_BUFFER); + r =3D amdgpu_ttm_clear_buffer(NULL, bo, NULL, &fence, NULL, + true, AMDGPU_KERNEL_JOB_ID_TTM_CLEAR_BUFFER); if (unlikely(r)) goto fail_unreserve; =20 @@ -1324,8 +1324,8 @@ void amdgpu_bo_release_notify(struct ttm_buffer_objec= t *bo) if (r) goto out; =20 - r =3D amdgpu_fill_buffer(NULL, abo, 0, &bo->base._resv, &fence, NULL, - false, AMDGPU_KERNEL_JOB_ID_CLEAR_ON_RELEASE); + r =3D amdgpu_ttm_clear_buffer(NULL, abo, &bo->base._resv, &fence, NULL, + false, AMDGPU_KERNEL_JOB_ID_CLEAR_ON_RELEASE); if (WARN_ON(r)) goto out; =20 diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c b/drivers/gpu/drm/amd/= amdgpu/amdgpu_ttm.c index df05768c3817..0a55bc4ea91f 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c @@ -433,9 +433,9 @@ static int amdgpu_move_blit(struct ttm_buffer_object *b= o, (abo->flags & AMDGPU_GEM_CREATE_VRAM_WIPE_ON_RELEASE)) { struct dma_fence *wipe_fence =3D NULL; =20 - r =3D amdgpu_fill_buffer(entity, - abo, 0, NULL, &wipe_fence, fence, - false, AMDGPU_KERNEL_JOB_ID_MOVE_BLIT); + r =3D amdgpu_ttm_clear_buffer(entity, + abo, NULL, &wipe_fence, fence, + false, AMDGPU_KERNEL_JOB_ID_MOVE_BLIT); if (r) { goto error; } else if (wipe_fence) { @@ -2418,11 +2418,10 @@ static int amdgpu_ttm_fill_mem(struct amdgpu_ring *= ring, } =20 /** - * amdgpu_fill_buffer - fill a buffer with a given value + * amdgpu_ttm_clear_buffer - fill a buffer with 0 * @entity: optional entity to use. If NULL, the clearing entities will be * used to load-balance the partial clears * @bo: the bo to fill - * @src_data: the value to set * @resv: fences contained in this reservation will be used as dependencie= s. * @out_fence: the fence from the last clear will be stored here. It might= be * NULL if no job was run. @@ -2432,14 +2431,13 @@ static int amdgpu_ttm_fill_mem(struct amdgpu_ring *= ring, * @k_job_id: trace id * */ -int amdgpu_fill_buffer(struct amdgpu_ttm_buffer_entity *entity, - struct amdgpu_bo *bo, - uint32_t src_data, - struct dma_resv *resv, - struct dma_fence **out_fence, - struct dma_fence *dependency, - bool consider_clear_status, - u64 k_job_id) +int amdgpu_ttm_clear_buffer(struct amdgpu_ttm_buffer_entity *entity, + struct amdgpu_bo *bo, + struct dma_resv *resv, + struct dma_fence **out_fence, + struct dma_fence *dependency, + bool consider_clear_status, + u64 k_job_id) { struct amdgpu_device *adev =3D amdgpu_ttm_adev(bo->tbo.bdev); struct dma_fence *fence =3D NULL; @@ -2486,7 +2484,7 @@ int amdgpu_fill_buffer(struct amdgpu_ttm_buffer_entit= y *entity, goto error; =20 r =3D amdgpu_ttm_fill_mem(ring, &entity->base, - src_data, to, cur_size, resv, + 0, to, cur_size, resv, &next, true, k_job_id); if (r) goto error; diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h b/drivers/gpu/drm/amd/= amdgpu/amdgpu_ttm.h index e01c2173d79f..585aee9a173b 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h @@ -181,14 +181,13 @@ int amdgpu_copy_buffer(struct amdgpu_ring *ring, struct dma_resv *resv, struct dma_fence **fence, bool vm_needs_flush, uint32_t copy_flags); -int amdgpu_fill_buffer(struct amdgpu_ttm_buffer_entity *entity, - struct amdgpu_bo *bo, - uint32_t src_data, - struct dma_resv *resv, - struct dma_fence **out_fence, - struct dma_fence *dependency, - bool consider_clear_status, - u64 k_job_id); +int amdgpu_ttm_clear_buffer(struct amdgpu_ttm_buffer_entity *entity, + struct amdgpu_bo *bo, + struct dma_resv *resv, + struct dma_fence **out_fence, + struct dma_fence *dependency, + bool consider_clear_status, + u64 k_job_id); =20 int amdgpu_ttm_alloc_gart(struct ttm_buffer_object *bo); void amdgpu_ttm_recover_gart(struct ttm_buffer_object *tbo); --=20 2.43.0 From nobody Sat Feb 7 20:28:07 2026 Received: from CO1PR03CU002.outbound.protection.outlook.com (mail-westus2azon11010047.outbound.protection.outlook.com [52.101.46.47]) (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 C75D42FBE02 for ; Thu, 13 Nov 2025 16:13:34 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=52.101.46.47 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763050416; cv=fail; b=VdTFd21VxgXd+kXC13x7+9DYfxDOp5bIYKwkob9kSAApNfSsYlMgvyryFIWvOTu1IBuwQbp7KU2ZvHCs90Dzdcpqap1rHslUt2iD2ltVYXV/lzChgsTUy97hkdfiFwDtkZlos97IKFuE47I2BQrHdZVMevsFC2SeT5Jb6sUgnEQ= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763050416; c=relaxed/simple; bh=PETjoXFidHj0PH18mHb8KeQ5KlSkK6G9kF+BEc0sFQE=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=g2Ia3OJiprgU03TfISK+3qaL3V1NRKBUolEdRKM0wzzg9ggJ7jvO3j6DV8jPfmCqBOsl+C+LQ9Dlo/wlp1u606XYCMMLJOP31d9laX1SVUMMwGa6w/1rIe1GOaL5i9Z6Qw8qdedAv90Wiv7DeMvwhStjLL2pdWLVbjA/89vO9qk= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amd.com; spf=fail smtp.mailfrom=amd.com; dkim=pass (1024-bit key) header.d=amd.com header.i=@amd.com header.b=Gr02ud1O; arc=fail smtp.client-ip=52.101.46.47 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amd.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=amd.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=amd.com header.i=@amd.com header.b="Gr02ud1O" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=OMJL9NXhBQr2wB0FY2n37HDCJShS9rF5HieJIPERvCGPLSOGwbkZHzA9ObbyGFEjLHdHHyWAjkxbyGVQXLMRKAcklfwz4qH2ynUEkq9z5yStjdpyGJPfFsK/ENPOiy9d2HlaDjcnoNJs14IITsoxNVDx27E0+p5fG2Iuc2V++/gKYyfVM9TknEKzLkI8WEHHDijanByrVad2PZ1+PXrkPBODQDTm9GvUZYpEbC5x6ipoQiC/XPwGOzTzMtH3mkftdpAZcxlh01C31zB8HzMXu65NZWr3rGMsX7+j8AWmdM75gigvxB66y2ouiIxoVUlSXMjpLTA5clUy3PUa3NeVSQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=0T82WTMi7SxGbNMQ9NDDhT18PDINzlXKl/s7c1FVMT0=; b=Jyzz0+pwphJoCTW/jE8bnmocy8MBTn4oLxO9EWz2vHal1fMgKWxZ2usBgUgfXisrvec7+/BL0n7Mt6weho8B2MhOd9ekIoSiwm1oCHPA4PLv0tBQ7iDlSLwelvHDXjRGGHv7yki3EIdRjS6NbhMlY/veeGxt8/0ywCs00ydrXOsKFAVgyA8GWY4Y1rzorRjZKcTT6ZLqm98JmIpxq9ghjss9/I5jdrKWmfGScmzzW8RUFrLYiV+bWFce9xtxeZ84E+bme9GP5ipV07ALzNNTE2YTvhkwaZDayStRN9nFWOc153/BukINTODRqfIDwajbUrSPlOKaQyjo58/lO6uQDQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=gmail.com smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=0T82WTMi7SxGbNMQ9NDDhT18PDINzlXKl/s7c1FVMT0=; b=Gr02ud1O3tk7mHLMof25ep4tQv1QzeQApRbY5qasvXWA4ArRz1CPDQjO5F/YqktBbAohLDie0Gsh2GuTnDi/Hvk20rybt2xU1ePtGGV0b4KTeVlAAknkUm7mzNVGflr66yNuCdz2AH7+yszuq+2DheH8YwOG1J10lh5RXt7RmFE= Received: from BLAPR03CA0019.namprd03.prod.outlook.com (2603:10b6:208:32b::24) by BN5PR12MB9463.namprd12.prod.outlook.com (2603:10b6:408:2a9::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9320.16; Thu, 13 Nov 2025 16:13:32 +0000 Received: from BL02EPF0002992D.namprd02.prod.outlook.com (2603:10b6:208:32b:cafe::ff) by BLAPR03CA0019.outlook.office365.com (2603:10b6:208:32b::24) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.9320.15 via Frontend Transport; Thu, 13 Nov 2025 16:13:31 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=satlexmb07.amd.com; pr=C Received: from satlexmb07.amd.com (165.204.84.17) by BL02EPF0002992D.mail.protection.outlook.com (10.167.249.58) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9320.13 via Frontend Transport; Thu, 13 Nov 2025 16:13:32 +0000 Received: from FRAPPELLOUX01-WSLPUB.amd.com (10.180.168.240) by satlexmb07.amd.com (10.181.42.216) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.2562.17; Thu, 13 Nov 2025 08:13:29 -0800 From: Pierre-Eric Pelloux-Prayer To: Alex Deucher , =?UTF-8?q?Christian=20K=C3=B6nig?= , David Airlie , Simona Vetter CC: Pierre-Eric Pelloux-Prayer , , , Subject: [PATCH v2 19/20] drm/amdgpu: use larger gart window when possible Date: Thu, 13 Nov 2025 17:06:00 +0100 Message-ID: <20251113160632.5889-20-pierre-eric.pelloux-prayer@amd.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20251113160632.5889-1-pierre-eric.pelloux-prayer@amd.com> References: <20251113160632.5889-1-pierre-eric.pelloux-prayer@amd.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-ClientProxiedBy: satlexmb07.amd.com (10.181.42.216) To satlexmb07.amd.com (10.181.42.216) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BL02EPF0002992D:EE_|BN5PR12MB9463:EE_ X-MS-Office365-Filtering-Correlation-Id: 0063a849-5fe2-4fdb-f846-08de22cf9755 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|36860700013|82310400026|376014; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?Wb4W3kaj1mooOJ+XQI031r9pZnFvJLNRZXwAztzqJe35Wvr3QM7MlOqfe/5V?= =?us-ascii?Q?BeBULaJLUAKNkKgvTPzJHdA6z8PXbudTVIcqMWJ+HUm/S525pIM/Mq0adRva?= =?us-ascii?Q?CpZGAMNy+CPU09B0ssT7oR5M9/5wsE9pWAlJX8gmVPXYxXUwGDM69NwPXKSq?= =?us-ascii?Q?2i4xfrSMHCn60MoUohR+PUQVemO1uU8D+/Od4JBcJx7u0LWnTxQfm47eWy+o?= =?us-ascii?Q?501GA8sa78mf0IG27OG7mUQHe3DvAnh2H0cBM186Fe9zE6E8/aEPTcBlwtvl?= =?us-ascii?Q?Ua68jnF6G1jGvkU9Dgay9As3l9SK3QKqY2pDgSNZjjuHde8JXLJMJIu3dvbF?= =?us-ascii?Q?djRilUX09Bydp4gvHeAIWkOAWLNkbk5aHGrjRIFqkfbe6/Rtaf/6770a6bCr?= =?us-ascii?Q?JEK5I3iMdtHG1ZK9fSFzttCwDkjm/iZulA23Vqrct4xWSV12jZPGckXhu0Wi?= =?us-ascii?Q?6GZWvC/n0LwT160d0IIx7c0vbLSvXSnYax6xPf+0pVm5WbQhd9Tu4IgZ2L5Y?= =?us-ascii?Q?vGA/LJNR0fXNirRU7hlrY1L+0++IlaAGWvguCHUgUO+fQSUL7vqVKgE0I8LK?= =?us-ascii?Q?bgMVxtHUHowHi9OGfupT4FQclN4b4AfGa79dajhCW0KEAIOLZYED94E2j2vw?= =?us-ascii?Q?oW5BPvqH3GbtcXr5PiWR3N0jRMrkIJgaElzwObDsNNAWC2PAdVAbzRxbwb6X?= =?us-ascii?Q?4Q3U204s2StnH1qjZwdnDZGLFR/INWJEP7VVH8A35SLXPM2SVe4JvHy31yYo?= =?us-ascii?Q?NguqSxalqNmHM3NxkTjRi2PNxohjHv99/UPKI40ATZ8XJkAz9ew138v+dvoE?= =?us-ascii?Q?9wDyCAuw4z6E/oLugyuQB8+P1c5tr+mFP+FxewKoPMAXTeI63E8MZU57+f6R?= =?us-ascii?Q?ueHpoyTa7elHGJJelrcQWOqXvG4YhbP8PvsRLiyWML7D6gLj6vnSIPrLqYV/?= =?us-ascii?Q?J4qnmETXd7wdp5hr77XQHvM2tSz1vKRI+1fgSYKV05WZPBa+LzpKcFku49yB?= =?us-ascii?Q?5P7f9pLEjrXtkuVapPAAq1BVrdooa7yxJipvKfNEjOrwQRLd/GOAUGMHMbaD?= =?us-ascii?Q?hS26JkpQGksNPl0tdDGXXGQ69xWCiVdAXc1iPILsWUJUrpDmhAxJ7DofK5Vl?= =?us-ascii?Q?LHPtV9hDpygpUF6Gud/INLIWY2iqj1MZt5XSIJYfWHamPqqHWCi7rGtINSTi?= =?us-ascii?Q?UjtRadLhh71E3tgOGfawSu9Hiv6ZjxK+64pOxQc0u6bkgoYXNf+0ALg7Lesl?= =?us-ascii?Q?OduAOWKRTTaJ/WKIgv1XcKk9nTc1gNbrQ6lzI+aige4qkxUJ0myvwnkSP9+w?= =?us-ascii?Q?SpB3aYcbOs5NYqC4STcoN3WAEhVzTSxA7O4i16m1qQmF830tWHmlp+mbJF7l?= =?us-ascii?Q?NCEjqott3udRvhypw/utfMiO1XBF4D2iuHuRgi8HmUePXG6e452FZ2WOvTOL?= =?us-ascii?Q?JNPipQke7mYxPyO0bgWjatPq/ROB02mt7iSnapvJ3rD/jmkqGv1hKhsudJAI?= =?us-ascii?Q?yVdw+1V8Ya5ZWLAOFsxpljH1Ilw/q30NNRLUvlkZ893rxhG3BTWf9THDsSdb?= =?us-ascii?Q?ChYEg7NE2UbdSIM5fXA=3D?= X-Forefront-Antispam-Report: CIP:165.204.84.17;CTRY:US;LANG:en;SCL:1;SRV:;IPV:CAL;SFV:NSPM;H:satlexmb07.amd.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230040)(1800799024)(36860700013)(82310400026)(376014);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Nov 2025 16:13:32.5322 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 0063a849-5fe2-4fdb-f846-08de22cf9755 X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d;Ip=[165.204.84.17];Helo=[satlexmb07.amd.com] X-MS-Exchange-CrossTenant-AuthSource: BL02EPF0002992D.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN5PR12MB9463 Content-Type: text/plain; charset="utf-8" Entities' gart windows are contiguous so when copying a buffer and src doesn't need a gart window, its window can be used to extend dst one (and vice versa). This doubles the gart window size and reduces the number of jobs required. --- v2: pass adev instead of ring to amdgpu_ttm_needs_gart_window --- Signed-off-by: Pierre-Eric Pelloux-Prayer --- drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 84 ++++++++++++++++++------- 1 file changed, 62 insertions(+), 22 deletions(-) diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c b/drivers/gpu/drm/amd/= amdgpu/amdgpu_ttm.c index 0a55bc4ea91f..9397459ec462 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c @@ -162,6 +162,21 @@ static void amdgpu_evict_flags(struct ttm_buffer_objec= t *bo, *placement =3D abo->placement; } =20 +static bool amdgpu_ttm_needs_gart_window(struct amdgpu_device *adev, + struct ttm_resource *mem, + struct amdgpu_res_cursor *mm_cur, + bool tmz, + uint64_t *addr) +{ + /* Map only what can't be accessed directly */ + if (!tmz && mem->start !=3D AMDGPU_BO_INVALID_OFFSET) { + *addr =3D amdgpu_ttm_domain_start(adev, mem->mem_type) + + mm_cur->start; + return false; + } + return true; +} + /** * amdgpu_ttm_map_buffer - Map memory into the GART windows * @entity: entity to run the window setup job @@ -169,6 +184,7 @@ static void amdgpu_evict_flags(struct ttm_buffer_object= *bo, * @mem: memory object to map * @mm_cur: range to map * @window: which GART window to use + * @use_two_windows: if true, use a double window * @ring: DMA ring to use for the copy * @tmz: if we should setup a TMZ enabled mapping * @size: in number of bytes to map, out number of bytes mapped @@ -182,7 +198,9 @@ static int amdgpu_ttm_map_buffer(struct drm_sched_entit= y *entity, struct ttm_buffer_object *bo, struct ttm_resource *mem, struct amdgpu_res_cursor *mm_cur, - unsigned int window, struct amdgpu_ring *ring, + unsigned int window, + bool use_two_windows, + struct amdgpu_ring *ring, bool tmz, uint64_t *size, uint64_t *addr, struct dma_fence *dep, struct dma_resv *resv) @@ -202,13 +220,8 @@ static int amdgpu_ttm_map_buffer(struct drm_sched_enti= ty *entity, if (WARN_ON(mem->mem_type =3D=3D AMDGPU_PL_PREEMPT)) return -EINVAL; =20 - /* Map only what can't be accessed directly */ - if (!tmz && mem->start !=3D AMDGPU_BO_INVALID_OFFSET) { - *addr =3D amdgpu_ttm_domain_start(adev, mem->mem_type) + - mm_cur->start; + if (!amdgpu_ttm_needs_gart_window(adev, mem, mm_cur, tmz, addr)) return 0; - } - =20 /* * If start begins at an offset inside the page, then adjust the size @@ -217,7 +230,8 @@ static int amdgpu_ttm_map_buffer(struct drm_sched_entit= y *entity, offset =3D mm_cur->start & ~PAGE_MASK; =20 num_pages =3D PFN_UP(*size + offset); - num_pages =3D min_t(uint32_t, num_pages, AMDGPU_GTT_MAX_TRANSFER_SIZE); + num_pages =3D min_t(uint32_t, + num_pages, AMDGPU_GTT_MAX_TRANSFER_SIZE * (use_two_windows ? 2 : 1)); =20 *size =3D min(*size, (uint64_t)num_pages * PAGE_SIZE - offset); =20 @@ -308,8 +322,11 @@ static int amdgpu_ttm_copy_mem_to_mem(struct amdgpu_de= vice *adev, struct dma_resv *resv, struct dma_fence **f) { + + bool src_needs_gart_window, dst_needs_gart_window, use_two_gart_windows; struct amdgpu_ring *ring; struct amdgpu_res_cursor src_mm, dst_mm; + int src_gart_window, dst_gart_window; struct dma_fence *fence =3D NULL; int r =3D 0; uint32_t copy_flags =3D 0; @@ -335,20 +352,43 @@ static int amdgpu_ttm_copy_mem_to_mem(struct amdgpu_d= evice *adev, /* Never copy more than 256MiB at once to avoid a timeout */ cur_size =3D min3(src_mm.size, dst_mm.size, 256ULL << 20); =20 - /* Map src to window 0 and dst to window 1. */ - r =3D amdgpu_ttm_map_buffer(&entity->base, - src->bo, src->mem, &src_mm, - entity->gart_window_id0, ring, tmz, &cur_size, &from, - NULL, NULL); - if (r) - goto error; + /* If only one direction needs a gart window to access memory, use both + * windows for it. + */ + src_needs_gart_window =3D + amdgpu_ttm_needs_gart_window(adev, src->mem, &src_mm, tmz, &from); + dst_needs_gart_window =3D + amdgpu_ttm_needs_gart_window(adev, dst->mem, &dst_mm, tmz, &to); =20 - r =3D amdgpu_ttm_map_buffer(&entity->base, - dst->bo, dst->mem, &dst_mm, - entity->gart_window_id1, ring, tmz, &cur_size, &to, - NULL, NULL); - if (r) - goto error; + if (src_needs_gart_window) { + src_gart_window =3D entity->gart_window_id0; + use_two_gart_windows =3D !dst_needs_gart_window; + } + if (dst_needs_gart_window) { + dst_gart_window =3D src_needs_gart_window ? + entity->gart_window_id1 : entity->gart_window_id0; + use_two_gart_windows =3D !src_needs_gart_window; + } + + if (src_needs_gart_window) { + r =3D amdgpu_ttm_map_buffer(&entity->base, + src->bo, src->mem, &src_mm, + src_gart_window, use_two_gart_windows, + ring, tmz, &cur_size, &from, + NULL, NULL); + if (r) + goto error; + } + + if (dst_needs_gart_window) { + r =3D amdgpu_ttm_map_buffer(&entity->base, + dst->bo, dst->mem, &dst_mm, + dst_gart_window, use_two_gart_windows, + ring, tmz, &cur_size, &to, + NULL, NULL); + if (r) + goto error; + } =20 abo_src =3D ttm_to_amdgpu_bo(src->bo); abo_dst =3D ttm_to_amdgpu_bo(dst->bo); @@ -2476,7 +2516,7 @@ int amdgpu_ttm_clear_buffer(struct amdgpu_ttm_buffer_= entity *entity, =20 r =3D amdgpu_ttm_map_buffer(&entity->base, &bo->tbo, bo->tbo.resource, &dst, - entity->gart_window_id1, ring, false, + entity->gart_window_id1, false, ring, false, &cur_size, &to, dependency, resv); --=20 2.43.0 From nobody Sat Feb 7 20:28:07 2026 Received: from CO1PR03CU002.outbound.protection.outlook.com (mail-westus2azon11010026.outbound.protection.outlook.com [52.101.46.26]) (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 F116F2FBE02 for ; Thu, 13 Nov 2025 16:13:42 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=52.101.46.26 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763050424; cv=fail; b=rfBq/baKIM+sqjkPmI0G34+fweckpS7oDThlMhzHa6i7mc810p9A2691BI1IWn1F3oSc9T/s3q3mVnNcg8RH3/Y9uvJj+kKw3NCPB1wUZQDjEiqBSHpYrIJ4kRKdGc0gd6aGwzZINyJnI62QNt9WbRx5PC7R9NUUXsWwU5eo+Qw= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763050424; c=relaxed/simple; bh=5Ok6pM3tNHwORXyHrsqmGWPUh5ET5EnSOupttLvuoi0=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=MoiLA92AjiEAl0AYyBWzDuWSqBE5wL5QnrzaSTSYUpwjKgrHgKYH8anB+IpLPeeTPBjJHoLpK659InVaAjhfjBzQ1uC1HZ3LFf901IVknFUZXIQcqHbaoWBtC/SMNW3XNO/hFNJ2JCo2MIY0JlQGvdJ4ZsC7psJA+3DEImgMj/w= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amd.com; spf=fail smtp.mailfrom=amd.com; dkim=pass (1024-bit key) header.d=amd.com header.i=@amd.com header.b=vqK6MfSh; arc=fail smtp.client-ip=52.101.46.26 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amd.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=amd.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=amd.com header.i=@amd.com header.b="vqK6MfSh" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=Iyea50PT5NhOXiOQ3ndyQuOuQakzWuHasjjIdKmL7neDCC97jB3+ebxYgX0UGbQoXRNzmaFCapgDg/hIhpfPw5Nl8GFgiQFu1brp6C7ph1uL4JOY0lPFILx97T0xdtDTecz0xH04mSCNTISTzIRAYBkXaXjEq6Z41ARYj267baFiRPyDY29HfZRKAQSihDG1kMXZC3nViahQ7a6FnNhcG0Tus/o/tpTjq4Zokw7z52iWePjpwQsr1cZGsDbOHNhNrrzdRSFsy0RVjT4tlFeOx5CpBgMVX5nHeF5aTmr8obwjJVPUzqK5Nze8CC25hOwr2RMF66+tlK8+a2bfcwIfAw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=2JGQhkIR49/uFa7AabSuVenjYByb+x8COtqzxKNKQtc=; b=MB5KfJFz51rhveHQrmrw9gNzQhKSrtF3NAPvyzE/NVnD57xCiVvRHbqmxpOlfpR7P5dNiFSCaK3UZdkC2TL3EJbDfo6n/tm2mwlZs3GWEoVJmkAeC7YZvTU4FLmjNKBXxfn/n+G+w640Z5H+GcCpCKMM+jtunonBU8ogZAb5hPSM2PddYCYbxazuRnWz/DsuxspYMNxjZEaGNPvBnd6X8Jrs/AerXP4jp2ydqQsqTBuBB0MC4VUio/XGpHr5u8LZ9QIUYmQtCq2E+tMp/B1UkINeYrN7MJdmLvGDHwdsyWgf9p+OI+UH5T9h3sMR524kTVPpkUK8SpCjZNP6N+2e1g== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=gmail.com smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=2JGQhkIR49/uFa7AabSuVenjYByb+x8COtqzxKNKQtc=; b=vqK6MfShy0jbeqbggv8Unu3civJJf60KIu0QA+uQoqmBZLqJLPDlq7RilF2Mf3i+zXBZG/CNEPY14ffSlEjcaexy/EpctG7PuNgz2ITP8socy8BDwVRP7+WPTaZg4YH2+Hamr8OA08hD3mMv+bUV1zTrqgJs/34fZzD0//yYmOU= Received: from BN9PR03CA0582.namprd03.prod.outlook.com (2603:10b6:408:10d::17) by PH8PR12MB8605.namprd12.prod.outlook.com (2603:10b6:510:1cc::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9320.17; Thu, 13 Nov 2025 16:13:40 +0000 Received: from BL02EPF0002992C.namprd02.prod.outlook.com (2603:10b6:408:10d:cafe::4f) by BN9PR03CA0582.outlook.office365.com (2603:10b6:408:10d::17) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.9320.17 via Frontend Transport; Thu, 13 Nov 2025 16:13:30 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=satlexmb07.amd.com; pr=C Received: from satlexmb07.amd.com (165.204.84.17) by BL02EPF0002992C.mail.protection.outlook.com (10.167.249.57) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9320.13 via Frontend Transport; Thu, 13 Nov 2025 16:13:40 +0000 Received: from FRAPPELLOUX01-WSLPUB.amd.com (10.180.168.240) by satlexmb07.amd.com (10.181.42.216) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.2562.17; Thu, 13 Nov 2025 08:13:38 -0800 From: Pierre-Eric Pelloux-Prayer To: Alex Deucher , =?UTF-8?q?Christian=20K=C3=B6nig?= , David Airlie , Simona Vetter CC: Pierre-Eric Pelloux-Prayer , , , Subject: [PATCH v2 20/20] drm/amdgpu: double AMDGPU_GTT_MAX_TRANSFER_SIZE Date: Thu, 13 Nov 2025 17:06:01 +0100 Message-ID: <20251113160632.5889-21-pierre-eric.pelloux-prayer@amd.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20251113160632.5889-1-pierre-eric.pelloux-prayer@amd.com> References: <20251113160632.5889-1-pierre-eric.pelloux-prayer@amd.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 X-ClientProxiedBy: satlexmb07.amd.com (10.181.42.216) To satlexmb07.amd.com (10.181.42.216) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BL02EPF0002992C:EE_|PH8PR12MB8605:EE_ X-MS-Office365-Filtering-Correlation-Id: 0180e1b8-2e40-48f3-bd7f-08de22cf9c08 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|82310400026|376014|1800799024|36860700013; X-Microsoft-Antispam-Message-Info: =?utf-8?B?bkNaaFFEUkZYRnlCT0V1QW5uKzkzNmsrZW95cmRFRUE4QzFaSFFUTWdaZ3Zt?= =?utf-8?B?cUplTi8ya3BPSUpYRmMyU1dYNlp1VkhLenprc3ZzMkN1YlRnWUdYa09Mb3VK?= =?utf-8?B?NnJDUnpyaGJ0RUh2RCtFRENJajJtcVhqV0lIUTJ1NXJLMkhNVzd1bWtxMkRw?= =?utf-8?B?eHBXVi96NmU1OW1DQnFFMU1XYVFYOWtuUlFBSGhDaHE1ZjUwaXBrbGlWa0lt?= =?utf-8?B?M3FMeVd4UjZ5VHBoc3AwOU4vOVBZem1rWEJhUVpOZkpqeWEweXdVNDZsbGEr?= =?utf-8?B?RVU4TWhHRCtGUlJqRkNHSVNCMkQxMmFUaWRTVG56SzNFVE1jTTFFcGlyOHRi?= =?utf-8?B?eTFSTE1LVC93SXNQTnA3a0pBZXYxVEFid0t6N0Nzd2EydmFLeVhnMlJ4SUtj?= =?utf-8?B?bGtFSHhFL1FDMXkwZUkrYTNCdTFzQXh3Q1VIQzJrN3hIeTRwa1hyZi92QVFQ?= =?utf-8?B?RzNhaFJrUnBmandVZyt4V0wyRkk4RE83NVRwb3NRUHN0cU1KL1Bkd2lpV3dQ?= =?utf-8?B?eUlZdDRZcVhSU1lHYjRuSzJvNXFRcDVJaG5lUDlEQWFLbnAvL202NmlyQVc4?= =?utf-8?B?STZjclhtZ0g1YVNYZHJ0TUMwem1kajNHV2pqcThqWm10aTlaTmVnTVRuOGVu?= =?utf-8?B?T3dkQ2w2Z3N2OENpU2tyKzl3dlRacnloL1FxOGN1eFAwRm5mdExtS0pEaWdw?= =?utf-8?B?bTM5KzhyQ0tBbkxOcEZGQTJBaE9LWndGOGJrQkcyMGRieGx4Vi9qSDhPUUVz?= =?utf-8?B?RXBoTXF0MzdURjRqTDNoNm9LTTIyeE1UWjhXRDd1U0oraGVKN1dhRTEvSlFT?= =?utf-8?B?L25HTjlISFpwamNSRnVHak8ySlQyYjN4Zk90VWFIakZmZHFTaGNWbG1YUUZT?= =?utf-8?B?UXBydGZKTDRXc1h6aVZuUGJxK0F5MlMyd2VpbFdTTWI0WitIaEFydjZFTTdr?= =?utf-8?B?bW55a2RUNUc3bVpqR1JTMU1WZkd6VGhndnMyT1BWSWpvSjVpeWhjTG8va1VU?= =?utf-8?B?UERwTXA2ZVF5RlM2UE9UazBQNXpWOHlNVUM4YnMxQ1hRNVNYVFlmNGl4bVBF?= =?utf-8?B?S3hVckhYaG9DVGhRMjkzRUdGQm1rWWI3YUtNUVpFWWtuWjJ6ZHMyNmQrK3Nu?= =?utf-8?B?YjJtL1NBNUY4ZjNEakJtV0ViZnhZQW11akJWTlJiaU1BanQraG9yYjQzdytK?= =?utf-8?B?N3AvejBPQTVxenNkdURwRHRRVkxOOUk0SnVadTMyWTQ4bTVkMFBsdnR0QXNs?= =?utf-8?B?NHFzbCtXTDRFWWpHTG9Mb0xXSklmK2ZBN2VHVUY3K0ZCaGhFZDg0dTYzaGdy?= =?utf-8?B?cHlSaGF1akdOVjBPeUo2d3NGMEJiL05qL1o0U3JCVEJGcjhNM3lZZUdqZDBY?= =?utf-8?B?UVVFUEI5N0V1bGVQeTkwVlAwNGRHblFGQzRkNmYvd0orc2lxOWxsRUtTTzZv?= =?utf-8?B?UE9NTXJrTU1Id3Z4VjBtVEZWSjQ5WmppZkhlK3BpZ1FhOXJvUjlNSUNoVHJs?= =?utf-8?B?ajlEY2dDSTNTY2dPQzB3dmR0UXRMYnBFRXhSVElBRXJTalhVa3orVjNuOVgy?= =?utf-8?B?RXVwemJzWWRWNUwvcm9IMUJuQXpuK3ZZT2xsbzNUK2tOdXRTcmpwY3BpRVRy?= =?utf-8?B?blJPVUdhWVhvRFdiUkFqdzkxVU5FSW5scCtqQkJZV3JiQkVoY2hNbzhqcUJq?= =?utf-8?B?dlJhL3R4TWJTWkNGWmhldGFqR1RzVmNGVjRTVFFEUVBsdDYrQ1VIWTdvdzNU?= =?utf-8?B?QjRnSVZkZ2tyVXVYY3N3dGNBR080NmJ1Q0hFUEZhYTVOREIrR2ZSamo4amRh?= =?utf-8?B?M0w0MUpWVXo3UFQ4VDZaVTJiNStEYmg5WXhrRFBqRllzYUxuT0VDcGdUM1Zl?= =?utf-8?B?M3crOXYrQ1huZDlTRFNlWUsrQjg0UlI2WktEc3MyWHNuK25qQ1J5WlkvV2J3?= =?utf-8?B?Y2dOOUJJQ2w1d1VLNHNyOUcrcE5uM25NcFNPOWVFYjdtTHhRN0lIOVBtbTFT?= =?utf-8?B?N09Ud0FsbGsvYmg1TW14VXp1bUsrYWYwa2YyWUUvTVBmQThrYXpxUDJQc0pu?= =?utf-8?B?bm5zaUJ5ek9uUEhGZWR1ZXNXTUZ5a245UUEyM0hnd0ZkUU1WVFloK1FTSkpq?= =?utf-8?Q?OwzY=3D?= X-Forefront-Antispam-Report: CIP:165.204.84.17;CTRY:US;LANG:en;SCL:1;SRV:;IPV:CAL;SFV:NSPM;H:satlexmb07.amd.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230040)(82310400026)(376014)(1800799024)(36860700013);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Nov 2025 16:13:40.4142 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 0180e1b8-2e40-48f3-bd7f-08de22cf9c08 X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d;Ip=[165.204.84.17];Helo=[satlexmb07.amd.com] X-MS-Exchange-CrossTenant-AuthSource: BL02EPF0002992C.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH8PR12MB8605 Makes copies/evictions faster when gart windows are required. Signed-off-by: Pierre-Eric Pelloux-Prayer Reviewed-by: Christian K=C3=B6nig --- drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h b/drivers/gpu/drm/amd/= amdgpu/amdgpu_ttm.h index 585aee9a173b..910728cd084e 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h @@ -38,7 +38,7 @@ #define AMDGPU_PL_MMIO_REMAP (TTM_PL_PRIV + 5) #define __AMDGPU_PL_NUM (TTM_PL_PRIV + 6) =20 -#define AMDGPU_GTT_MAX_TRANSFER_SIZE 512 +#define AMDGPU_GTT_MAX_TRANSFER_SIZE 1024 =20 extern const struct attribute_group amdgpu_vram_mgr_attr_group; extern const struct attribute_group amdgpu_gtt_mgr_attr_group; --=20 2.43.0