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 686222F6927 for ; Sun, 1 Mar 2026 01:48:20 +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=1772329700; cv=none; b=dZUS2yc1qNnULXrBVOcjHL8eegpPwyoprSUy8Y45S+GIfU41wHV1unLL0ywB6Txehr07mIBAf5UdEZeYsdmtymbk7lBlIR6OA8hoU8G5WoQOlV7nThGDpW6PTMpiRQG9ObvJe6XJ/U5sfHsc1Brsrk0n0RLvSGx+ej+ERDbt1S8= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772329700; c=relaxed/simple; bh=Tt9A2DCdRoz5g8SNwsomykJ/pIG2kigN6Ljp45b7qs0=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=KMXxuDoBwOubSvlTiwK3j2anpxmLnfcMTY1pObrDhsNpUueHgSLdWZd1yvLomT7X/zp8LRGfEty1dzeiADOGcwzd3pS5YaD9Yi3FlL1LcS8rqMo7ZTqoz38FX66H/1GZxwuro/J3PoWejn7QoPgOY3IHO5jBtp90Oinau6mPgts= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=UJ/oEJVA; 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="UJ/oEJVA" Received: by smtp.kernel.org (Postfix) with ESMTPSA id AE62EC2BCB0; Sun, 1 Mar 2026 01:48:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1772329700; bh=Tt9A2DCdRoz5g8SNwsomykJ/pIG2kigN6Ljp45b7qs0=; h=From:To:Cc:Subject:Date:From; b=UJ/oEJVAiY+m9T9Qd+gY2rudMqgovp0FzxLNU9bCH7Vc4V6ULLbZUlWJhKB47I3Eb vy3vV7CBW8t8YfGUEZg6qlQ6EmRp64NK0mRpyitPhcjRfLttjxGb6F7hTBCeiwA3r7 5iIOAv1IdOCVMnmuegIy9bY4VUG/hDDpKkycAA2gagHfdHnZmgwDiMbThlWsSU+oMm uU9qSYi7fYDI5oN+LZ4KP4DMnkLoyx4yzMJqne8QHRI88plKYN9q/ld7Ev7z+28YNo yEsFJLlirRbi9yPPMPx436oOWJw7N5VziPiRUNrVOgkwhRdEAXVF959ZxMWUp/FTOb qvVCnAz0h55ZA== From: Sasha Levin To: stable@vger.kernel.org, alexander.deucher@amd.com Cc: Mario Kleiner , amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org Subject: FAILED: Patch "drm/amdgpu: keep vga memory on MacBooks with switchable graphics" failed to apply to 6.1-stable tree Date: Sat, 28 Feb 2026 20:48:18 -0500 Message-ID: <20260301014818.1712465-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-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 096bb75e13cc508d3915b7604e356bcb12b17766 Mon Sep 17 00:00:00 2001 From: Alex Deucher Date: Mon, 16 Feb 2026 10:02:32 -0500 Subject: [PATCH] drm/amdgpu: keep vga memory on MacBooks with switchable graphics On Intel MacBookPros with switchable graphics, when the iGPU is enabled, the address of VRAM gets put at 0 in the dGPU's virtual address space. This is non-standard and seems to cause issues with the cursor if it ends up at 0. We have the framework to reserve memory at 0 in the address space, so enable it here if the vram start address is 0. Reviewed-and-tested-by: Mario Kleiner Closes: https://gitlab.freedesktop.org/drm/amd/-/issues/4302 Cc: stable@vger.kernel.org Cc: Mario Kleiner Signed-off-by: Alex Deucher --- drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c index d35d9719d5668..6a6b334428f6d 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c @@ -1068,6 +1068,16 @@ void amdgpu_gmc_get_vbios_allocations(struct amdgpu_device *adev) case CHIP_RENOIR: adev->mman.keep_stolen_vga_memory = true; break; + case CHIP_POLARIS10: + case CHIP_POLARIS11: + case CHIP_POLARIS12: + /* MacBookPros with switchable graphics put VRAM at 0 when + * the iGPU is enabled which results in cursor issues if + * the cursor ends up at 0. Reserve vram at 0 in that case. + */ + if (adev->gmc.vram_start == 0) + adev->mman.keep_stolen_vga_memory = true; + break; default: adev->mman.keep_stolen_vga_memory = false; break; -- 2.51.0