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 27FAE42EEB8; Tue, 21 Jul 2026 22:06:57 +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=1784671618; cv=none; b=ttSXLxAUALYPG4Dyn5FrYNOJ4MqOnFpdfTZ+U3pRBww6CiinDKBn77t5NPPHH+X1K4ypUloN4MfoEauLnRe6Epx5CJdNI4/zz2b5ZN2Ih2b85wmkoPnUd1VgKgwOMTdlOleGq+Zu075XiG0se7ukPpEGsJOd8A1CQPttzGZhKJU= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784671618; c=relaxed/simple; bh=RMP2h+E3nafdrPCocLqzLozSUpSf4PO02A2svo51zBQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=G+xVC5cxN2Oe+/gdG2SKTwcnuPWRhT75BgmrNLHq2UYETlSOFQ6YQIVpXGJeVf8BE6FIIWxgNUIErE3TlQ1zcgwFfR63hFLlZCeOf3HKvpbE2UkkR+icDl+6MicbR1UNL+N7Z39NjNjetzH7vf01/whOlo/o9mym/3UrsHnLs4I= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=1u8OJb1Y; 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="1u8OJb1Y" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 8D03D1F000E9; Tue, 21 Jul 2026 22:06:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1784671617; bh=2+ND6WKAVJRnTWm4jyxRd0latSfIbqRTj/hPpVcxc8Q=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=1u8OJb1YyCiMtPefkU19x/qmmcrbDCc7nGcdhonDljkHDO5elf8IB191/qNW8BkcR 28QTnR4bf4fIEJ0dUvpFK0VNS9T3RAypE5LEO+34Igmnmm9c4qpQW/h5FML66gRrLk GsGPPcdtiaoerqB6moU9TkT9RjMdDEhUOrVXPAPg= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Timur Tabi , Lyude Paul , Danilo Krummrich , Sasha Levin Subject: [PATCH 5.15 271/843] drm/nouveau/bios: specify correct display fuse register for Ampere and Ada Date: Tue, 21 Jul 2026 17:18:26 +0200 Message-ID: <20260721152412.120652731@linuxfoundation.org> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260721152405.946368001@linuxfoundation.org> References: <20260721152405.946368001@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-Transfer-Encoding: 8bit 5.15-stable review patch. If anyone has any objections, please let me know. ------------------ From: Timur Tabi [ Upstream commit c1cf2d5db80ce91a85855bbaf4da85ff603e089a ] The NV_FUSE_STATUS_OPT_DISPLAY register is used to determine whether the GPU has display hardware. The current code that normally reads this register is instead hard-coded to check for GA100 vs later GPUs. Since this function is called only on pre-Hopper GPUs, and this if-statement applies only to GA100 and later, the check works because GA100 is the only non-display Ampere and Ada GPU. However, there actually is a register that can be read, so we should use it. Fixes: a34632482f1e ("drm/nouveau/bios/ga10[024]: initial support") Signed-off-by: Timur Tabi Reviewed-by: Lyude Paul Link: https://patch.msgid.link/20260430223838.2530778-8-ttabi@nvidia.com Signed-off-by: Danilo Krummrich Signed-off-by: Sasha Levin --- drivers/gpu/drm/nouveau/nvkm/subdev/bios/shadowramin.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/bios/shadowramin.c b/drivers/gpu/drm/nouveau/nvkm/subdev/bios/shadowramin.c index 023ddc7c5399a4..a295e94e4cb88d 100644 --- a/drivers/gpu/drm/nouveau/nvkm/subdev/bios/shadowramin.c +++ b/drivers/gpu/drm/nouveau/nvkm/subdev/bios/shadowramin.c @@ -65,13 +65,14 @@ pramin_init(struct nvkm_bios *bios, const char *name) /* we can't get the bios image pointer without PDISP */ if (device->card_type >= GA100) - addr = device->chipset == 0x170; /*XXX: find the fuse reg for this */ + addr = nvkm_rd32(device, 0x820c04); else if (device->card_type >= GM100) addr = nvkm_rd32(device, 0x021c04); else if (device->card_type >= NV_C0) addr = nvkm_rd32(device, 0x022500); + if (addr & 0x00000001) { nvkm_debug(subdev, "... display disabled\n"); return ERR_PTR(-ENODEV); -- 2.53.0