Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=100.103.45.18 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1795054057; b=BNpuXrSrcBQoNn5aU5YnSEg8KNbj1Qp7GhCLD2nT+KAuF17h81n05RP8ZAlnAmieQ+DK l6jfCJHMPl5VsTFapWv36+o+vjRERLwhIXUHH2virj88y5xq2LNsz7h9bYUZ+N4BiebrF B+jWLqBkNUSjwSWeJrXEPDZLpT6n1d8bdWQXoqjoI8lvbyt1cTH/mzruuoIqK/J+w1dCD NSREcG+ZTLuUGsa1ssuBiCXuYF2xwFf2ruXqYn/f/Srl9bc3rlDu7gKGQxKm0C53lPe2o mQbpNZD1zn7Eoq94KOTb3fyQOw6iZZcB+e9S0fWRIxd+mzLA00LTUdBeGjnXm//E2ag== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1795054057; h=Received:DKIM-Signature:From:To:Cc:Subject:Date:Message-ID:X-Mailer: In-Reply-To:References:User-Agent:X-stable:X-Patchwork-Hint: MIME-Version:Content-Transfer-Encoding; bh=r7BFbuG0r1f2H4oEepMIiRGwW0ttMAqWMM+XY2suqbw=; b=zMhkksUd8gNkriWfLCs68s/ql/uNb2V/8oQzETTyfqHCY4/UNIHTHQfN3zr/AT9g+MCe 2VQrThz9nqriZMfa23QfSz085rMmfIq1lxyhzIoJ2OCio33m35yxt+G1e1KzTV4GFEwsq ywX+U1ciZbUmbn2BvjFwNhKn02dzj5PBmpm9vb7R93MXAGhneZZbN2E4i5HWr23dsi0HM dCqV+h4QJ/G4CFxM5JeHf3XPJn1WjbacmP9Q1M1inWOHuEZSA8Q/gMTJ50SKOEJWyUHPo 7RNxhkG4yBaJbkWWoDzkOOaY/7cyPG0Xp699PSAaEuUXm+uT0QfdlDCrXdIPtt8TZzg== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass header.d=linuxfoundation.org header.i=@linuxfoundation.org header.a=rsa-sha256 header.s=korg header.b=qNUhK1SM; arc=none smtp.remote-ip=100.103.45.18 Received: from smtp.kernel.org (quasi.space.kernel.org [100.103.45.18]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 75043606A320; Thu, 19 Nov 2026 02:07:37 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.a=rsa-sha256 header.s=korg header.b=qNUhK1SM Received: by smtp.kernel.org (Postfix) with ESMTPSA id C7BA61F000C4; Thu, 19 Nov 2026 02:07:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1795054057; bh=r7BFbuG0r1f2H4oEepMIiRGwW0ttMAqWMM+XY2suqbw=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=qNUhK1SMwKZMps0llNC5aJr3sWzMEJSQpJPAyBkYXdElWVkWmIKTx+SOWo4cVf36O VVHJTpmcWK4Cyo/ZCermEiPuGlJ4rCaxExIE/sTAZ9IoJMc5D7YdP+cXZXSP4WcKLz 3iybISwsw6UaGlVpTYRawnSZuPgw/RXbiIUgeU94= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Alex Deucher , Maciej Kucharek , Sasha Levin Subject: [PATCH 5.15 1112/2214] drm/amdgpu: reset SI ASIC on MacBookPros with VRAM at 0 Date: Wed, 18 Nov 2026 15:46:28 +0100 Message-ID: <20261118150056.622707750@linuxfoundation.org> X-Mailer: git-send-email 2.56.0 In-Reply-To: <20261118150009.797899913@linuxfoundation.org> References: <20261118150009.797899913@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore X-Mailing-List: patches@lists.linux.dev List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 5.15-stable review patch. If anyone has any objections, please let me know. ------------------ From: Maciej Kucharek [ Upstream commit 5b56ede880317bd912f914d5cd38ba1d357677fa ] On MacBookPros with switchable graphics, the firmware puts VRAM at MC address 0 when the iGPU is enabled. The EFI stub enables the iGPU on these machines through apple_set_os(). On a MacBookPro11,5 (Radeon R9 M370X, 1002:6821, subsystem 106b:0149), the driver adopts this layout at init: MC_VM_FB_LOCATION=0x007f0000, HDP_NONSURFACE_BASE=0 VRAM at 0x0-0x7fffffff, GART table at 0x1400000 The driver posts the ASIC again on S3 resume and after a GPU reset. The VBIOS asic_init table then moves VRAM back to the VBIOS default: MC_VM_FB_LOCATION=0xf47ff400, HDP_NONSURFACE_BASE=0xf4000000 gmc_v6_0 does not reprogram these registers. The GART table is then no longer in VRAM, and the gfx ring test times out: amdgpu: ring gfx test failed (-110) amdgpu: resume of IP block failed -110 Reset and post the ASIC at driver load on Apple boards with VRAM at 0. The driver then uses the VBIOS layout (VRAM at 0xf400000000) from the start, and later posts keep it. After the reset, FB_BASE is not 0, so a module reload does not reset the ASIC again. The test is the same one that commit c54e4d105077 ("drm/amdgpu: make Mac FB workaround generic") uses: an Apple subsystem vendor and VRAM at 0. The VI quirk for the MacBookPro14,3 resets at load for the same reason: commit b6b1d9721851 ("drm/amdgpu: reset VI ASIC on MacBookPro14,3") Other Apple SI boards get the same reset if FB_BASE reads 0 at load. Tested on a MacBookPro11,5 with 7.2.5 and this patch: the panel comes up at boot, and 4 of 4 deep S3 cycles resume. Without the patch, S3 resume fails every time. The GPU reset path is not tested. Closes: https://gitlab.freedesktop.org/drm/amd/-/issues/5978 Assisted-by: Claude:claude-opus-5-5 Reviewed-by: Alex Deucher Signed-off-by: Maciej Kucharek Signed-off-by: Alex Deucher (cherry picked from commit 60dd16ae10f286cb9cce5b6027b2d5ee869637af) Cc: stable@vger.kernel.org [ sashal: replaced MC_VM_FB_LOCATION__FB_BASE_MASK with its equivalent literal 0xFFFF to avoid conflicting header definitions. ] Signed-off-by: Sasha Levin --- drivers/gpu/drm/amd/amdgpu/si.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/drivers/gpu/drm/amd/amdgpu/si.c b/drivers/gpu/drm/amd/amdgpu/si.c index fd34c2100bd96..c63f1b7162d34 100644 --- a/drivers/gpu/drm/amd/amdgpu/si.c +++ b/drivers/gpu/drm/amd/amdgpu/si.c @@ -1509,6 +1509,16 @@ static bool si_need_full_reset(struct amdgpu_device *adev) static bool si_need_reset_on_init(struct amdgpu_device *adev) { + /* + * MacBookPros with switchable graphics put VRAM at 0 when the iGPU + * is enabled. Any later post (S3 resume, GPU reset) moves it back to + * the vbios default, so reset and post on load to start with the + * vbios layout. + */ + if (adev->pdev->subsystem_vendor == PCI_VENDOR_ID_APPLE && + !(RREG32(mmMC_VM_FB_LOCATION) & 0xFFFF)) + return true; + return false; } -- 2.53.0