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=1794590471; b=Z3i5Ut6+HwGeTHChTgbSLzpal1D6iY3oxQe6/y03C1bGRYU/1MHY8decqIGgJLmJ3wBA 95XzG8dRx7qliR9ggq37mYpJrkSIUzKQasW8b3lbRHgo92XZP6CxrbTtuRrsWkftiVVgG LlX/+3OXYxSQHhfDthk1bwdibbBUbfo1TTISwRjaOAsNUuJyZXru/J3Z48g1G0stfCOr3 JrK+I4xo3CUyO0iazl8C5hdgbsa6F6Ol/Vr3fu30xeh468ERxNd64IzF9FkPIJ+urDggT pUTIK+jeL73oFSY4PcDAPxiYQaJs9Op00BaZfqeXhsqgrYlbmEYnqVK8GPOQGEeGKdg== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1794590471; 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=aT4cd6CIhXE+eKqb8KBinBFXjHlYWwMlHssxCgTlNAI=; b=1f7r6j3TlRaSCXvGR8MHq99Ovs4iXze9qsc5LC5j42IOf8IZNZMDWjvblns8n/TRblzd 4vBFGlfo3ym0mRGgQZIMsVH2PGwQKAeZKrHKfHPsURFGvkBfkrbU6oniqqrbZZJ65BJDi +GL07SgC4jncdgHaYq/dLMUrBdjVBpnDM6FxAyi1SHAkT5K+T6BB6Ig/J3ODf9y8IdEw4 U7MZl9/bI8IWVaHCd9P2NZf1LzTkK/bmqyLRBAS59r6JT0u51VrrCqlu3rPgtp7gKhFMn lQVJBie+FyjRobEAgMDiecroVajFAH5+Q42aZK+SHbp9eMdjsV8B2eQND6Gq0cQiHrw== 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="h1l62J6/"; 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 A4791606B80A; Fri, 13 Nov 2026 17:21:11 +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=h1l62J6/ Received: by smtp.kernel.org (Postfix) with ESMTPSA id 4F3851F000C6; Fri, 13 Nov 2026 17:21:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1794590471; bh=aT4cd6CIhXE+eKqb8KBinBFXjHlYWwMlHssxCgTlNAI=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=h1l62J6/8Jo7H0VgLxxVa9ECSbbHxiIYMelbGjVY4J0RRFbOlmSks/QmkI7g5QAJC nxDu+k/05dxBKMEo0nuyM9I905O/ZS8DJWzh6B45vcbIWpjjr43GTJD05T25wYcW8q b6InFY1ixc+8/jJ/K2VfY3rPlHQqbhs6Q/eCCjzM= 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.18 426/686] drm/nouveau/devinit/gf100-: try to avoid double-running vbios scripts Date: Fri, 13 Nov 2026 10:49:19 -0500 Message-ID: <20261113153835.372076643@linuxfoundation.org> X-Mailer: git-send-email 2.56.0 In-Reply-To: <20261113153820.902362109@linuxfoundation.org> References: <20261113153820.902362109@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.18-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