diff options
| author |   Ben Skeggs <bskeggs@redhat.com> | 2017-11-01 03:56:19 +1000 |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2017-11-02 13:32:17 +1000 |
| commit | 269fe32d3343b7b9e48ba533887f58eb877581c8 (patch) | |
| tree | 5168ff0d679ecf6a74944f8c72fbcdf7f0303f0a /drivers/gpu/drm/nouveau/nvkm/subdev/bar/nv50.h | |
| parent | drm/nouveau/bar: remove NV_PMC_ENABLE_PFIFO twiddling (diff) | |
| download | linux-dev-269fe32d3343b7b9e48ba533887f58eb877581c8.tar.xz linux-dev-269fe32d3343b7b9e48ba533887f58eb877581c8.zip | |
drm/nouveau/bar: swap oneinit/init ordering, and rename bar3 to bar2
NVIDIA call it BAR2, Linux APIs treat it as BAR3 due to BAR1 being a
64-bit BAR, which I presume take two slots or something.
No actual code changes here, just to make future commits less messy.
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau/nvkm/subdev/bar/nv50.h')
| -rw-r--r-- | drivers/gpu/drm/nouveau/nvkm/subdev/bar/nv50.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/bar/nv50.h b/drivers/gpu/drm/nouveau/nvkm/subdev/bar/nv50.h index da5e6be573c9..6ff3fdb4b4bd 100644 --- a/drivers/gpu/drm/nouveau/nvkm/subdev/bar/nv50.h +++ b/drivers/gpu/drm/nouveau/nvkm/subdev/bar/nv50.h @@ -11,8 +11,8 @@ struct nv50_bar { struct nvkm_gpuobj *pgd; struct nvkm_vm *bar1_vm; struct nvkm_gpuobj *bar1; - struct nvkm_vm *bar3_vm; - struct nvkm_gpuobj *bar3; + struct nvkm_vm *bar2_vm; + struct nvkm_gpuobj *bar2; }; int nv50_bar_new_(const struct nvkm_bar_func *, struct nvkm_device *, |