From patchwork Fri Sep 13 13:41:38 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Alex Deucher X-Patchwork-Id: 13803464 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 A2EF7FA3757 for ; Fri, 13 Sep 2024 13:42:04 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 1A6AA10E269; Fri, 13 Sep 2024 13:42:04 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (1024-bit key; unprotected) header.d=amd.com header.i=@amd.com header.b="ehJSr1H9"; dkim-atps=neutral Received: from NAM12-MW2-obe.outbound.protection.outlook.com (mail-mw2nam12on2063.outbound.protection.outlook.com [40.107.244.63]) by gabe.freedesktop.org (Postfix) with ESMTPS id B9DF010E268; Fri, 13 Sep 2024 13:42:02 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=Y8nJkfi6BM+8hXB/E+B+WvdirOWX2XT58EUqV4a7y6EH/WiFeM478IZW3Rdw26EzNOhV22Rw+Og4bcH/QtrfQAytpMXJIru7GYLx1Lxf1zjckTJ20IpKzM/VCFb6ArZShSqwbXAMBAt9lfVTG+/e3xE+2O56KNqlZXDkCZvVoONts+aUDUGe0HrWh/9oNZW5NY9pITTwKet7CmMnIlFRiTZdpNllrs7R3/1YWTwGXW3H5ngG0fBfsZBQpAL+EdrYsTuPiWXs9zzj17F/3+/vbpxVtYRBRKIR95JBnRK8msLH2ArvOZFqA7OE7ahIUv+UJh+fB3JY8apR8Tlpa72S5A== 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=NhcFNSadJr9lEKEAIhgaVIhbb7CunWEh975aC3o0To0=; b=Uv82AAPNySsOTKwOlG8lE8vzubFD13g1tZPAwO73jt+dvQ/cK0i5kB1hwi33AsbnWyBIIjJfVAktU3T09rCyGXg5DDhqs4ytCWOeN5sn4VPvL8xDTJX48ITseqoNjHp6FK3ZvZeMX1F/BB32BEewqn14ZxP/lqqsSnQgvJEp1JxXNuwgQsXotwESlMoZlyLGbM3TPqqhEtfu4ucjwpg7w5l8+F/YhKXlt2NZZ8nGrp7KV9LGcaKcFJ7SZNK2BstlkPzXxb8PxNJyXaqzIM5Oe5BevTyzA6ka793h1ssT5k323iNLq4PyKkP+PWdscuSvQs4C6Vbvt3QLG/OQooC5Cg== 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=NhcFNSadJr9lEKEAIhgaVIhbb7CunWEh975aC3o0To0=; b=ehJSr1H9ClWo9Q3nACB2SR7jvehYx5H+z1yPCEsGfFbuW4VV3CEbZkycq0nFcig5p74Iol43PZGK76TcvTMRVrmr4M/r+tJ1+qATvwOTEiHntcljNqFjrt9kxWAoZQwSIh0+mSW4KVcolybfh2Nc/8wUFn7/geSest/dbavJYPg= Received: from BLAPR03CA0065.namprd03.prod.outlook.com (2603:10b6:208:329::10) by DM6PR12MB4140.namprd12.prod.outlook.com (2603:10b6:5:221::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7962.21; Fri, 13 Sep 2024 13:41:59 +0000 Received: from BN3PEPF0000B36F.namprd21.prod.outlook.com (2603:10b6:208:329:cafe::52) by BLAPR03CA0065.outlook.office365.com (2603:10b6:208:329::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7939.27 via Frontend Transport; Fri, 13 Sep 2024 13:41: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=SATLEXMB04.amd.com; pr=C Received: from SATLEXMB04.amd.com (165.204.84.17) by BN3PEPF0000B36F.mail.protection.outlook.com (10.167.243.166) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.7982.0 via Frontend Transport; Fri, 13 Sep 2024 13:41:58 +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, 13 Sep 2024 08:41:57 -0500 From: Alex Deucher To: , , , CC: Alex Deucher Subject: [pull] amdgpu, amdkfd, drm amd-drm-next-6.12 Date: Fri, 13 Sep 2024 09:41:38 -0400 Message-ID: <20240913134139.2861073-1-alexander.deucher@amd.com> X-Mailer: git-send-email 2.46.0 MIME-Version: 1.0 X-Originating-IP: [10.180.168.240] X-ClientProxiedBy: SATLEXMB03.amd.com (10.181.40.144) To SATLEXMB04.amd.com (10.181.40.145) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BN3PEPF0000B36F:EE_|DM6PR12MB4140:EE_ X-MS-Office365-Filtering-Correlation-Id: 3646d711-4660-4756-c972-08dcd3f9d6bd X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|82310400026|1800799024|36860700013|376014; X-Microsoft-Antispam-Message-Info: =?utf-8?q?+LtrYlHHCrm0ubXTwEM1POOLy5gZXd8?= =?utf-8?q?5zJyJXOyXyuzbQJQNyFaY3Nf1PnxBoByHSm7dRvFzP2UxiQ6Xkj4Hy4A9tWI+MPnT?= =?utf-8?q?SCOu+CeRjNcwcpWSKF4FKug1noBod8OvL87TEULT31WX+QASdLKap/2hLdW6YsQPW?= =?utf-8?q?TidBJ97qhHXARDCMkB/njINP/aOeFMvAszMROihx9Ujgss1Z9MVcDZD1EngzGqQ2C?= =?utf-8?q?xalnFqK3x+1N0e6RBGBgDYrNG0ona/fNeqiIsWl+5OwTKDJafarRqpEJESNgwNt8T?= =?utf-8?q?bSrkGUpAq3bLA2fysFWcOEwwYA1X5FQqcYbW4OG/joKX+HMfpDwgqa7Fn5/K5H0cL?= =?utf-8?q?/mNXZZsjLyuDXG0YtPhQRdmCLCbS3NGBKijEiJI5rtpF2TRV2Yc2QuSMmIkZT8Mng?= =?utf-8?q?Oj3kZvbpqHNO7eVcinJ09eGkkcFev11g2/rsCC7ykk6avWP9zXu+aj+QVrf5uintT?= =?utf-8?q?p4148X84h0/nU5mlumD1KFqQTMO5b1Av9eYKkftuCMA7Qlip8ucMGZjZmeI07kRaO?= =?utf-8?q?lUZht9HCLjBuVYLkmcO3u1s9hAYdTog8ZNyDKROzWbrQrjCZfWwKnSERsOKGMGfOz?= =?utf-8?q?IT92BprXn3oIKPu/Oq0Vh0gxkm/Tey6cttbQWWXs8lks5VKdjw9Y1W0eq9rfaIfsc?= =?utf-8?q?Rd0IrK9wTbc2ixIuoocU3Im3YuEFxEsZhQVppsnkTYibjNUTU5b48WFRrZx0j0Cdf?= =?utf-8?q?L9t670Jf/tebzoOKtIeIl8nxJiLHFAbE7PyZcJoYoCp2oaNNm1/eD6NjuyLTTU9EK?= =?utf-8?q?zQGtBdBUl2V+qxBBMFOXhdNXwWmNmX57Xk+fgbmbow7SOMm+yFcJEpPKrO2Cp8cR7?= =?utf-8?q?RMF8/d0W/UqFazhEKMr67IC3f8cI64z2YNF1K1P32alaAac0x1lOFdeoT6MbMw1hw?= =?utf-8?q?G9EIxVWQeLKcVZHAEV4NzbcvxEph9FJeUN6SzXVtaJsupJcqN1qxmhm7VdRBx8B4j?= =?utf-8?q?PtWiLDlvfbryKucJE9s6YBa8ekFFH0HitIo1lKbrw3zYunrjovfarNwF9Bn0t/JLo?= =?utf-8?q?mfM454LsOg13ytowrLKOCIPZDxjbMEC5G1DnG29wcUsnO926B0jLTn2eH810fPcO/?= =?utf-8?q?FbDpczyPFrSo1blZ8nC18ry63kLqUGSlYwq8Bawpq1oaRxVPEqhYcNpt/r4A2kVs6?= =?utf-8?q?+clVcP2r11iIDi13GDBj0BdqQ5A7gnC7x7VDTqlUeVMZ5rItKdrc3MVnb46QQIuUn?= =?utf-8?q?9kGcOENUvdS4JO533icn2rgfkQ3YOBs6fGYICSfNvOnL/wZCF3O6grgULtSahRv9/?= =?utf-8?q?3lOiVyy8L1SRmD7fb/k26kJrR6EO1wFpzNCbbwWuBy3i6tGjhbaIvZb6J5qfR/UQH?= =?utf-8?q?dSYE3hOVy/iq?= 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)(82310400026)(1800799024)(36860700013)(376014); DIR:OUT; SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Sep 2024 13:41:58.2222 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 3646d711-4660-4756-c972-08dcd3f9d6bd 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: BN3PEPF0000B36F.namprd21.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR12MB4140 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, A few fixes for 6.12 and the drm dma-buf race fixes from Al Viro. The following changes since commit 7a199557643e993d4e7357860624b8aa5d8f4340: Revert "drm/amdgpu: align pp_power_profile_mode with kernel docs" (2024-09-05 14:27:41 -0400) are available in the Git repository at: https://gitlab.freedesktop.org/agd5f/linux.git tags/amd-drm-next-6.12-2024-09-13 for you to fetch changes up to 0c8c5bdd7eaf291b6f727e98506fb68acee3a4cc: drm/amd/display: Add all planes on CRTC to state for overlay cursor (2024-09-11 10:34:05 -0400) ---------------------------------------------------------------- amd-drm-next-6.12-2024-09-13: amdgpu: - GPUVM sync fixes - kdoc fixes - Misc spelling mistakes - Add some raven GFXOFF quirks - Use clamp helper - DC fixes - JPEG fixes - Process isolation fix - Queue reset fix - W=1 cleanup - SMU14 fixes - JPEG fixes amdkfd: - Fetch cacheline info from IP discovery - Queue reset fix - RAS fix - Document SVM events - CRIU fixes - Race fix in dma-buf handling drm: - dma-buf fd race fixes ---------------------------------------------------------------- Al Viro (4): drm: new helper: drm_gem_prime_handle_to_dmabuf() drm/amdgpu: fix a race in kfd_mem_export_dmabuf() drm/amdkfd: CRIU fixes drm/amdgpu: get rid of bogus includes of fdtable.h Alex Deucher (1): drm/amdgpu/atomfirmware: Silence UBSAN warning Christian König (2): drm/amdgpu: re-work VM syncing drm/amdgpu: revert "use CPU for page table update if SDMA is unavailable" Colin Ian King (1): drm/amd/display: Fix spelling mistake "recompte" -> "recompute" Dan Carpenter (1): drm/amdgpu/mes11: Indent an if statment David (Ming Qiang) Wu (2): drm/amd/amdgpu: apply command submission parser for JPEG v2+ drm/amd/amdgpu: apply command submission parser for JPEG v1 David Belanger (1): drm/amdkfd: Add cache line size info Hawking Zhang (1): drm/amdkfd: Select reset method for poison handling Jani Nikula (1): drm/amdgpu: drop redundant W=1 warnings from Makefile Jesse Zhang (2): drm/amdgpu: fix queue reset issue by mmio drm/amdkfd: Fix resource leak in criu restore queue Jonathan Kim (1): drm/amdkfd: fix missed queue reset on queue destroy Kenneth Feng (2): drm/amd/pm: update the features set on smu v14.0.2/3 drm/amd/pm: fix the pp_dpm_pcie issue on smu v14.0.2/3 Lang Yu (1): drm/amdgpu: fix invalid fence handling in amdgpu_vm_tlb_flush Leo Li (2): drm/amd/display: Do not reset planes based on crtc zpos_changed drm/amd/display: Add all planes on CRTC to state for overlay cursor Li Zetao (2): drm/amd: use clamp() in amdgpu_pll_get_fb_ref_div() drm/amdgpu: use clamp() in amdgpu_vm_adjust_size() Lijo Lazar (1): drm/amdgpu: Normalize reg offsets on JPEG v4.0.3 Nicholas Susanto (1): drm/amd/display: Refactor dccg35_get_other_enabled_symclk_fe Peng Liu (2): drm/amdgpu: add raven1 gfxoff quirk drm/amdgpu: enable gfxoff quirk on HP 705G4 Philip Yang (1): drm/amdkfd: Document and define SVM events message macro Qili Lu (1): drm/amd/display: fix dccg root clock optimization related hang Ramesh Errabolu (1): drm/amdgpu: Surface svm_default_granularity, a RW module parameter Srinivasan Shanmugam (5): drm/amd/display: Add missing kdoc entry for 'bs_coeffs_updated' in dpp401_dscl_program_isharp drm/amdgpu/: Add missing kdoc entry in amdgpu_vm_handle_fault function drm/amdgpu: Replace 'amdgpu_job_submit_direct' with 'drm_sched_entity' in cleaner shader drm/amd/display: Add kdoc entry for 'program_isharp_1dlut' in 'dpp401_dscl_program_isharp' drm/amdgpu: Fix kdoc entry in 'amdgpu_vm_cpu_prepare' Tobias Jakobi (2): drm/amd/display: Avoid race between dcn10_set_drr() and dc_state_destruct() drm/amd/display: Avoid race between dcn35_set_drr() and dc_state_destruct() drivers/gpu/drm/amd/amdgpu/Makefile | 18 +--- drivers/gpu/drm/amd/amdgpu/amdgpu.h | 1 + .../gpu/drm/amd/amdgpu/amdgpu_amdkfd_arcturus.c | 1 - drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c | 12 +-- drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 17 ++++ drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c | 35 ++++---- drivers/gpu/drm/amd/amdgpu/amdgpu_mes.c | 1 + drivers/gpu/drm/amd/amdgpu/amdgpu_pll.c | 2 +- drivers/gpu/drm/amd/amdgpu/amdgpu_sched.c | 1 - drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 99 +++++++++++--------- drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h | 11 +-- drivers/gpu/drm/amd/amdgpu/amdgpu_vm_cpu.c | 10 +-- drivers/gpu/drm/amd/amdgpu/amdgpu_vm_pt.c | 2 +- drivers/gpu/drm/amd/amdgpu/amdgpu_vm_sdma.c | 16 +--- drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 4 + drivers/gpu/drm/amd/amdgpu/jpeg_v1_0.c | 76 +++++++++++++++- drivers/gpu/drm/amd/amdgpu/jpeg_v1_0.h | 11 +++ drivers/gpu/drm/amd/amdgpu/jpeg_v2_0.c | 63 ++++++++++++- drivers/gpu/drm/amd/amdgpu/jpeg_v2_0.h | 6 ++ drivers/gpu/drm/amd/amdgpu/jpeg_v2_5.c | 2 + drivers/gpu/drm/amd/amdgpu/jpeg_v3_0.c | 1 + drivers/gpu/drm/amd/amdgpu/jpeg_v4_0.c | 1 + drivers/gpu/drm/amd/amdgpu/jpeg_v4_0.h | 1 - drivers/gpu/drm/amd/amdgpu/jpeg_v4_0_3.c | 93 ++++--------------- drivers/gpu/drm/amd/amdgpu/jpeg_v4_0_3.h | 7 +- drivers/gpu/drm/amd/amdgpu/jpeg_v4_0_5.c | 1 + drivers/gpu/drm/amd/amdgpu/jpeg_v5_0_0.c | 3 +- drivers/gpu/drm/amd/amdgpu/mes_v11_0.c | 2 +- drivers/gpu/drm/amd/amdkfd/kfd_chardev.c | 64 +++++++++---- drivers/gpu/drm/amd/amdkfd/kfd_crat.c | 8 +- .../gpu/drm/amd/amdkfd/kfd_device_queue_manager.c | 5 +- drivers/gpu/drm/amd/amdkfd/kfd_int_process_v9.c | 40 +++++++-- drivers/gpu/drm/amd/amdkfd/kfd_priv.h | 6 ++ .../gpu/drm/amd/amdkfd/kfd_process_queue_manager.c | 1 + drivers/gpu/drm/amd/amdkfd/kfd_smi_events.c | 45 +++++----- drivers/gpu/drm/amd/amdkfd/kfd_svm.c | 22 +++-- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 13 ++- .../amd/display/amdgpu_dm/amdgpu_dm_mst_types.c | 2 +- .../gpu/drm/amd/display/dc/dccg/dcn35/dcn35_dccg.c | 79 +++++++--------- .../gpu/drm/amd/display/dc/dccg/dcn35/dcn35_dccg.h | 1 + .../amd/display/dc/dpp/dcn401/dcn401_dpp_dscl.c | 2 + .../drm/amd/display/dc/hwss/dcn10/dcn10_hwseq.c | 20 +++-- .../drm/amd/display/dc/hwss/dcn35/dcn35_hwseq.c | 24 +++-- drivers/gpu/drm/amd/display/dc/inc/hw/dccg.h | 1 + drivers/gpu/drm/amd/include/atomfirmware.h | 4 +- drivers/gpu/drm/amd/pm/swsmu/inc/smu_types.h | 11 ++- .../gpu/drm/amd/pm/swsmu/smu14/smu_v14_0_2_ppt.c | 12 +++ drivers/gpu/drm/drm_prime.c | 84 ++++++++++------- include/drm/drm_prime.h | 3 + include/uapi/linux/kfd_ioctl.h | 100 ++++++++++++++++++--- 50 files changed, 678 insertions(+), 366 deletions(-)