drm/nouveau/acr: ensure falcon providing acr functions is bootstrapped first

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>

diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/acr/base.c b/drivers/gpu/drm/nouveau/nvkm/subdev/acr/base.c
index 8eb2a930a9b5e33b857cb4af43f399ff7eaf747f..e4866a02e457eec8a9357a7b1c1b7da705b03b94 100644 (file)
--- 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);