diff options
| author |   Ingo Molnar <mingo@kernel.org> | 2019-06-17 12:06:34 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2019-06-17 12:06:34 +0200 |
| commit | 410df0c5748f6c5a53847d2acb163dc7cd8b6c51 (patch) | |
| tree | 0c0f547f90a73ec6d30851f93720e0eb24f353eb /drivers/gpu/drm/nouveau/nvkm/engine/gr/gf100.c | |
| parent | Documentation/atomic_t.txt: Clarify pure non-rmw usage (diff) | |
| parent | Linux 5.2-rc5 (diff) | |
| download | linux-dev-410df0c5748f6c5a53847d2acb163dc7cd8b6c51.tar.xz linux-dev-410df0c5748f6c5a53847d2acb163dc7cd8b6c51.zip | |
Merge tag 'v5.2-rc5' into locking/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/gpu/drm/nouveau/nvkm/engine/gr/gf100.c')
| -rw-r--r-- | drivers/gpu/drm/nouveau/nvkm/engine/gr/gf100.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/gr/gf100.c b/drivers/gpu/drm/nouveau/nvkm/engine/gr/gf100.c index 81a13cf9a292..c578deb5867a 100644 --- a/drivers/gpu/drm/nouveau/nvkm/engine/gr/gf100.c +++ b/drivers/gpu/drm/nouveau/nvkm/engine/gr/gf100.c @@ -2115,12 +2115,10 @@ int gf100_gr_ctor_fw(struct gf100_gr *gr, const char *fwname, struct gf100_gr_fuc *fuc) { - struct nvkm_subdev *subdev = &gr->base.engine.subdev; - struct nvkm_device *device = subdev->device; const struct firmware *fw; int ret; - ret = nvkm_firmware_get(device, fwname, &fw); + ret = nvkm_firmware_get(&gr->base.engine.subdev, fwname, &fw); if (ret) { ret = gf100_gr_ctor_fw_legacy(gr, fwname, fuc, ret); if (ret) |