From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 D13AE2EC0B2 for ; Sun, 1 Mar 2026 01:45:28 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772329528; cv=none; b=SholWYUi7bMK6n9KpzPb3w4jBpg/5fWFv2ZfYAJO2twhfcvmE7KvN/k2iRoHv+d9OKlzdfTLoBNvgSalcSKVAjt44EA3USmMPQ6ZN0fz09zld75d0khlIHmjvX+LSlwPT3iSCRhCk5yQ3kOCN2RbMazrvYdokZN1WOq6G+KTb9c= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772329528; c=relaxed/simple; bh=3fCC9ZJzH+35r/BoLseilEU3gop/X3cKsvOm+3Mdano=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version:Content-Type; b=MpAK32ulVLB9p2yqVyCS98GCVQYVa2YgZqIhBOaTDrcho76WhjaPW02dsU/J1IrdZjvRCMRncULEhbnavVCYxRVSw7AH1fGt9Gk8egd00oNRwRd/I0WSsoDYiFcfkZaPMXP16jwCQyaxq9x+lloh4IPQtPVacG0A09BnYK+yXb8= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=kSKr7/Gr; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="kSKr7/Gr" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 15959C19425; Sun, 1 Mar 2026 01:45:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1772329528; bh=3fCC9ZJzH+35r/BoLseilEU3gop/X3cKsvOm+3Mdano=; h=From:To:Cc:Subject:Date:From; b=kSKr7/Gr+GQP6grk8d9evTIAZnPGwRGDHmpmNaUoEUxDXUdPQaONbgtBkjvj+Odkh HlXgmrZkn0C7Dj+vH5dOGT3Fp1fFGJmsoE5QtzfSIcqRUvQtTyRDqg/QF0LUSlgH1d sKIIJnwAFUlS3vxTw/PN2d2WK8KpBnSbsOU5H7X8YOYE4KzHPhZZQU8n3Ko/Pm+EOG OLdtrsIP9eMU3SaYYMHKG6hvb3vtOcRQsLQo3Hru4GmDdHY3Yjzp6j5WORYnFsjE5P 0AHL5tz4QjWsSpRr/OHTCK+b1jMpeUFvfHdx+a156f0qGDxkxDgy8OkQ21cuCM6MBE ao4uimfrfId4Q== From: Sasha Levin To: stable@vger.kernel.org, Philip.Yang@amd.com Cc: =?UTF-8?q?Christian=20K=C3=B6nig?= , Alex Deucher , amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org Subject: FAILED: Patch "drm/amdgpu: Use 5-level paging if gmc support 57-bit VA" failed to apply to 6.1-stable tree Date: Sat, 28 Feb 2026 20:45:26 -0500 Message-ID: <20260301014526.1708050-1-sashal@kernel.org> X-Mailer: git-send-email 2.51.0 Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Patchwork-Hint: ignore X-stable: review Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The patch below does not apply to the 6.1-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to . Thanks, Sasha ------------------ original commit in Linus's tree ------------------ >From 3b948dd0366a0b64c02e4ed1aefdf7825942e803 Mon Sep 17 00:00:00 2001 From: Philip Yang Date: Tue, 27 Jan 2026 13:52:33 -0500 Subject: [PATCH] drm/amdgpu: Use 5-level paging if gmc support 57-bit VA MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Regardless if CPU enable 5-level paging, GPU vm use 5-level paging if gmc init with 57-bit address space support, because ARM64 4-level paging support 48-bit VA, x86 and GPU 4-level paging support 47-bit VA, require 5-level paging on GPU to support ARM64. NPA address space 52-bit mapping on NPA GPU VM require 5-level paging. Debugger trap get device snapshot expect LDS and Scratch base, limit above 57-bit, which is set only for 5-level paging. Signed-off-by: Philip Yang Reviewed-by: Christian König Acked-by: Alex Deucher Signed-off-by: Alex Deucher Cc: stable@vger.kernel.org # 6.19.x --- drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c index 6a2ea200d90c8..31383583fc682 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c @@ -2360,26 +2360,9 @@ void amdgpu_vm_adjust_size(struct amdgpu_device *adev, uint32_t min_vm_size, unsigned max_bits) { unsigned int max_size = 1 << (max_bits - 30); - bool sys_5level_pgtable = false; unsigned int vm_size; uint64_t tmp; -#ifdef CONFIG_X86_64 - /* - * Refer to function configure_5level_paging() for details. - */ - sys_5level_pgtable = (native_read_cr4() & X86_CR4_LA57); -#endif - - /* - * If GPU supports 5-level page table, but system uses 4-level page table, - * then use 4-level page table on GPU - */ - if (max_level == 4 && !sys_5level_pgtable) { - min_vm_size = 256 * 1024; - max_level = 3; - } - /* adjust vm size first */ if (amdgpu_vm_size != -1) { vm_size = amdgpu_vm_size; -- 2.51.0