diff options
| author | Ben Skeggs <bskeggs@redhat.com> | 2020-01-15 06:34:22 +1000 |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2020-01-15 10:50:30 +1000 |
| commit | edec7149cbfae95c35282c19cda20b7bc53873af (patch) | |
| tree | 252004084b7bc0b79aad6172b16d45dca5c57635 /drivers/gpu/drm/nouveau/nvkm/subdev | |
| parent | 9d350c5e5156792ba7c87b3b1e897656dc2a88e5 (diff) | |
| download | linux-edec7149cbfae95c35282c19cda20b7bc53873af.tar.bz2 | |
drm/nouveau/core: remove previous versioned fw loader
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau/nvkm/subdev')
| -rw-r--r-- | drivers/gpu/drm/nouveau/nvkm/subdev/acr/base.c | 3 | ||||
| -rw-r--r-- | drivers/gpu/drm/nouveau/nvkm/subdev/acr/hsfw.c | 4 |
2 files changed, 3 insertions, 4 deletions
diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/acr/base.c b/drivers/gpu/drm/nouveau/nvkm/subdev/acr/base.c index c154f3b9d536..a713aaa27980 100644 --- a/drivers/gpu/drm/nouveau/nvkm/subdev/acr/base.c +++ b/drivers/gpu/drm/nouveau/nvkm/subdev/acr/base.c @@ -357,8 +357,7 @@ nvkm_acr_ctor_wpr(struct nvkm_acr *acr, int ver) struct nvkm_device *device = subdev->device; int ret; - ret = nvkm_firmware_get_version(subdev, "acr/wpr", ver, ver, - &acr->wpr_fw); + ret = nvkm_firmware_get(subdev, "acr/wpr", ver, &acr->wpr_fw); if (ret < 0) return ret; diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/acr/hsfw.c b/drivers/gpu/drm/nouveau/nvkm/subdev/acr/hsfw.c index 7204bfa3877d..aecce2dac558 100644 --- a/drivers/gpu/drm/nouveau/nvkm/subdev/acr/hsfw.c +++ b/drivers/gpu/drm/nouveau/nvkm/subdev/acr/hsfw.c @@ -58,7 +58,7 @@ nvkm_acr_hsfw_load_image(struct nvkm_acr *acr, const char *name, int ver, u32 loc, sig; int ret; - ret = nvkm_firmware_get_version(subdev, name, ver, ver, &fw); + ret = nvkm_firmware_get(subdev, name, ver, &fw); if (ret < 0) return ret; @@ -136,7 +136,7 @@ nvkm_acr_hsfw_load_bl(struct nvkm_acr *acr, const char *name, int ver, u8 *data; int ret; - ret = nvkm_firmware_get_version(subdev, name, ver, ver, &fw); + ret = nvkm_firmware_get(subdev, name, ver, &fw); if (ret) return ret; |