From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 4AC84C624A4 for ; Mon, 31 Aug 2026 13:47:44 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 65EC710E8C7; Mon, 31 Aug 2026 13:47:43 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=kernel.org header.i=@kernel.org header.b="Tx1meAkC"; dkim-atps=neutral Received: from tor.source.kernel.org (tor.source.kernel.org [172.105.4.254]) by gabe.freedesktop.org (Postfix) with ESMTPS id 7972110E8C7; Mon, 31 Aug 2026 13:47:42 +0000 (UTC) Received: from smtp.kernel.org (quasi.space.kernel.org [100.103.45.18]) by tor.source.kernel.org (Postfix) with ESMTP id F216160120; Mon, 31 Aug 2026 13:47:41 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 74A2C1F00A3D; Mon, 31 Aug 2026 13:47:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1788184061; bh=6LzGMzzETcrwCkz90eapR/18hijxC9zgk6vD6kUQoJQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=Tx1meAkCtbw9xwyndSOEKcO1LPMozo0rFVjcJSdQDb0/tc3pYlY1cLkH4FTVVeWQb JDyjCCCS7XSQI6dcoCA1YuRvigyjPRo3vN4eTSZj4grEhtzsvgX5U9gpREzC+Y3Ney XbH89np8mneGOW7U+1h3NvgBQcffALnej6eN9rcIFLC0E6zAtP6ARfSBiyjtXdPXOC dGIS/7164AG8UdGf9lt+39Ric1VX9mFFo9Ib+0Ed96+rC2Whfw7oJ5PhnJaIChES4/ BULWMT8Kgh7AU8oZwnomH+Whd/fCOyfFGZeJwx2uKkDaK8uhnaPfVhz+cch8b9cCDt PBiUAxLQn3v7w== From: Sasha Levin To: patches@lists.linux.dev, stable@vger.kernel.org Cc: Lijo Lazar , Hawking Zhang , Alex Deucher , Sasha Levin , christian.koenig@amd.com, airlied@gmail.com, simona@ffwll.ch, amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org Subject: [PATCH AUTOSEL 6.18-6.12] drm/amdgpu: Prefer ROM BAR for default VGA device Date: Mon, 31 Aug 2026 09:28:16 -0400 Message-ID: <20260831133314.4125787-468-sashal@kernel.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260831133314.4125787-1-sashal@kernel.org> References: <20260831133314.4125787-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 6.18.48 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" From: Lijo Lazar [ Upstream commit 9e32d17592950478baffaecdbda8e2e60935fd3d ] Fetching from platform ROM doesn't work with hybrid ROM images. For default VGA devices also prefer ROM BAR. Signed-off-by: Lijo Lazar Reviewed-by: Hawking Zhang Signed-off-by: Alex Deucher Signed-off-by: Sasha Levin --- LLM Generated explanations, may be completely bogus: The background `git log -S` search finished, but this stable tree’s shallow history isn’t useful here — it only surfaced baseline import commits (`19eef1d98eeda`, `ac3fd01e4c1ef`), not the real introduction. The function was added upstream in `27145f78f56a` (“drm/amdgpu: Prefer shadow rom when available”, March 2025), and that code is already present in v6.18.43. This patch is a small follow-up for default VGA devices with hybrid ROM images. **Verdict: YES** — backport to this tree. drivers/gpu/drm/amd/amdgpu/amdgpu_bios.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_bios.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_bios.c index 4e60753e16e90..dec312b0f3b0a 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_bios.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_bios.c @@ -33,6 +33,7 @@ #include #include #include +#include /* * BIOS. */ @@ -491,7 +492,8 @@ static bool amdgpu_prefer_rom_resource(struct amdgpu_device *adev) { struct resource *res = &adev->pdev->resource[PCI_ROM_RESOURCE]; - return (res->flags & IORESOURCE_ROM_SHADOW); + return (res->flags & IORESOURCE_ROM_SHADOW) || + adev->pdev == vga_default_device(); } static bool amdgpu_get_bios_dgpu(struct amdgpu_device *adev) -- 2.53.0