diff options
| author | Alexandre Courbot <acourbot@nvidia.com> | 2016-02-24 14:42:16 +0900 |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2016-03-14 10:13:20 +1000 |
| commit | 18cd5bc8ea587dc2fc0c07d2a4bf3cfe9ed2ef53 (patch) | |
| tree | bb8bbcd8cc00c0ce4440fdee85a91bdbaa3c6fc6 /drivers/gpu/drm/nouveau/nvkm/engine/gr/gk20a.c | |
| parent | 336c46524fcd822aaef3ede92b56bb4367b4538f (diff) | |
| download | linux-18cd5bc8ea587dc2fc0c07d2a4bf3cfe9ed2ef53.tar.bz2 | |
drm/nouveau/gr/gf100: load firmware in outer function
The firmwares required by GR may vary from chip to chip, especially with
the introduction of secure boot and NVIDIA-provided firmwares. Move the
firmware loading outside of gf100_gr_ctor so other chips may still call
it while managing their firmwares themselves.
Signed-off-by: Alexandre Courbot <acourbot@nvidia.com>
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau/nvkm/engine/gr/gk20a.c')
| -rw-r--r-- | drivers/gpu/drm/nouveau/nvkm/engine/gr/gk20a.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/gr/gk20a.c b/drivers/gpu/drm/nouveau/nvkm/engine/gr/gk20a.c index a321dd019932..a55331d68ff6 100644 --- a/drivers/gpu/drm/nouveau/nvkm/engine/gr/gk20a.c +++ b/drivers/gpu/drm/nouveau/nvkm/engine/gr/gk20a.c @@ -283,6 +283,12 @@ gk20a_gr_new_(const struct gf100_gr_func *func, struct nvkm_device *device, if (ret) return ret; + if (gf100_gr_ctor_fw(gr, "fecs_inst", &gr->fuc409c) || + gf100_gr_ctor_fw(gr, "fecs_data", &gr->fuc409d) || + gf100_gr_ctor_fw(gr, "gpccs_inst", &gr->fuc41ac) || + gf100_gr_ctor_fw(gr, "gpccs_data", &gr->fuc41ad)) + return -ENODEV; + ret = gf100_gr_ctor_fw(gr, "sw_nonctx", &fuc); if (ret) return ret; |