From patchwork Thu Jan 9 16:42:36 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Deucher X-Patchwork-Id: 13932977 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 E6404E77197 for ; Thu, 9 Jan 2025 16:43:02 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 67DDA10E472; Thu, 9 Jan 2025 16:43:02 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (1024-bit key; unprotected) header.d=amd.com header.i=@amd.com header.b="CqjXPpi6"; dkim-atps=neutral Received: from NAM12-DM6-obe.outbound.protection.outlook.com (mail-dm6nam12on2055.outbound.protection.outlook.com [40.107.243.55]) by gabe.freedesktop.org (Postfix) with ESMTPS id 099F210E472; Thu, 9 Jan 2025 16:43:00 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=Pyrw3vbEGWr7IPfirjdH69c1nzqD34UVmEE/IpYCr1yRn9noulHrI8jJAmQjw4pG/0l4O1qxIC+W87m4G/sMOEoaf/VYzay4F5cxX8FKUlA1LTsyRPqTVQHc4hP0YjI3vTFsf016XdmHG8Ds5Jod4lsyJxGXb3ErylSOugZn9nhT4DaDN8ezr56VuQCbw7wNtjyoxsJVkxu1KQYRghPwF66++N+ZbXCHR1LdwDjo1afev2nyH4ug28BeRzun+5JK8obc5tQcAPeZz+aBjMwOx97jOLRgkfhRmtEORYwWqAM7o5m1KkhhOv1HLZNmNRLSFOpL50XPAkjHjCyKf+1wwg== 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=XnTEPGIT4Go/eD6SwmtfiDIHQO9NWku/2kaa5Cw7Z0s=; b=RHjAJes/XV+F4UCNOnEZTjbmCseMEFI6tS3Y7Lc9zKm0jBbRrO+oQlBEFFn38OSOTdNOyHu2iye9URfllPWyrfOAb4QbFBWXyt/URziypnDL26Or8wqanrGnEXiI2W4lrGummpQSnNm09x21a/aS7kI7wIouINq8ig29SuN+rmoaW6yMhn2Wqlmg0qSaWhJ6cTtlkbvXwhalDRuGOo8e9nzU7il6R6NUIjMTjbYy3phmO6Rd4brWT4e2EWijXhN9GSaXAqtPC5uvI/9jN+gaZ+hjINC/N7nRrw9xG7/n2gvKkXygFM8jN10cB2E6nVl5kNAUHNj6PF30qDkBzVhm0Q== 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=XnTEPGIT4Go/eD6SwmtfiDIHQO9NWku/2kaa5Cw7Z0s=; b=CqjXPpi69NdSQ2ohQQnxwIPbUL7lLZMGIkDuJbRQBeZ/zaR85dfC1Wa4VnDIwPVvTuaer7o8q4nUJDLoSd2/ViOjGU2AVgUdujkgMbY8gg37LujX29Ls5N88C+GmCPyoL+E6cpSyeoYNXXjm8nAECTru4od6N5B6UCCBqN+m2ns= Received: from SJ0PR13CA0109.namprd13.prod.outlook.com (2603:10b6:a03:2c5::24) by MW6PR12MB8913.namprd12.prod.outlook.com (2603:10b6:303:247::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8335.12; Thu, 9 Jan 2025 16:42:58 +0000 Received: from CO1PEPF000042A8.namprd03.prod.outlook.com (2603:10b6:a03:2c5:cafe::c1) by SJ0PR13CA0109.outlook.office365.com (2603:10b6:a03:2c5::24) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8356.6 via Frontend Transport; Thu, 9 Jan 2025 16:42: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 CO1PEPF000042A8.mail.protection.outlook.com (10.167.243.37) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.8335.7 via Frontend Transport; Thu, 9 Jan 2025 16:42:57 +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; Thu, 9 Jan 2025 10:42:56 -0600 From: Alex Deucher To: , , , CC: Alex Deucher Subject: [pull] amdgpu, amdkfd drm-fixes-6.13 Date: Thu, 9 Jan 2025 11:42:36 -0500 Message-ID: <20250109164236.477295-1-alexander.deucher@amd.com> X-Mailer: git-send-email 2.47.1 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: CO1PEPF000042A8:EE_|MW6PR12MB8913:EE_ X-MS-Office365-Filtering-Correlation-Id: 16cbb3c9-ff25-4b88-8623-08dd30ccac78 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: =?utf-8?q?gp2MTPnhG6ZecE73wjt2+d0xEZO06eg?= =?utf-8?q?eLcns2dPJXx/iC1r0zkzpz+VAx0f72xf3fRUKrC/rV9yfnSRIkF/W3BYDBGd+LCho?= =?utf-8?q?S38Ybk2elJMJyM81jRjfLP2FnTqPtsMFmtJj/a8X1PucfHHFysDA87VDG2+BtoVmR?= =?utf-8?q?bnUyRpReB+7em7WwwZ2evd/grCMRBMVN7+8ZyQIIn/+zBGMN37ldOOzSguZ+O2v3K?= =?utf-8?q?0SBCy1J4rpc2NPXLJxR1zIIADna8E/MtasRTmnXaf9yVx67KrFSe6PIOtAhCH++F7?= =?utf-8?q?krS2z4FSO/n+LC5/TzKbPGDSI+xVP1sDtGiKF0NS54pwgK/j/nNIJhdFMLp5q4Wwd?= =?utf-8?q?KeO94cn8SljUkh5zcKXC0ZC+ghhm9eZ2x3XQ4MpyFpmcnlJTK1xNbto/XBEjYIyKE?= =?utf-8?q?qiey/Eis2sBz9I1g3vtpvDp+XkyT6FcyDeytD5RSiTS11cVBOuNlKgcbDhWBIAc5s?= =?utf-8?q?tWe4AGB/V6RrrfghOCkQcSn30kch6SqR53hQhTVrwuUwvKlHidrzdj1epIbt9Dk3M?= =?utf-8?q?rRJLrcEaoLLk8ED4lCeEbBdnnIPQrcYICEjrUjegz8lc7FJVNbWkSfHEakRs39Gb7?= =?utf-8?q?mKe/piV7qK2aPbbv10kAEl3MY4Equhrb/94BHWflxYHAO/o97YnJIJ5Q0ST4hKWki?= =?utf-8?q?5fe4vH4y3NugLdmSXVm6K0tVBFfdWyl/A11W+181ZK6GEsc7V0tHTRvsanP/SF0V3?= =?utf-8?q?Fy+CclG5BN6k1l1YLPWvQJZ/XqQavY1whgveZwUBawukleF5j6iEt0SPqsziip6Mt?= =?utf-8?q?ZNtCDYW+1Rnm3WxuP+vreE5YNRmS1GT/210vKshDnKSTTIZLxDUcCzu/wlICMq5AQ?= =?utf-8?q?5PflInV5HvaHGvyP6ZhQo/uw8+DpOQvdbdPPCt2OsVGPPwvyOnGG5TxtIRooOW+pE?= =?utf-8?q?JWx4fp7aoaBE7klxT5pys3KKpQAB8EiSTQVWIWKT8zfLkD1xKohfjlzy1iiO0hZAg?= =?utf-8?q?TK7iN39+crHIOmbyr1RD+wlhelneCuxBEr7V8gibuvFg3C/023ACgD6Jan5AM6Q8H?= =?utf-8?q?W/1kNl24bVWfd8jDm3ss/6kVnf/xqJ6QmxGM8eigg0/jOSNVROvR06OfCM84QVVWN?= =?utf-8?q?gFVvL904ZmNH96V0Wng8vdaEyqB7e01PqjcmvxzKRnPXnnonyYv+H4mHQ3JIPZS/O?= =?utf-8?q?ed8rvKhwgjPDqR6GsKrualB6YCQfOeSJ2DPY4SK50zX7Sz4tiq2gNif8P1rBXeVsZ?= =?utf-8?q?tF8e84WZsz42Dy3+RDHqowXlWNCEyWkzENxutIR9RWrvYM1OKCKCv5FXyxZ+Hq9MH?= =?utf-8?q?IDfllKNKmzLkMkfBYUV1OT1JlHAAGSfnBuewlW9HxTHylpw9SkaHkcqhUG7GLkfdf?= =?utf-8?q?EEXukAbzVxW9Ijy/wMuwbIjMDk3tCYufauMIWWnGp3KzhcQ837acCtg=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)(1800799024)(376014)(36860700013)(82310400026); DIR:OUT; SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Jan 2025 16:42:57.9957 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 16cbb3c9-ff25-4b88-8623-08dd30ccac78 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: CO1PEPF000042A8.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW6PR12MB8913 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.13. The following changes since commit 273b3eb600713a5e71c64b8b403b355dc580f167: Merge tag 'drm-xe-fixes-2025-01-02' of https://gitlab.freedesktop.org/drm/xe/kernel into drm-fixes (2025-01-03 10:57:31 +1000) are available in the Git repository at: https://gitlab.freedesktop.org/agd5f/linux.git tags/amd-drm-fixes-6.13-2025-01-09 for you to fetch changes up to 75c8b703e5bded1e33b08fb09b829e7c2c1ed50a: drm/amdgpu: Add a lock when accessing the buddy trim function (2025-01-06 15:20:13 -0500) ---------------------------------------------------------------- amd-drm-fixes-6.13-2025-01-09: amdgpu: - Display interrupt fixes - Fix display max surface mismatches - Fix divide error in DM plane scale calcs - Display divide by 0 checks in dml helpers - SMU 13 AD/DC interrrupt handling fix - Fix locking around buddy trim handling amdkfd: - Fix page fault with shader debugger enabled - Fix eviction fence wq handling ---------------------------------------------------------------- Alex Hung (1): drm/amd/display: Remove unnecessary amdgpu_irq_get/put Arunpravin Paneer Selvam (1): drm/amdgpu: Add a lock when accessing the buddy trim function Jesse.zhang@amd.com (1): drm/amdkfd: fixed page fault when enable MES shader debugger Kun Liu (1): drm/amd/pm: fix BUG: scheduling while atomic Melissa Wen (3): drm/amd/display: fix page fault due to max surface definition mismatch drm/amd/display: increase MAX_SURFACES to the value supported by hw drm/amd/display: fix divide error in DM plane scale calcs Roman Li (1): drm/amd/display: Add check for granularity in dml ceil/floor helpers Zhu Lingshan (1): drm/amdkfd: wq_release signals dma_fence only when available drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c | 2 +- drivers/gpu/drm/amd/amdkfd/kfd_debug.c | 17 +++++++++++ drivers/gpu/drm/amd/amdkfd/kfd_process.c | 3 +- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 35 ++-------------------- drivers/gpu/drm/amd/display/dc/core/dc.c | 2 +- drivers/gpu/drm/amd/display/dc/core/dc_state.c | 8 ++--- drivers/gpu/drm/amd/display/dc/dc.h | 4 +-- drivers/gpu/drm/amd/display/dc/dc_stream.h | 2 +- drivers/gpu/drm/amd/display/dc/dc_types.h | 1 - .../gpu/drm/amd/display/dc/dml/dml_inline_defs.h | 8 +++++ .../drm/amd/display/dc/dml2/dml2_mall_phantom.c | 2 +- drivers/gpu/drm/amd/pm/swsmu/inc/smu_v13_0.h | 2 ++ drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0.c | 12 ++++---- .../gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_0_ppt.c | 1 + .../gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_7_ppt.c | 1 + 15 files changed, 49 insertions(+), 51 deletions(-)