UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

drm/nouveau/fb/gk20a,gm20b: setup mmu debug buffer registers at init() 

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
This commit is contained in:
Ben Skeggs 2016-04-14 10:50:55 +10:00
parent 99c5917253
commit 834b21f5e9
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/gpu/drm/nouveau/nvkm/engine/gr/gk20a.c
View File

@ -22,7 +22,6 @@
#include "gf100.h" #include "gf100.h"
#include "ctxgf100.h" #include "ctxgf100.h"
#include <subdev/fb.h>
#include <subdev/timer.h> #include <subdev/timer.h>
#include <nvif/class.h> #include <nvif/class.h>
@ -220,7 +219,6 @@ int
gk20a_gr_init(struct gf100_gr *gr) gk20a_gr_init(struct gf100_gr *gr)
{ {
struct nvkm_device *device = gr->base.engine.subdev.device; 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); const u32 magicgpc918 = DIV_ROUND_UP(0x00800000, gr->tpc_total);
u32 data[TPC_MAX / 8] = {}; u32 data[TPC_MAX / 8] = {};
u8 tpcnr[GPC_MAX]; u8 tpcnr[GPC_MAX];
@ -241,9 +239,6 @@ gk20a_gr_init(struct gf100_gr *gr)
return ret; return ret;
/* MMU debug buffer */ /* MMU debug buffer */
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) if (gr->func->init_gpc_mmu)
gr->func->init_gpc_mmu(gr); gr->func->init_gpc_mmu(gr);

4
drivers/gpu/drm/nouveau/nvkm/subdev/fb/gk20a.c
View File

@ -21,11 +21,15 @@
*/ */
#include "priv.h" #include "priv.h"
#include <core/memory.h>
static void static void
gk20a_fb_init(struct nvkm_fb *fb) gk20a_fb_init(struct nvkm_fb *fb)
{ {
struct nvkm_device *device = fb->subdev.device; struct nvkm_device *device = fb->subdev.device;
nvkm_mask(device, 0x100c80, 0x00000001, 0x00000000); /* 128KiB lpg */ nvkm_mask(device, 0x100c80, 0x00000001, 0x00000000); /* 128KiB lpg */
nvkm_wr32(device, 0x100cc8, nvkm_memory_addr(fb->mmu_wr) >> 8);
nvkm_wr32(device, 0x100ccc, nvkm_memory_addr(fb->mmu_rd) >> 8);
} }
static const struct nvkm_fb_func static const struct nvkm_fb_func