From patchwork Fri Jan 17 16:25:36 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Alex Deucher X-Patchwork-Id: 13943544 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id EA6B5C02183 for ; Fri, 17 Jan 2025 16:26:01 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id ABD6710EB3D; Fri, 17 Jan 2025 16:26:00 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (1024-bit key; unprotected) header.d=amd.com header.i=@amd.com header.b="pZ6s2ueX"; dkim-atps=neutral Received: from NAM12-MW2-obe.outbound.protection.outlook.com (mail-mw2nam12on20628.outbound.protection.outlook.com [IPv6:2a01:111:f403:200a::628]) by gabe.freedesktop.org (Postfix) with ESMTPS id 24D8710E259; Fri, 17 Jan 2025 16:25:59 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=Lz5+trvqO3axjmWIwxxByb3OQQgr9YfEuzxYPNlcJNnS+MzAvq0YDgeVjpaTTN6ixcCebTDLQMsd5Eqmmwi4hgRrn35pswVrIWDbsAb39U/7IzH/N1sQW2qEHrZ1e/oqHiZyqBwNd9/4G5rkHCrFPPUx3fFYl3Sq1gcTbTPpYjSc3wSSw9ChzJ9myTE08rT0FDlFwxCj8iDJAOvDbgVNw1sb7FyIfGbyK6Wgsyt5DfAtkYweazP4Ffvs3lis7U7cHSEGYAUtX2A1/zVttAiK0jjiHz9UfXv52wxQMNp8uwvxJSNrkO1OxyjJ5onFh0f3jTQf9WrMtEzmp+9MucmkzQ== 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=uWf+/25k8sgPJocVh0M+t6yOPxhzT9h05D1lHuq0nTs=; b=bGebItr7a42VpQTWSTo3Jcm3I68MOrZELQmkBLzo67yQdliiaYRKcM1VSxjGvSul2TckMSNmnUTGCckcCdCd1AExzpagZEjUCsdR5dxlw9x4g+JRq4sU2kSbI5Dev+YLImkE/+CWPQStUfYxlIszMQetUX/ntr7i9yRXqdyc2hGoODzcUFd1E6HiKRITswrKONbuewB709Id8DWSEJF7u29Y0/M6RI731YtX0f3R1w5/LAGd3hCewNJYVnOzSW3MQM9jCwb1h9inW4ffuH0a6glt6n/so1BAZ+XWur0GyTYIYuOqT2MxXJ57/S7elNNQtbVzYYln+9FVrSobDh82fQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=lists.freedesktop.org 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=uWf+/25k8sgPJocVh0M+t6yOPxhzT9h05D1lHuq0nTs=; b=pZ6s2ueX1XH1f3pivcTELseNpjhsQQx4T21mctFM5/kcumMB+jdcRMWnKCU+k3n2acAJqR+VeoAjPmMm1fxzCOL3edzBWkeqXKjlpLKOvZMVRizLQLCntdR1D7Wo473npN+c8ytF78MqWyzKd4jwXEllZ9lWvfXlwU0aK5MlNNM= Received: from MW4PR04CA0049.namprd04.prod.outlook.com (2603:10b6:303:6a::24) by PH0PR12MB5680.namprd12.prod.outlook.com (2603:10b6:510:146::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8356.13; Fri, 17 Jan 2025 16:25:56 +0000 Received: from SJ5PEPF000001CD.namprd05.prod.outlook.com (2603:10b6:303:6a:cafe::c4) by MW4PR04CA0049.outlook.office365.com (2603:10b6:303:6a::24) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8356.16 via Frontend Transport; Fri, 17 Jan 2025 16:25: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=SATLEXMB04.amd.com; pr=C Received: from SATLEXMB04.amd.com (165.204.84.17) by SJ5PEPF000001CD.mail.protection.outlook.com (10.167.242.42) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.8356.11 via Frontend Transport; Fri, 17 Jan 2025 16:25:52 +0000 Received: from tr4.amd.com (10.180.168.240) by SATLEXMB04.amd.com (10.181.40.145) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.39; Fri, 17 Jan 2025 10:25:50 -0600 From: Alex Deucher To: , , , CC: Alex Deucher Subject: [pull] amdgpu, amdkfd drm-next-6.14 Date: Fri, 17 Jan 2025 11:25:36 -0500 Message-ID: <20250117162537.2702962-1-alexander.deucher@amd.com> X-Mailer: git-send-email 2.48.0 MIME-Version: 1.0 X-Originating-IP: [10.180.168.240] X-ClientProxiedBy: SATLEXMB04.amd.com (10.181.40.145) To SATLEXMB04.amd.com (10.181.40.145) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SJ5PEPF000001CD:EE_|PH0PR12MB5680:EE_ X-MS-Office365-Filtering-Correlation-Id: 899457d6-f818-4ace-e476-08dd37139c74 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|376014|82310400026|36860700013|1800799024; X-Microsoft-Antispam-Message-Info: =?utf-8?q?19CKwm1x5oU+rr5G9C68L0t83VU0aex?= =?utf-8?q?o9OuMQiKPxN+Kie+mSg4AimMTbsu4ypbPNd3MKKB4lcMrfmkb1ENKT6ceW7lnaDV1?= =?utf-8?q?qFpyeb2cTsra8F0n7EIO4jGDvTdef6YEGFdsvwodaME4y482sg/l08AOnzDZ108Pt?= =?utf-8?q?5PaJbpfUPmrVDAA+nygL605ObYaUq8FbBv1MwVPndtNyuDp60GyQkq9LRoxvvE4jV?= =?utf-8?q?/Z31h4KpHS0tvbcRqhfVWQzHlWkR3h3PHagFZ/KAMe1ysc5AZyq6WbG3mhSsdMwCX?= =?utf-8?q?TgLdyegjLVTxpfbIIYfyW5YvlNcTYK/4/UVeJlPEzNkDdK2gNVsz1IgWY/NfeJnot?= =?utf-8?q?3ZN72kGhfIk3W0ttfsBcuoBaTnsdYB5xmGRnx2ELbBE/4fg49DVGFUrfYwygT8bsw?= =?utf-8?q?pUtBHvtyGRKaPzNldUTwg38cglcTHLQpLKX3+6PUdoPgoAeTuvBNrTKr8hoGUkaQi?= =?utf-8?q?3I1M9YDTay8rQmKOufzym3cUscf62BLHzoHrzLxvsaB9cvGshU5dNI28mKO12aFJG?= =?utf-8?q?w1tTpgLGwoiod/Fy6qBhFthJnGnfedDH01DeBA6chmGhrQRkXC8tc3A5WH/9T1h37?= =?utf-8?q?FYg8JDF/3dUkuoBhSQIUv7gzHNeNL+3lfuZlPIdIVjIxl1j5S1laMYtBbK0PDrKlh?= =?utf-8?q?Bdf0ggOiZQ9CyBGUiz6qkPiSEAScLEzAxTkO4zlZy+FyaMGE3PYFkDe8E//sLSieC?= =?utf-8?q?3/ZPyHhnexGTpoq8jbK4dtI81Xi4KjuoLp1Wr4+iwrEFj9BAgudMLtQLASlJ4kAQT?= =?utf-8?q?wTCpqfBhR36lmS7Liq/tIiQVedm4Burlhd8AUhsON5HtGX+A08GEZAtNJco7qjMSy?= =?utf-8?q?RaxIZdyk4q9OjotdpA+C7JOlhYRsY3kyGB5bBoZ8IrX6k3GHnJ62vqHt0TiQm0zY/?= =?utf-8?q?HV3slSOQnBCKnXcO5ElrTECcCGCvt6b63aHi98dp6SEtlGPkKlCW+dY9FKzKaFm39?= =?utf-8?q?BIIQF8f1nSyrMPZzkkxQMIZunkflbY0fZBSp14ZsH5P0GRpJGhReJZE5w5T757AuW?= =?utf-8?q?+Ds7JKaEBRbCpZ1FTO48gdASmhFlibmtbr39SZL6KwOe3UIo8D1X2I0xhDZ7ESu41?= =?utf-8?q?jA9Ce9V6KOd0HL5/4Lijk8QzNxZmxlVQd9jN4F4GIuNr9uuHpJkeT4DJ3dQ6+BLVx?= =?utf-8?q?zl4qUuOnGTXCDyqLpJrEx+os88QUpMluq6ljvVIWuAgzOqxvIEXQBRBlyhpFPKn09?= =?utf-8?q?QC5HN7zyFD6vDf6gSr6hMnsWiBIbR3EQG3pFZ767de66BVoBRCJz6IE3U3ZRfpkHA?= =?utf-8?q?x/tdL/u6zXwDRWQZNBmISX0HV0kJWV7laBFGGUJkID06whg7W9ghkfJ9HGHTdyg2p?= =?utf-8?q?rXLIsTvzDwyuvuzio0EHYLRdooOVE5wxeHsS7dvUQODc+t8mpOfTpEU=3D?= X-Forefront-Antispam-Report: CIP:165.204.84.17; CTRY:US; LANG:en; SCL:1; SRV:; IPV:CAL; SFV:NSPM; H:SATLEXMB04.amd.com; PTR:InfoDomainNonexistent; CAT:NONE; SFS:(13230040)(376014)(82310400026)(36860700013)(1800799024); DIR:OUT; SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Jan 2025 16:25:52.3728 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 899457d6-f818-4ace-e476-08dd37139c74 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=[SATLEXMB04.amd.com] X-MS-Exchange-CrossTenant-AuthSource: SJ5PEPF000001CD.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH0PR12MB5680 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Hi Dave, Simona, Fixes for 6.14. The following changes since commit 24c61d553302ee49e9c21dd251275ba8c36dcfe4: Merge tag 'drm-msm-next-2025-01-07' of gitlab.freedesktop.org:drm/msm into drm-next (2025-01-13 11:14:07 +1000) are available in the Git repository at: https://gitlab.freedesktop.org/agd5f/linux.git tags/amd-drm-next-6.14-2025-01-17 for you to fetch changes up to 97e5c9e4139087a67c2469488360a6d6afdd4b69: drm/amd/display: fix CEC DC_DEBUG_MASK documentation (2025-01-16 16:23:22 -0500) ---------------------------------------------------------------- amd-drm-next-6.14-2025-01-17: amdgpu: - Enforce isolation fixes - GFX 12 fix - Use drm scheduler API helper rather than open coding it - Mark some debugging parameters as unsafe - PSP 14.x fix - Add cleaner shader support for gfx12 - Add subvp debugging flag - SDMA 4.4.x fix - Clarify some kernel log messages - clang fix - PCIe lane reporting fix - Documentation fix amdkfd: - Mark some debugging parameters as unsafe - Fix partial migration handling - Trap handler updates ---------------------------------------------------------------- Alex Deucher (3): drm/amdgpu: cache gpu pcie link width drm/amdgpu: fix the PCIe lanes reporting in the INFO IOCTL drm/amd/display: fix CEC DC_DEBUG_MASK documentation Aurabindo Pillai (1): drm/amd: Add debug option to disable subvp Christian König (2): drm/amdgpu: mark a bunch of module parameters unsafe drm/amdgpu: always sync the GFX pipe on ctx switch Emily Deng (1): drm/amdkfd: Fix partial migrate issue Gui Chengming (1): drm/amdgpu: fix fw attestation for MP0_14_0_{2/3} Jay Cornwall (2): drm/amdkfd: Sync trap handler binary with source drm/amdkfd: Clear MODE.VSKIP in gfx9 trap handler Kenneth Feng (1): drm/amdgpu: disable gfxoff with the compute workload on gfx12 Kent Russell (1): drm/amdgpu: Mark debug KFD module params as unsafe Lijo Lazar (2): drm/amdgpu: Add handler for SDMA context empty drm/amdgpu: Refine ip detection log message Srinivasan Shanmugam (2): drm/amdgpu: Fix Circular Locking Dependency in AMDGPU GFX Isolation drm/amdgpu/gfx12: Add Cleaner Shader Support for GFX12.0 GPUs Tvrtko Ursulin (1): drm/amdgpu: Use DRM scheduler API in amdgpu_xcp_release_sched Tzung-Bi Shih (1): drm/amd/display: mark static functions noinline_for_stack drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c | 5 +- drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 156 +- drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 24 +- drivers/gpu/drm/amd/amdgpu/amdgpu_fw_attestation.c | 4 + drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c | 12 +- drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c | 4 +- drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 19 +- drivers/gpu/drm/amd/amdgpu/amdgpu_sdma.h | 1 + drivers/gpu/drm/amd/amdgpu/amdgpu_xcp.c | 2 +- drivers/gpu/drm/amd/amdgpu/gfx_v12_0.c | 8 + drivers/gpu/drm/amd/amdgpu/sdma_v4_4_2.c | 22 + drivers/gpu/drm/amd/amdkfd/cwsr_trap_handler.h | 2391 ++++++++++---------- .../gpu/drm/amd/amdkfd/cwsr_trap_handler_gfx9.asm | 4 +- drivers/gpu/drm/amd/amdkfd/kfd_migrate.c | 22 +- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 3 + .../drm/amd/display/dc/dml2/display_mode_core.c | 12 +- .../dml21/src/dml2_core/dml2_core_dcn4_calcs.c | 12 +- drivers/gpu/drm/amd/include/amd_pcie.h | 18 + drivers/gpu/drm/amd/include/amd_shared.h | 7 +- 19 files changed, 1446 insertions(+), 1280 deletions(-)