From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (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 C5D684AB3B5 for ; Mon, 5 Oct 2026 14:34:25 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1791210879; cv=none; b=p/FA1u6c+rygw8aG24VgzxnZvacqxpMPegtQQqKGbpw96LTMxD7NEp3wRgWHxf8SL3inpfulS31dMOe0u7p+NV3gVaQ4NdHrz+HHJ06vn0Cfpr0h8xL7fh5QGtWJiPpkwMpbh20+xZdFgVmZoagvdASh655pqvL264zmJy6dVak= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1791210879; c=relaxed/simple; bh=gx0EN9wIlwix+MHr+EpwRdPdUGQSFv+eWLvHaLuUMos=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=IfcngW1ocejxRbEWRj1D/1Tr5KEKjAKa29izHoZPx/NRCHHE6I+692lrlnO9IeJ+h7K6cZFgZn7N4WRp7cftIRUOEFPEDh54uuP3p8XNPSo9hAz4PhSpXYR6GkA0BM1WoPFkb+O8yGJ3cgfkTA4V/XnA5NQnkUfH4fdzpz939Zo= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=KcjHoHwX; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="KcjHoHwX" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 735121F00899; Mon, 5 Oct 2026 14:34:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1791210863; bh=1DIMPU8DIAHQmpXAbf1bSutiT6LpGUAsQLlpLWAxXS0=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=KcjHoHwXD8/KynpMbSmbhuU6eOowkAD7AFkBphF2JixEDUHGxcKYs98iZ4wIMKK5Z HX6DGuHFJJ+YdfGEfj15SY9R3Rj1Wfnc7XOTsUwzS24tEJ/qmLWYqETz/xoCmry8h5 eBF6A8khtz8JU2UTc4r/KuGQ8hmq5z9SsVDtdhD5RxJ5HyMuXB46bSoOr9CsjewjgV FuLta70CS31rNzc37tkzL+VpfxMnZLs4FOYjpBv3V78Az9fZDqTftLwSHNiAMEnrGO 2pv3t7ZlK/xePvmVO60T9CuV/YZllj6ttUgxZBnK2TxO0UrIh9O2z1kjgQXHKgPG+t U+K8W47Wwt0gg== From: Sasha Levin To: stable@vger.kernel.org Cc: =?UTF-8?q?Francisco=20Beltr=C3=A1n=20Millal=C3=A9n?= , =?UTF-8?q?Christian=20K=C3=B6nig?= , Alex Deucher , Sasha Levin Subject: [PATCH 5.15.y 2/2] drm/amdgpu: reset VI ASIC on MacBookPro14,3 Date: Mon, 5 Oct 2026 10:34:18 -0400 Message-ID: <20261005143404.3017125-2-sashal@kernel.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20261005143404.3017125-1-sashal@kernel.org> References: <2026100530-delay-deceiving-2b8e@gregkh> <20261005143404.3017125-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit From: Francisco Beltrán Millalén [ Upstream commit a22e5e4f2ebbdbb962cc3233094d189c4dfaa051 ] On a MacBookPro14,3 with a Radeon Pro 555 (Polaris11), the framebuffer is at MC address 0 when amdgpu loads after a cold boot, as the firmware leaves it (MC_VM_FB_LOCATION = 0x007f0000), while the VBIOS ASIC_Init table places it at 0xF4_0000_0000 (0xf47ff400). amdgpu reads the location once, at init, so after a re-POST (S3 resume or GPU reset) the framebuffer has moved and the driver keeps programming the old one: the SMU is handed a table that was never written and the GPU does not come back, which leaves the internal panel black. Resetting the ASIC on load makes ASIC_Init run before the driver reads the location, so the driver uses the VBIOS placement from the start and every later re-POST puts the framebuffer back where it already is. Add the Radeon Pro 555 used in this machine to the existing VI reset quirk table. Tested on a MacBookPro14,3 on 6.18.49 with the quirk table backported (the kernel also carries unrelated local PCI and ACPI patches for this machine). The framebuffer is at 0x000000F400000000 after both cold and warm boot, and the GPU survived 9 S3 cycles (lid close and rtcwake, one of them with the lid closed for about 7.5 minutes and a USB-C disk attached), each followed by a few minutes of 3D load; no ring timeouts or VM faults were reported. The reset adds about 0.23 s to amdgpu init. Suggested-by: Christian König Suggested-by: Alex Deucher Link: https://lore.kernel.org/all/20260924132952.25054-1-fbeltranmillalen@gmail.com/ Assisted-by: Claude:claude-opus-5-5 Signed-off-by: Francisco Beltrán Millalén Signed-off-by: Alex Deucher (cherry picked from commit b6b1d97218518003107d4446fac278fa3e0a19a0) Cc: stable@vger.kernel.org Signed-off-by: Sasha Levin --- drivers/gpu/drm/amd/amdgpu/vi.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/gpu/drm/amd/amdgpu/vi.c b/drivers/gpu/drm/amd/amdgpu/vi.c index c394be0ac5fa7..ef26e8973829a 100644 --- a/drivers/gpu/drm/amd/amdgpu/vi.c +++ b/drivers/gpu/drm/amd/amdgpu/vi.c @@ -1442,6 +1442,7 @@ struct vi_reset_quirk { static const struct vi_reset_quirk vi_reset_quirks[] = { { 0x67ef, PCI_VENDOR_ID_APPLE, 0x0190, 0xe3 }, /* Radeon Pro 555X */ { 0x67ef, PCI_VENDOR_ID_APPLE, 0x018f, 0xc2 }, /* Radeon Pro 560X */ + { 0x67ef, PCI_VENDOR_ID_APPLE, 0x017a, 0xc7 }, /* Radeon Pro 555 */ }; static bool vi_need_reset_on_init(struct amdgpu_device *adev) -- 2.53.0