From: Alexandre Courbot Date: Wed, 14 Dec 2016 08:02:52 +0000 (+0900) Subject: drm/nouveau/secboot: clear halt interrupt after ACR is run X-Git-Tag: MMI-PSA29.97-13-9~6111^2~12^2~56 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=63f542e4733a3609488c31961036995aa55d2450;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git drm/nouveau/secboot: clear halt interrupt after ACR is run The halt interrupt must be cleared after ACR is run, otherwise the LS PMU firmware will not be able to run. Signed-off-by: Alexandre Courbot Signed-off-by: Ben Skeggs --- diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/secboot/acr_r352.c b/drivers/gpu/drm/nouveau/nvkm/subdev/secboot/acr_r352.c index 421cf78d2aa5..1aa37ea18580 100644 --- a/drivers/gpu/drm/nouveau/nvkm/subdev/secboot/acr_r352.c +++ b/drivers/gpu/drm/nouveau/nvkm/subdev/secboot/acr_r352.c @@ -774,6 +774,8 @@ acr_r352_bootstrap(struct acr_r352 *acr, struct nvkm_secboot *sb) nvkm_debug(&sb->subdev, "running HS load blob\n"); ret = sb->func->run_blob(sb, acr->load_blob); + /* clear halt interrupt */ + nvkm_falcon_clear_interrupt(sb->boot_falcon, 0x10); if (ret) return ret; nvkm_debug(&sb->subdev, "HS load blob completed\n");