From mboxrd@z Thu Jan 1 00:00:00 1970 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=1795059811; b=luhqf0Y9DWseDVaCe5NcE7Udh8B5HJnS9eKa3K7Cs8CjihkhqhP+gYgD0EBml9oIIVEX o1uZ5ZyuqwF4JAEEd0c6Zw+DSzxwvMYqjVuwqc5nNItheznqyLA5LKR2GAhTJ88+jKVsW uKnVMaYLkfMQR1+c44i/U9bMkPXoq4aiRbCiPda51tkG0xxY/9MFOe3e3dJiJohDcb19U k31yGeikoHwT/3Cys5uQ+soESVQdnntMY5xVPauRyGIp8hpssHS7dC5scxEDikA+FU+Gb 2OFpSTKVzMdBCiYq7rgYkMjkFsOgLFvDexv55/ZdtjaqjGfedYE4P9P6kQa7+m2P+Fg== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1795059811; 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=can8TrBKbdr1Jvp8nmEy+Dno92XEyBx+0bSMGs1Y5hc=; b=dUDfAYwq0YEMOl4YeSokSRJS4OMZRkD7YjKrGcrVwD7uaqoaLk6kB+Tl9u3FsNUdQNNa etqtVuNjT9G/xm2UHn6xBfXQgx56xJSUN7kSwe03bAa2IU+Ln7mTl+yNVkBCi6SSq+PAi zEq4uvSPYLP+n0Ba17qZHHhaQkavfQ2RkTcq717p5Vh9PggtjIA0VNZbIdqJ1Ze05UPxU 0n61aOScjcHNsW1KEIFJ3dehtB/3DWpynXSos4LlEI9Yb+QlIYCopNYRdbhEKAVyPa3S1 oxDXeq8Ve6/ynKlV46MObbR3gQBIS43PG4mAOTT9mjGnyUn4IqRH47SMmHVvi9IQWKQ== 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="QU18F/zx"; 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 EACFD606A320; Thu, 19 Nov 2026 03:43:30 +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=QU18F/zx Received: by smtp.kernel.org (Postfix) with ESMTPSA id 461C11F000C4; Thu, 19 Nov 2026 03:43:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1795059810; bh=can8TrBKbdr1Jvp8nmEy+Dno92XEyBx+0bSMGs1Y5hc=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=QU18F/zxC53Oq+O+dKp2MKPRlPMLZQ3iR4IpLcuv7vYnZ0OXBAxZKVk7urmGEubgq OXGu+XT0r7gVOfWzDrCX5yvL0eH8jFXv90wU6Zp4YOf4pZ64meBb49AJ3nxgMMHr1S J7ChzA76pQex7ZMcu6oEKhSCiVvu+vg31+Xz/S6E= 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.10 0934/1848] drm/amdgpu: reset SI ASIC on MacBookPros with VRAM at 0 Date: Wed, 18 Nov 2026 15:49:32 +0100 Message-ID: <20261118145955.875226821@linuxfoundation.org> X-Mailer: git-send-email 2.56.0 In-Reply-To: <20261118145911.150052362@linuxfoundation.org> References: <20261118145911.150052362@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore X-Mailing-List: stable@vger.kernel.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 5.10-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 because the defining header is not included. ] 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 b7e1201d46f97..e34620eefc468 100644 --- a/drivers/gpu/drm/amd/amdgpu/si.c +++ b/drivers/gpu/drm/amd/amdgpu/si.c @@ -1393,6 +1393,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