drm/nouveau/acr: ensure falcon providing acr functions is bootstrappe…

…d first Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
mariux64 · May 22, 2020 · fd44028 · fd44028
1 parent 559c9eb
commit fd44028
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/acr/base.c b/drivers/gpu/drm/nouveau/nvkm/subdev/acr/base.c
@@ -250,6 +250,11 @@ nvkm_acr_oneinit(struct nvkm_subdev *subdev)
 		list_add_tail(&lsf->head, &acr->lsf);
 	}
 
+	/* Ensure the falcon that'll provide ACR functions is booted first. */
+	lsf = nvkm_acr_falcon(device);
+	if (lsf)
+		list_move(&lsf->head, &acr->lsf);
+
 	if (!acr->wpr_fw || acr->wpr_comp)
 		wpr_size = acr->func->wpr_layout(acr);