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=1794591233; b=dHmNdHdG1h8/N1sX6CwAqjax6Yz4i7l4FnnC/61WmGlUuZqjoFY+9LiZUVGIp/wqa0vN J8+AoTXL7pw25DoCi9zRub8rEuYEq3IwNjhuxymZ99NIS0RkeB3J2wY01sg8SxDU9DzRu cggpRmL52gXEs0skeMwmyQXUk6DCh+PALocrbi9nlDiLWrF8S583FgShT5toWHa3bjl+H YQEZE5opDyOQ0llVt4WRu9CR0cLmJVa5xyVTHpOzSVZOIGOe8BhlOpX+jUEssA0CirEnT Y7HkM+bXviQzg7J5/7aY0oNfGVWdQg5hLGk131SkfzrnsbRjr3VrI0ORJ4ECCElHYCg== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1794591233; 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=KacQJcT3S5IxCTL2XdGm8iwoTOikesBnLzamG1LXv4A=; b=HdafBNVSTVf6OD/XddyB1x/kwK9a9CZzz1DKQ43qIGq2a87ldKR/icfdxQoCavKnN1ss ZnryZFFFsQysU16olcTozKI7yiu+mhTxtf9Px0wmGiIclTOWuvHqBr4qqdVFSzdIT3+WW 4RxCMJPOBqbJo66FuIIbUYMY0hiHSBW//3xJrbHanD5Ya03sixNgiXCsNKzknQLnMJabk X3rwdCy2f62T4an6OpR4aa9ZpWBDns3dNk3p8tp1HW/53gMKUjDg3VhphQknYLygjGXdy R3N+nh4tRxGn1CsPgEjseFVtzdDyk6hhGQNYLFONoL8MXWX1J4YaoazO9825+0SB1OQ== 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=HtZsGTWb; 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 6AB786075E37; Fri, 13 Nov 2026 17:33:53 +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=HtZsGTWb Received: by smtp.kernel.org (Postfix) with ESMTPSA id 16C561F000C5; Fri, 13 Nov 2026 17:33:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1794591233; bh=KacQJcT3S5IxCTL2XdGm8iwoTOikesBnLzamG1LXv4A=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=HtZsGTWbp++tn7XuLktDss1RyVG1fXAapuKKWQufPl25PgPt3O6xUh5L6HOSNyKxE mRLLkwY0eaTHBa4ivcaAkTHT0IPJ95Cky+xDD6bChAeI0SFvoroNsZUGtCsC/XEbIE FEeOYJ6lb93x1YS4/ZqjgOsQroZoT66Cj69OtQjw= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Ilia Mirkin , Dave Airlie , Sasha Levin Subject: [PATCH 6.12 362/670] drm/nouveau/devinit/gf100-: try to avoid double-running vbios scripts Date: Fri, 13 Nov 2026 10:48:46 -0500 Message-ID: <20261113153824.075998350@linuxfoundation.org> X-Mailer: git-send-email 2.56.0 In-Reply-To: <20261113153811.177190860@linuxfoundation.org> References: <20261113153811.177190860@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore X-Mailing-List: patches@lists.linux.dev List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.12-stable review patch. If anyone has any objections, please let me know. ------------------ From: Ilia Mirkin [ Upstream commit 2139cb633d48ebbbaec88d2e5a8ebe8e774df4fb ] Turns out some VBIOSes don't actually set the bit in question in 2240c. Use the nv50-style detection to try avoiding running the vbios twice. Fixes: a6a0f67ca7aa ("drm/nouveau/devinit/gf100-: detect if BIOS invoked devinit") Link: https://bugs.freedesktop.org/show_bug.cgi?id=97620 Cc: # v4.6+ Signed-off-by: Ilia Mirkin Reviewed-by: Dave Airlie Signed-off-by: Dave Airlie Link: https://patch.msgid.link/20170128205347.17453-1-imirkin@alum.mit.edu Signed-off-by: Sasha Levin --- .../drm/nouveau/nvkm/subdev/devinit/gf100.c | 20 +++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/devinit/gf100.c b/drivers/gpu/drm/nouveau/nvkm/subdev/devinit/gf100.c index 5368e705e7fd6..186e09ea0cb10 100644 --- a/drivers/gpu/drm/nouveau/nvkm/subdev/devinit/gf100.c +++ b/drivers/gpu/drm/nouveau/nvkm/subdev/devinit/gf100.c @@ -27,6 +27,7 @@ #include #include #include +#include int gf100_devinit_pll_set(struct nvkm_devinit *init, u32 type, u32 freq) @@ -99,6 +100,25 @@ gf100_devinit_preinit(struct nvkm_devinit *base) * can use it as a reliable way to know whether we should run devinit. */ base->post = ((nvkm_rd32(device, 0x2240c) & BIT(1)) == 0); + + /* + * However some VBIOS init sequences miss this bit. So fall back to + * the nv50 method of checking if the bit is not set. Running the + * VBIOS multiple times may have detrimental effects. + */ + if (base->post) { + u64 disable = nvkm_devinit_disable(base); + /* magic to detect whether or not x86 vbios code has + * executed the devinit scripts to initialise the + * board. only works if there's a display engine. + */ + if (!(disable & (1ULL << NVKM_ENGINE_DISP))) { + if (nvkm_rdvgac(device, 0, 0x00) || + nvkm_rdvgac(device, 0, 0x1a)) { + base->post = false; + } + } + } } static const struct nvkm_devinit_func -- 2.53.0