drm/nouveau/devinit/gf100-: try to avoid double-running vbios scripts
Subsystems (3)
PATCH v2 1/1 drm/nouveau/devinit/gf100-: try to avoid double-running vbios scripts
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")
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=97620
Cc <[email protected]> # v4.6+
Signed-off-by Ilia Mirkin <[email protected]>
---
v1 -> v2: add vga.h include (had it sitting in my local tree but forgot to amend the commit with it)
drivers/gpu/drm/nouveau/nvkm/subdev/devinit/gf100.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+)
drivers/gpu/drm/nouveau/nvkm/subdev/devinit/gf100.c +20 -0
@@ -27,6 +27,7 @@#include <subdev/bios/init.h> #include <subdev/bios/pll.h> #include <subdev/clk/pll.h> +#include <subdev/vga.h> int gf100_devinit_pll_set (struct nvkm_devinit *init,u32 type,u32 freq)
@@ -102,6 +103,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
Signature · 6 lines
2.10.2 _______________________________________________ Nouveau mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/nouveau