Commit d1ea77ab authored by Ben Skeggs's avatar Ben Skeggs

drm/nouveau/fb/gf100-: bump size of mmu debug buffers to match big page size

Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
parent d0e9351e
...@@ -46,10 +46,10 @@ gf100_fb_oneinit(struct nvkm_fb *base) ...@@ -46,10 +46,10 @@ gf100_fb_oneinit(struct nvkm_fb *base)
{ {
struct gf100_fb *fb = gf100_fb(base); struct gf100_fb *fb = gf100_fb(base);
struct nvkm_device *device = fb->base.subdev.device; struct nvkm_device *device = fb->base.subdev.device;
int ret, size = 0x1000; int ret, size = 1 << (fb->base.page ? fb->base.page : 17);
size = nvkm_longopt(device->cfgopt, "MmuDebugBufferSize", size); size = nvkm_longopt(device->cfgopt, "MmuDebugBufferSize", size);
size = min(size, 0x1000); size = max(size, 0x1000);
ret = nvkm_memory_new(device, NVKM_MEM_TARGET_INST, size, 0x1000, ret = nvkm_memory_new(device, NVKM_MEM_TARGET_INST, size, 0x1000,
true, &fb->base.mmu_rd); true, &fb->base.mmu_rd);
......
...@@ -48,7 +48,7 @@ gp100_fb_init(struct nvkm_fb *base) ...@@ -48,7 +48,7 @@ gp100_fb_init(struct nvkm_fb *base)
nvkm_wr32(device, 0x100cc8, nvkm_memory_addr(fb->base.mmu_wr) >> 8); nvkm_wr32(device, 0x100cc8, nvkm_memory_addr(fb->base.mmu_wr) >> 8);
nvkm_wr32(device, 0x100ccc, nvkm_memory_addr(fb->base.mmu_rd) >> 8); nvkm_wr32(device, 0x100ccc, nvkm_memory_addr(fb->base.mmu_rd) >> 8);
nvkm_mask(device, 0x100cc4, 0x00060000, nvkm_mask(device, 0x100cc4, 0x00060000,
max(nvkm_memory_size(fb->base.mmu_rd) >> 16, (u64)2) << 17); min(nvkm_memory_size(fb->base.mmu_rd) >> 16, (u64)2) << 17);
} }
static const struct nvkm_fb_func static const struct nvkm_fb_func
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment