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 51F8C4E4302; Tue, 13 Oct 2026 12:05:27 +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=1791893128; cv=none; b=VgtHDek1qVWMp39Gv7T4Rwvv5hFK+VwiLRIiJrXrSJMH8gfgD+hiLsvsZNKUnH8fr1SV9UaajTXEDf/9R4LzxRMvxj+Wn8jXu9H81PL7W750ltjn66su8Yv2K8vvWiOzCTwxJOUB4MzTM7ler1brc1NwVCTgZ0DuH0yvn/jxB3k= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1791893128; c=relaxed/simple; bh=XRjzp7uMBop7MO8J+gticgeatrxazZVjAvZS8SjUlJI=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=VyXV4OLjJCUnwFf1puaCfTSSh/w8PrNDV2j6K1RGLNDie7IJtxGzWnQ19NETcJWayD/prvLo2245m6Zb3cUzeFJGFkaeeIW7BmI9n2vfX5aMCFPw5AQF6o/bwypwrnXwHDijbD1e8YbaBRv+NRNJzHXesXHyhJ1QHj85HSaXQr4= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=yoDPOBEV; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="yoDPOBEV" Received: by smtp.kernel.org (Postfix) with ESMTPSA id A1D0E1F000FF; Tue, 13 Oct 2026 12:05:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1791893127; bh=qluWmbMw5X77PiL7OmMdFPag6E/7hkjCnDbwXAZRP+0=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=yoDPOBEV50z3gzA1LZWwivlLs9ZZ8QsLC7LKXsj56FtF8dFwJhP4gf3keklVCW5ln pxUexK1hAzDcWKQ1wOBErJvC+Rzur33aHYUN2opDo9HpJFG7cmfjUghRl6t6nHtDYY YwmFNS3B8LeqAAjpj0OcwAiGDL84bYw48zCyVzPY= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, =?UTF-8?q?Ayhan=20=C3=87i=C3=A7ek?= , Alex Deucher Subject: [PATCH 6.18 123/621] drm/amdgpu: make Mac FB workaround generic Date: Tue, 13 Oct 2026 13:31:58 +0200 Message-ID: <20261013112923.777168362@linuxfoundation.org> X-Mailer: git-send-email 2.56.0 In-Reply-To: <20261013112920.855194808@linuxfoundation.org> References: <20261013112920.855194808@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 6.18-stable review patch. If anyone has any objections, please let me know. ------------------ From: Alex Deucher commit c7f44ec5c4ec760e74351f1843dcb8322f67cbf6 upstream. Rather than adding a case of every chip where this is seen just check if the FB is at 0 and the ssid is apple. This should cover all chips which fall into this case. Tested-by: Ayhan Çiçek Signed-off-by: Alex Deucher (cherry picked from commit c54e4d10507722398dc90cf3c532e50b86cf425a) Cc: stable@vger.kernel.org Signed-off-by: Greg Kroah-Hartman --- drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c @@ -1022,20 +1022,17 @@ void amdgpu_gmc_get_vbios_allocations(st 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; } + /* 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->pdev->subsystem_vendor == PCI_VENDOR_ID_APPLE) && + (adev->gmc.vram_start == 0)) + adev->mman.keep_stolen_vga_memory = true; if (amdgpu_sriov_vf(adev) || !amdgpu_device_has_display_hardware(adev)) {