diff options
| author | Ben Skeggs <bskeggs@redhat.com> | 2016-04-14 00:39:18 (GMT) |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2016-05-20 04:43:04 (GMT) |
| commit | 99c5917253a6c5584a7052f9ee578e2c6852253f (patch) | |
| tree | 3a474ce77932a871f4d2ca52a195066571fe3116 /drivers/gpu/drm/nouveau/nvkm/engine/gr/gk20a.c | |
| parent | 917d95a86e7b7036d481323240443566be82a619 (diff) | |
| download | linux-99c5917253a6c5584a7052f9ee578e2c6852253f.tar.xz | |
drm/nouveau/fb/gf100-: allocate mmu debug buffers
Later chipsets require setting this up both in FB and GR, so let's just
move the allocation to FB.
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau/nvkm/engine/gr/gk20a.c')
| -rw-r--r-- | drivers/gpu/drm/nouveau/nvkm/engine/gr/gk20a.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/gr/gk20a.c b/drivers/gpu/drm/nouveau/nvkm/engine/gr/gk20a.c index d28feb4..a405093 100644 --- a/drivers/gpu/drm/nouveau/nvkm/engine/gr/gk20a.c +++ b/drivers/gpu/drm/nouveau/nvkm/engine/gr/gk20a.c @@ -22,6 +22,7 @@ #include "gf100.h" #include "ctxgf100.h" +#include <subdev/fb.h> #include <subdev/timer.h> #include <nvif/class.h> @@ -219,6 +220,7 @@ int gk20a_gr_init(struct gf100_gr *gr) { struct nvkm_device *device = gr->base.engine.subdev.device; + struct nvkm_fb *fb = device->fb; const u32 magicgpc918 = DIV_ROUND_UP(0x00800000, gr->tpc_total); u32 data[TPC_MAX / 8] = {}; u8 tpcnr[GPC_MAX]; @@ -239,8 +241,8 @@ gk20a_gr_init(struct gf100_gr *gr) return ret; /* MMU debug buffer */ - nvkm_wr32(device, 0x100cc8, nvkm_memory_addr(gr->unk4188b4) >> 8); - nvkm_wr32(device, 0x100ccc, nvkm_memory_addr(gr->unk4188b8) >> 8); + nvkm_wr32(device, 0x100cc8, nvkm_memory_addr(fb->mmu_wr) >> 8); + nvkm_wr32(device, 0x100ccc, nvkm_memory_addr(fb->mmu_rd) >> 8); if (gr->func->init_gpc_mmu) gr->func->init_gpc_mmu(gr); |