From nobody Tue Dec 2 01:51:11 2025 Received: from CO1PR03CU002.outbound.protection.outlook.com (mail-westus2azon11010016.outbound.protection.outlook.com [52.101.46.16]) (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 D792E2C029F; Fri, 21 Nov 2025 10:14:04 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=52.101.46.16 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763720047; cv=fail; b=MqeaCS8YOKFf2v4Z6X4G/SAJwKqMR1zBMvgPVroHHjtpBUuKPh/UALgc1wgGRpb5EKxgOsn6MmrCQP2R/8PNe36Cq/cJW95AmFLorizAMbmiL8EF2wiaT+v+KZmVB2iWAdU5PToMM3PpdpzF6IxGonuIyjpnQjvEYop9xdV/4bM= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763720047; c=relaxed/simple; bh=VU/AI7AuJNOxWOowtUrJETveiFmKTFlnycG9vJZb9CI=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=mNwJy7AFFpyemPCj/wNrXWI5P8rMua29R3aJOaAe7HseWdmXOxdWNq0yauvSkfaLEGDYdxB1ZJRffk91DrFqHTnQAwfO8+eYF+0A1PFUI3lMzH9uCAtyY3m9AO9lBm89/j7o+yPfyEFx2xrFSrqzvCaBAB7AMhgf5aHd4PX3QaY= 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=UwD4wBLh; arc=fail smtp.client-ip=52.101.46.16 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="UwD4wBLh" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=QCgHAUUCGbPQfIyR6sSU+Q5m/tpjoRvorpIuJT2x5w/B7AW2jyazRCoPB1vBo87nKJzqmLMgjB+HtbM0GWqwzZQhZJoKAa0nohYLP6ZqYPHeePWrElFJO8PLrkvlR+6U2NsNFEAPnUMpjihv2ynK1n40o6wgAtPCaCKsqdSYUK1Lr9aw5HIST35C1YTPJBmQayOzmfiW3xRvJ+sRAbGWrQtH94gc4Hsli/gpQe6YA8n4+bR4I/7s50DN8MprRTrUBaqN9rUF0MEvyBnSjqpecvA6fy0lykUulv3vO1Tp6MvVh6BOPOIFGAPjROiZa/rXDcCeBM0dr9ZbkPIQ/9d/vQ== 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=ISRyLtvs/LvW+8bmrVE8tXkaZMA9Tj+pJDMxEvGgWd4=; b=OtPSpB34XpkWvWhIfNkcv2ekETnpF39mAAhWLAMPPq5qf6m4etNfkc3VzTCaa5qQwU8gPI1U+52JtuDQzt6rF8+0ucpg7Ig8zbvvQU1ghCuQwZDz4+kBMBkgbTgljV+Nzv69ih9dRNC7YAARWvs5jMy9WrZ8z0vZHA3Iz5DOXxcgM6z1D1D98Nrun8QYzjwfqon1N6xYS7pTdwlHKORRg9ebCVbPh/oi7RfUc3Kv9YWSMeEMwLpcdPvMfwotfqJ6jwkZDAxqJvHd/5GlQnIPEW6zd2b8IDGLOVyz46GSC3SNHHgje2fP4pmabCFPh1k7Z4SMeGoB6EAboLlqPWiMfQ== 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=ISRyLtvs/LvW+8bmrVE8tXkaZMA9Tj+pJDMxEvGgWd4=; b=UwD4wBLhzD6LEo6Z0thUonPcGubSKZSVBSzS/NrCE7lZu5wDq+hQODoFeCw86awSTgvojtrTMOIZ+7kG68pco4LwwlC84nS7TLjwsDeK/Q6Tl6S8BSTJypbC0I1GCOytEdT+W2ussPUkHRv3hItD6T7SZ9sd2jdkSTPSGaluzeg= Received: from BN9PR03CA0606.namprd03.prod.outlook.com (2603:10b6:408:106::11) by DS0PR12MB9348.namprd12.prod.outlook.com (2603:10b6:8:1a0::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9343.10; Fri, 21 Nov 2025 10:14:01 +0000 Received: from BN2PEPF000055DE.namprd21.prod.outlook.com (2603:10b6:408:106:cafe::13) by BN9PR03CA0606.outlook.office365.com (2603:10b6:408:106::11) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.9343.12 via Frontend Transport; Fri, 21 Nov 2025 10:13:52 +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 BN2PEPF000055DE.mail.protection.outlook.com (10.167.245.8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9366.1 via Frontend Transport; Fri, 21 Nov 2025 10:14: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; Fri, 21 Nov 2025 02:13:58 -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 v3 03/28] drm/amdgpu: remove direct_submit arg from amdgpu_copy_buffer Date: Fri, 21 Nov 2025 11:12:13 +0100 Message-ID: <20251121101315.3585-4-pierre-eric.pelloux-prayer@amd.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20251121101315.3585-1-pierre-eric.pelloux-prayer@amd.com> References: <20251121101315.3585-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: BN2PEPF000055DE:EE_|DS0PR12MB9348:EE_ X-MS-Office365-Filtering-Correlation-Id: a2ccf8f6-fced-4ab3-1517-08de28e6b0d7 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|82310400026|1800799024|376014|36860700013; X-Microsoft-Antispam-Message-Info: =?utf-8?B?VlppK3dHRkFzTjlKb2JSTy9WMGs1SS93RDBDYmhDRHFoQWpNUUhwYXh3Unhk?= =?utf-8?B?akp6SEZxcTIzY3ZKU3dESCsxbFZ4TWxWVGFhMHlicVRBZGt2SVFVbmc1dEJF?= =?utf-8?B?eDFOV0pCSkoxY09QTWwyZk8yajZYNmdOUjVYYmJUZjdRQTJHMHgwTXRYeVl6?= =?utf-8?B?MEdSQmMrdXZJeG5tWDJQaXFpcVMvTkRaWkJmVmhSRlNHaFlqWEY5VnU1RWM1?= =?utf-8?B?eUl4dXhQcDdCS3VqQmJ3MU1Na1JxMHpTaWswVEFYQmhNYVZvMEFCZkFEb2Ry?= =?utf-8?B?aWpaLzRJWHB0SklOUXdua3lqK2FKNVFXREk5STRlYjJHWmUwUXFxZUNVYlY2?= =?utf-8?B?RTVDUDEvWVo5T0dJSFJPS1FLSXRnUkU0THJMaTY1V3MzVGRsakpRT0ZWNld6?= =?utf-8?B?VXBiRWoxc1lJOUZsZENWQXA1dGN0OWJUempvMVRlMS85bHRtSWZWdHFydWpL?= =?utf-8?B?c0FvVjRZMUpDOFRtamFsR0NsQWpCTTF2bEpRTHV2czljemo4KzFKV296WmpB?= =?utf-8?B?V2VxV1R6SzMzR0Y4ZnBGdzdqWXZXdHBrbXltYXIzWnZEeXdzVllZSmwrL1VD?= =?utf-8?B?WFQzZ0RqcVU3UURSWVVTbTlMWXMyY05nQUpOT3dQRWRFbHBoTWFGOHR5SFVX?= =?utf-8?B?VmQzNlBocVNOaFlHby9tNTgyRUd2VVVXKytUcndES2t4UWI4YlM3bEk4RlRB?= =?utf-8?B?djRua1NZSzNUZ0dlNmpOZlV3NmVnazA3TitXOUhkQ0xjRTY5Q3ZqcTJWbFpU?= =?utf-8?B?cUF3MTFuSUE0elRzNm9rYi9BYVZkVTJIMmpISGNiVVRJYUpNdGFWUzI2YmQz?= =?utf-8?B?M3AzT1o4NFRuY29kQlFudktUYmFlMllaYVNZUDRNSWJhM1hWN1N4Nlhacloz?= =?utf-8?B?cWRGVDZZVzdXR2N0TW9sbWFyMXZwd0M4aDJ0SGg4TEY3YlEyU2hmcm51K3Zs?= =?utf-8?B?dEhBMSsrUFQ3V01wMDFCb1lpK2thT3RXVUVlZEEwM1dyeGRENDFWWGxXOGdo?= =?utf-8?B?N2JHS1c4NHNFb1pnN0M4dk91b0FGLzZWVExWbWlJMkdkUDkyQTBaT3BIUExK?= =?utf-8?B?dEI2SkhmdFQzNFhTem55dnVvcitjMFN2U2pGQ3pzMTlNS0E4VnN3M3hHeEVY?= =?utf-8?B?TUNBbTVTOGNFK28vUEdPdVhNQ2ZaZE0xOEttVGxHT0pBMEFYRmtWUFpJVk9m?= =?utf-8?B?cStYNzhZc1FES0NZandNVyt4RnQ5WjVrNC9ycGZMS2ljMnZxaWdSMUsvUms2?= =?utf-8?B?b0FOemxlRGFMRWt2dHA2UCt5Q1loeHlBdlR6S0lTczdreHhudUp3bTV1WEJi?= =?utf-8?B?b0twZzUwUEptNmZwa05MQklWcUhxN3c5dHhhMlEyRVlnOEV3dmQzcDNuT2tQ?= =?utf-8?B?eTBkTTBMTHhnVzhvN3dIdERUV04wMm1WVmMwNnhXNE1YR2poT00xQUJKTTZ3?= =?utf-8?B?MjBVZWZ2Y2dyS0ljQ1VOeFV6U0JDemhkalpmNmpxckZHM1d0V0JQenFuOTdn?= =?utf-8?B?RFlvUWM4L1ZnU0k2WU1MdWlwdFEyN2praGJReWgrKzdncmkvMlc2Q1RUTFpv?= =?utf-8?B?NU1zNVdiWHM0ZDJtdW5UTjlUNjZ6c3FyNy9hZTYvZzhIU0dzd2g0WTFjUVBH?= =?utf-8?B?ZmphTTFGeGdTRGdYUjRyVHJaeG54VTRXUk1tSUR2QVVKQVdwOW9pZ0d3NXIz?= =?utf-8?B?V3k5dWR5ZWVZOC92eXA2My9TQ0lkNFFIWERCMmlhT3Z1ZDJNd2R5bnI2SldI?= =?utf-8?B?WjBaV29iV0NHdmtVSnBaMzV0Y3Bxb3RmSVJUZ2RNVTl5OXBWU25RNlpuSEVa?= =?utf-8?B?UlZvL1luZURwQkNSZmdpRms4RmZoUDdab2l5YXFwZjExOXphVTRvRTN6Mnpa?= =?utf-8?B?cEJ5blpTTkZTYkVLUm8yQXZnZUVFalplZkJIWHhMUjdhSkZncmd4MmQvMVdP?= =?utf-8?B?aVZRM21VclRhVTVEVXlEUmp1OGF2NDNuUHhpOWRRSjlmTWFZeHJEdTBRSzFi?= =?utf-8?B?Y0N5TE8rdUpZclFkazhUV09GYXRoUnBpRzR1cXFNeitkRkNwNzUzQnBEQU5I?= =?utf-8?B?eVFCQWRQdnd5OEtydDVLdFgrdkpLVGNHZCszN3IzS09PYlI0RkIzN2FTK2V1?= =?utf-8?Q?UaPs=3D?= X-Forefront-Antispam-Report: CIP:165.204.84.17;CTRY:US;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:satlexmb07.amd.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230040)(82310400026)(1800799024)(376014)(36860700013);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Nov 2025 10:14:00.7242 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: a2ccf8f6-fced-4ab3-1517-08de28e6b0d7 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: BN2PEPF000055DE.namprd21.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS0PR12MB9348 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 8d0043ad5336..071afbacb3d2 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c @@ -346,7 +346,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 @@ -2203,16 +2203,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; @@ -2238,7 +2235,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; @@ -2248,7 +2245,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; @@ -2257,7 +2254,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) @@ -2275,10 +2272,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 @@ -2307,7 +2301,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