diff options
| author | Ben Skeggs <bskeggs@redhat.com> | 2017-11-01 03:56:20 +1000 |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2017-11-02 13:32:34 +1000 |
| commit | 46bda4f4af5d061ce07148e833ff4deb50737536 (patch) | |
| tree | 9ef67d24ff8e9b5242eb545237e9dddcd3463a7c | |
| parent | 632b740c5481988152a3a60319aaa49c99577b77 (diff) | |
| download | op-kernel-dev-46bda4f4af5d061ce07148e833ff4deb50737536.zip op-kernel-dev-46bda4f4af5d061ce07148e833ff4deb50737536.tar.gz | |
drm/nouveau/gr/gf100-: don't prevent module load if firmware missing
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
| -rw-r--r-- | drivers/gpu/drm/nouveau/nvkm/engine/gr/gf100.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/gr/gf100.c b/drivers/gpu/drm/nouveau/nvkm/engine/gr/gf100.c index 4b3d543..2f8dc10 100644 --- a/drivers/gpu/drm/nouveau/nvkm/engine/gr/gf100.c +++ b/drivers/gpu/drm/nouveau/nvkm/engine/gr/gf100.c @@ -1861,8 +1861,12 @@ gf100_gr_ctor_fw(struct gf100_gr *gr, const char *fwname, int ret; ret = nvkm_firmware_get(device, fwname, &fw); - if (ret) - return gf100_gr_ctor_fw_legacy(gr, fwname, fuc, ret); + if (ret) { + ret = gf100_gr_ctor_fw_legacy(gr, fwname, fuc, ret); + if (ret) + return -ENODEV; + return 0; + } fuc->size = fw->size; fuc->data = kmemdup(fw->data, fuc->size, GFP_KERNEL); |
