diff options
| author | Ben Skeggs <bskeggs@redhat.com> | 2016-11-21 04:01:33 +0300 |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2016-11-28 08:39:35 +0300 |
| commit | 02099bac651fc040ec9b443ea8cdb1856ae768a8 (patch) | |
| tree | 6a6508b7e3b7233d19facad99101dffce41e0e1a /drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramgp100.c | |
| parent | ff5354120fa1e3c0654f7bda5a8614f37daf387c (diff) | |
| download | linux-02099bac651fc040ec9b443ea8cdb1856ae768a8.tar.xz | |
drm/nouveau/fb/ram/gp100-: fix memory detection where FBP_NUM != FBPA_NUM
In this situation, we'd have ended up detecting less VRAM than we have.
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramgp100.c')
| -rw-r--r-- | drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramgp100.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramgp100.c b/drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramgp100.c index f3be408b5e5e..405faabe8dcd 100644 --- a/drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramgp100.c +++ b/drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramgp100.c @@ -92,13 +92,13 @@ gp100_ram_new(struct nvkm_fb *fb, struct nvkm_ram **pram) enum nvkm_ram_type type = nvkm_fb_bios_memtype(device->bios); const u32 rsvd_head = ( 256 * 1024); /* vga memory */ const u32 rsvd_tail = (1024 * 1024); /* vbios etc */ - u32 fbpa_num = nvkm_rd32(device, 0x022438), fbpa; + u32 fbpa_num = nvkm_rd32(device, 0x02243c), fbpa; u32 fbio_opt = nvkm_rd32(device, 0x021c14); u64 part, size = 0, comm = ~0ULL; bool mixed = false; int ret; - nvkm_debug(subdev, "022438: %08x\n", fbpa_num); + nvkm_debug(subdev, "02243c: %08x\n", fbpa_num); nvkm_debug(subdev, "021c14: %08x\n", fbio_opt); for (fbpa = 0; fbpa < fbpa_num; fbpa++) { if (!(fbio_opt & (1 << fbpa))) { |