drm/nouveau/TBDdevinit: don't fail when PMU/PRE_OS is missing from VBIOS

Ben Skeggs · gregkh · commit 1a255bf1e749 · 2018-10-10T08:54:24.000+02:00
[ Upstream commit 0a6986c ] This Falcon application doesn't appear to be present on some newer systems, so let's not fail init if we can't find it. TBD: is there a way to determine whether it *should* be there? Signed-off-by: Ben Skeggs <bskeggs@redhat.com> Signed-off-by: Sasha Levin <alexander.levin@microsoft.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/devinit/gm200.c b/drivers/gpu/drm/nouveau/nvkm/subdev/devinit/gm200.c
@@ -158,7 +158,8 @@ gm200_devinit_post(struct nvkm_devinit *base, bool post)
 	}
 
 	/* load and execute some other ucode image (bios therm?) */
-	return pmu_load(init, 0x01, post, NULL, NULL);
+	pmu_load(init, 0x01, post, NULL, NULL);
+	return 0;
 }
 
 static const struct nvkm_devinit_func

Original file line number	Diff line number	Diff line change
`@@ -158,7 +158,8 @@ gm200_devinit_post(struct nvkm_devinit *base, bool post)`
`158`	`158`	`}`
`159`	`159`
`160`	`160`	`/* load and execute some other ucode image (bios therm?) */`
`161`		`- return pmu_load(init, 0x01, post, NULL, NULL);`
	`161`	`+ pmu_load(init, 0x01, post, NULL, NULL);`
	`162`	`+ return 0;`
`162`	`163`	`}`
`163`	`164`
`164`	`165`	`static const struct nvkm_devinit_func`