diff options
| author | Ben Skeggs <bskeggs@redhat.com> | 2020-01-15 06:34:21 +1000 |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2020-01-15 10:50:26 +1000 |
| commit | a2bfb50e72aeb139801109e3b4eb73ac53bde314 (patch) | |
| tree | e13059109a24faf3f2ddcb185c12329e3717ee89 /drivers/gpu/drm/nouveau/nvkm/engine/gr/gm200.c | |
| parent | 6f0add0ad6e965e8ae1382b43501e67b30988d26 (diff) | |
| download | linux-a2bfb50e72aeb139801109e3b4eb73ac53bde314.tar.bz2 | |
drm/nouveau/gr/gk20a,gm200-: use nvkm_firmware_load_blob for sw init
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau/nvkm/engine/gr/gm200.c')
| -rw-r--r-- | drivers/gpu/drm/nouveau/nvkm/engine/gr/gm200.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/gr/gm200.c b/drivers/gpu/drm/nouveau/nvkm/engine/gr/gm200.c index eff30662b984..775ada042b3e 100644 --- a/drivers/gpu/drm/nouveau/nvkm/engine/gr/gm200.c +++ b/drivers/gpu/drm/nouveau/nvkm/engine/gr/gm200.c @@ -153,11 +153,9 @@ gm200_gr_new_(const struct gf100_gr_func *func, struct nvkm_device *device, return ret; } - if ((ret = gk20a_gr_av_to_init(gr, "gr/sw_nonctx", &gr->fuc_sw_nonctx)) || - (ret = gk20a_gr_aiv_to_init(gr, "gr/sw_ctx", &gr->fuc_sw_ctx)) || - (ret = gk20a_gr_av_to_init(gr, "gr/sw_bundle_init", &gr->fuc_bundle)) || - (ret = gk20a_gr_av_to_method(gr, "gr/sw_method_init", &gr->fuc_method))) - return ret; + ret = gk20a_gr_load_sw(gr, "gr/", 0); + if (ret) + return -ENODEV; return 0; } |