From nobody Mon Feb 9 15:08:40 2026 Received: from SN4PR2101CU001.outbound.protection.outlook.com (mail-southcentralusazon11012017.outbound.protection.outlook.com [40.93.195.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 BD00F338599 for ; Mon, 26 Jan 2026 13:38:25 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.93.195.17 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769434707; cv=fail; b=Npk3ajqJqNfkk7UnbcV6TFtImHwCYGIXpm/ipm/rjzzUgcpUn3t5MPsVUajl7qdtK1C5gFNWtbK2rNvk0BX4bPd5hXGf0XfrjWTFS4SoGWwTgZa1jfGHO9xWaq3TTbQlAt7twj0siH90CPlVtty6owcfccp0XDTm/bxJfEQG3p4= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769434707; c=relaxed/simple; bh=QvoLfSgFfiOzKQzcr8Zcvaa3gEEtYX/689pZvCjC0no=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=Z5Wdhot1SQ4K91BoNzX9YSk4CDvbChmiYwEqhnYcqb9D11/O6or2j9O6novyuxVrtJygIqHdFdzDWYgHMDz1VREA1YvChEajZRxheN5e1o1jYDeqP6lAzxx2z4h8FuNU3+nSmijQzTK+dcFZD02+ly0VFODe9mm6RhMM4SQqTWI= 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=BqUWTZCe; arc=fail smtp.client-ip=40.93.195.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="BqUWTZCe" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=QfaBfUn77dEvqZw2WFiGD513RX+VQOHZOMZcuTMRRyS5iZtP5lFpmPNi3y2NZEKmbYflCETbhi7AT00Av5Lmg2u2mmmtZ/KsDAxgguDROX5UOVMaL91kJGcaRX5a0vh9rWaXhHPk55LpnRu2k5dDOXmP7zN6UTvzSuopdRP4PPo5FITLdVF3r0jHZ43EteK06sVRn/0vHqkIpC+Uf2iPnmDa60ElyPHJPNw3MAZ9M0CpLgsjytSmoK3DHAw87lpWfieDz+nZpOFrl7GEWdrZ2pQVnetDwlTnrxmxNfL+oRLUGrYGZ5qnWOPuNxhCGv7wo5PnIGW0wazUwhU+DkvEDg== 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=JJhPCq0HgsbP+RbGaH1uNcbG8WlyqjSHHhhlaDkVrfc=; b=cVo58yNLvYkDxKZuW/wfucdV2M48o50Phb2ce6adDoLN8Gw/z0SAgy4FgW9ng/rzhqt2zM3nWvx7+AwI7TlfZkpeK+mDA7mMbdxdNF2qHmAP5aKgBBFAk4aJ9/ZAFOOeGETWyvAdSN7xI4BKy0sLWf/ZREzKu8h5liIpcyLMfaVa+716GJ/24cseW9UYACk7Q6PrprPGet0zYY3oI234f/o2S4zaZ1heE7eoo7mJiEdgNPniPWEJ5N+pwQFm5gTa0pLxLSo8DenE1xnwhitDjfLnBkyFnNIoZcj0s7kYvMB1KONjv04H+u+7UouUaRi6wblbOVLVNqE7BCyOEUnxgA== 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=JJhPCq0HgsbP+RbGaH1uNcbG8WlyqjSHHhhlaDkVrfc=; b=BqUWTZCelHgGZJa15sgeYhvM+OCE1oBIiVw2O7IN9JS3Ft5jysn4p0kgJBwS/pKLGl+hw2VSmgdPOsm9rHHsmKVi3paCGAL7/Ly08VDQpCrdXiC/A6+NARDLr7hxm12fr0/X1n6ycdkhhbOPd+LtJNm8Uie1/0TFwyg45o4Zamg= Received: from SJ2PR07CA0007.namprd07.prod.outlook.com (2603:10b6:a03:505::12) by MN2PR12MB4456.namprd12.prod.outlook.com (2603:10b6:208:266::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9542.9; Mon, 26 Jan 2026 13:38:22 +0000 Received: from SJ1PEPF000023CC.namprd02.prod.outlook.com (2603:10b6:a03:505:cafe::c6) by SJ2PR07CA0007.outlook.office365.com (2603:10b6:a03:505::12) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.9542.16 via Frontend Transport; Mon, 26 Jan 2026 13:38: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=satlexmb08.amd.com; pr=C Received: from satlexmb08.amd.com (165.204.84.17) by SJ1PEPF000023CC.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.9564.3 via Frontend Transport; Mon, 26 Jan 2026 13:38:21 +0000 Received: from Satlexmb09.amd.com (10.181.42.218) by satlexmb08.amd.com (10.181.42.217) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.2562.17; Mon, 26 Jan 2026 07:38:16 -0600 Received: from FRAPPELLOUX01-WSLPUB.amd.com (10.180.168.240) by satlexmb09.amd.com (10.181.42.218) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.2562.17; Mon, 26 Jan 2026 05:37:35 -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 v6 11/11] drm/amdgpu: move sched status check inside amdgpu_ttm_set_buffer_funcs_status Date: Mon, 26 Jan 2026 14:35:06 +0100 Message-ID: <20260126133518.2486-12-pierre-eric.pelloux-prayer@amd.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260126133518.2486-1-pierre-eric.pelloux-prayer@amd.com> References: <20260126133518.2486-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: satlexmb08.amd.com (10.181.42.217) To satlexmb09.amd.com (10.181.42.218) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SJ1PEPF000023CC:EE_|MN2PR12MB4456:EE_ X-MS-Office365-Filtering-Correlation-Id: 169f9f08-f309-48e5-fb0c-08de5ce02c46 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|376014|1800799024|36860700013|82310400026; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?NTClL9fz1cF7Md+u5XYVi3n82ergfEkFL3IY12GdGdPsZqr13rmxPn2NNoJo?= =?us-ascii?Q?i+2ze0/X6ICTjGMw0iVPL1Ci+9ZFuSooFqtc03me80M652ZWLHKg+1vJAuxU?= =?us-ascii?Q?29EGlbe8RKCvK8w05sdqL1/lbzB5cmhRNqB7qM/SBFY7DxlH2NNmEfDMfFQ5?= =?us-ascii?Q?Zfn+Pe9UR4y+TagNe/TCcjEhgIZOKXyCnnpb2FyFzcxeH7yvZn2ZeJL/LvPI?= =?us-ascii?Q?ce74mV1xArxpfmTBTrlZMDWNmHX2B7M2ALWjuctw7p34NLBXmFHgLyRGKyp8?= =?us-ascii?Q?TngJC5VRAW5dlJZ0SWFZ8osiYTfKRCObc+4sjRrD/OrsYtVhEvcHpvGDs9TS?= =?us-ascii?Q?hCZrr/CyHcgiZ/WYm3c9mufmw52zphnV/NLM069aSC657MbFOkOkkl7+XL/2?= =?us-ascii?Q?eAJpnmefPEC4Vxgmx5dtMn9mivcNNYEKWoNGHTliyKck3WyndBctSJf6D9HW?= =?us-ascii?Q?D56y2BZqdijj4sCTjCilKpiB/pHWf1WMNumLhYCeF94sFvMWzcQ+e+ePhe2a?= =?us-ascii?Q?amFNWoxMrPU4+SL1yjdmF+FY9GmtcRXBnngJEsCZMPR5XMlZBKKXQVF1bE0/?= =?us-ascii?Q?2N3MFQ0bM2LSZKKN/Bwau4qriS0dAIgf/uQZeSdVX0RxO/imo9u7Qxr2pkeO?= =?us-ascii?Q?9rvHf+RvIvSOpMVZvPeK5YZJBEfkt0Rge3w1iQtp1TZJLTIdDINjw4TC9i9E?= =?us-ascii?Q?q6VNHNrRJhvjTma46z/yaoPU0taA/LQVHQLnnnlTb/GfOfRiRz/REB+cEcpI?= =?us-ascii?Q?oqwuLzol3EGRkVbioEutkzlaLXWOoWYuRUi6A5S9qHlTav8k97aFNbfCfgI5?= =?us-ascii?Q?eDi8hbhUAquGIjrPbDhhMq2hM6VCCet4/A203ohPDsMhh6foYwLMBdUMescb?= =?us-ascii?Q?Fqb68sscGEg7fybi7OJqTURuv1+Y4maV1xeGHpLPhMPCG+3qfN3RKBHIeI/M?= =?us-ascii?Q?cio7uIRqL0iqxLL1lPzdSpxG8tK2yvuZjrNhro1vxcCULOA8fpct2pvC0ptw?= =?us-ascii?Q?N6PN5+G3lxp7gQro48B7KkqyJwpIYPTwaB82Y597nECeLRkpb8OadTkIpxz9?= =?us-ascii?Q?s0mSQkepmgmN/iDgxfNfvS8qY88N+6Oo3Fx6bZbdZGCDFTYVs8RBNGFku6CJ?= =?us-ascii?Q?OoUsTDUl8xtBNInrdTupMhmJVTI2BxIUug6kJ+5qjVqwDotnsOz3dMQmLiXA?= =?us-ascii?Q?Yv34ww2Gsuk4Uo+03bfp/So+jHPpdeggSTTUdORNdPF8gaHPX0CGwwVByLRa?= =?us-ascii?Q?lqdmheiPY+FUxYjSxYSIcWnBciFTre73yWP11DF69XZdVEtD/Cw4RfXL8RDY?= =?us-ascii?Q?RphM7eVBdOi5zQatu0K2BTWlkAz7eb9yKc61Zv/UToAwIwU6hX6YiILXdDb/?= =?us-ascii?Q?Cao4XrOxjbs/EyKiHaptDYnzwdC985Kg3h6+YRR0xxMxTJYX1nlEg2nQX6Sx?= =?us-ascii?Q?tujGQrn7/qoi5+mr+/hgNv6taBY1PDAD0RPVx8k2uKmGIaUfmuKaRyXdA9pw?= =?us-ascii?Q?CXxablkEPBQo5l+oQ9ruPJywsm3NzoO2XcOmQAEclkBvnYwVmt+1xGFinCh3?= =?us-ascii?Q?ikwHQoCNBCboX1GEHq84CuliiNWv2MEAiXbHhyiYkOLzKktwBRD3Q5Do7kt5?= =?us-ascii?Q?04V0lOkihW7aHyH4EplzqUu+k8m3VEOOBhUeqglity4nAlio33bMrlbEbruS?= =?us-ascii?Q?oLz9ag=3D=3D?= X-Forefront-Antispam-Report: CIP:165.204.84.17;CTRY:US;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:satlexmb08.amd.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230040)(376014)(1800799024)(36860700013)(82310400026);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Jan 2026 13:38:21.7733 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 169f9f08-f309-48e5-fb0c-08de5ce02c46 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=[satlexmb08.amd.com] X-MS-Exchange-CrossTenant-AuthSource: SJ1PEPF000023CC.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN2PR12MB4456 Content-Type: text/plain; charset="utf-8" It avoids duplicated code and allows to output a warning. Reviewed-by: Christian K=C3=B6nig --- v4: move check inside the existing if (enable) test --- Signed-off-by: Pierre-Eric Pelloux-Prayer --- drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 13 ++++--------- drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 5 +++++ 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/a= md/amdgpu/amdgpu_device.c index 362ab2b34498..98aead91b98b 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c @@ -3158,9 +3158,7 @@ static int amdgpu_device_ip_init(struct amdgpu_device= *adev) if (r) goto init_failed; =20 - if (adev->mman.buffer_funcs_ring && - adev->mman.buffer_funcs_ring->sched.ready) - amdgpu_ttm_set_buffer_funcs_status(adev, true); + amdgpu_ttm_set_buffer_funcs_status(adev, true); =20 /* Don't init kfd if whole hive need to be reset during init */ if (adev->init_lvl->level !=3D AMDGPU_INIT_LEVEL_MINIMAL_XGMI) { @@ -4052,8 +4050,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) - amdgpu_ttm_set_buffer_funcs_status(adev, true); + amdgpu_ttm_set_buffer_funcs_status(adev, true); =20 if (r) return r; @@ -5199,8 +5196,7 @@ int amdgpu_device_suspend(struct drm_device *dev, boo= l notify_clients) return 0; =20 unwind_evict: - if (adev->mman.buffer_funcs_ring->sched.ready) - amdgpu_ttm_set_buffer_funcs_status(adev, true); + amdgpu_ttm_set_buffer_funcs_status(adev, true); amdgpu_fence_driver_hw_init(adev); =20 unwind_userq: @@ -5931,8 +5927,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) - amdgpu_ttm_set_buffer_funcs_status(tmp_adev, true); + amdgpu_ttm_set_buffer_funcs_status(tmp_adev, true); =20 r =3D amdgpu_device_ip_resume_phase3(tmp_adev); if (r) diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c b/drivers/gpu/drm/amd/= amdgpu/amdgpu_ttm.c index e149092da8f1..1929a03daf18 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c @@ -2354,6 +2354,11 @@ void amdgpu_ttm_set_buffer_funcs_status(struct amdgp= u_device *adev, bool enable) struct amdgpu_ring *ring; struct drm_gpu_scheduler *sched; =20 + if (!adev->mman.buffer_funcs_ring || !adev->mman.buffer_funcs_ring->sche= d.ready) { + dev_warn(adev->dev, "Not enabling DMA transfers for in kernel use"); + return; + } + ring =3D adev->mman.buffer_funcs_ring; sched =3D &ring->sched; r =3D amdgpu_ttm_buffer_entity_init(&adev->mman.gtt_mgr, --=20 2.43.0