diff options
| author | Ben Skeggs <bskeggs@redhat.com> | 2016-04-14 14:28:03 +1000 |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2016-05-20 14:42:26 +1000 |
| commit | a84fc73ba64315b8778366e34bbf22ebe6ab9632 (patch) | |
| tree | 7532c04b8a7a0189b249d68b0911e124c4e94c9c | |
| parent | 6441c9068e62f31e038a09e89bba53480efb02e0 (diff) | |
| download | nouveau-a84fc73ba64315b8778366e34bbf22ebe6ab9632.tar.gz | |
gr/gm200-: rop count == ltc count
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
| -rw-r--r-- | drm/nouveau/nvkm/engine/gr/gf100.h | 1 | ||||
| -rw-r--r-- | drm/nouveau/nvkm/engine/gr/gm200.c | 8 | ||||
| -rw-r--r-- | drm/nouveau/nvkm/engine/gr/gm20b.c | 2 |
3 files changed, 9 insertions, 2 deletions
diff --git a/drm/nouveau/nvkm/engine/gr/gf100.h b/drm/nouveau/nvkm/engine/gr/gf100.h index be5d61f70..be32330c5 100644 --- a/drm/nouveau/nvkm/engine/gr/gf100.h +++ b/drm/nouveau/nvkm/engine/gr/gf100.h @@ -143,6 +143,7 @@ int gk104_gr_init(struct gf100_gr *); int gk20a_gr_init(struct gf100_gr *); int gm200_gr_init(struct gf100_gr *); +int gm200_gr_rops(struct gf100_gr *); #define gf100_gr_chan(p) container_of((p), struct gf100_gr_chan, object) diff --git a/drm/nouveau/nvkm/engine/gr/gm200.c b/drm/nouveau/nvkm/engine/gr/gm200.c index e2384c4b8..47b8d6ffb 100644 --- a/drm/nouveau/nvkm/engine/gr/gm200.c +++ b/drm/nouveau/nvkm/engine/gr/gm200.c @@ -32,6 +32,12 @@ * PGRAPH engine/subdev functions ******************************************************************************/ +int +gm200_gr_rops(struct gf100_gr *gr) +{ + return nvkm_rd32(gr->base.engine.subdev.device, 0x12006c); +} + static void gm200_gr_init_gpc_mmu(struct gf100_gr *gr) { @@ -197,7 +203,7 @@ static const struct gf100_gr_func gm200_gr = { .init = gm200_gr_init, .init_gpc_mmu = gm200_gr_init_gpc_mmu, - .rops = gf100_gr_rops, + .rops = gm200_gr_rops, .ppc_nr = 2, .grctx = &gm200_grctx, .sclass = { diff --git a/drm/nouveau/nvkm/engine/gr/gm20b.c b/drm/nouveau/nvkm/engine/gr/gm20b.c index f1ea0ba58..712f036d0 100644 --- a/drm/nouveau/nvkm/engine/gr/gm20b.c +++ b/drm/nouveau/nvkm/engine/gr/gm20b.c @@ -67,7 +67,7 @@ gm20b_gr = { .init = gk20a_gr_init, .init_gpc_mmu = gm20b_gr_init_gpc_mmu, .set_hww_esr_report_mask = gm20b_gr_set_hww_esr_report_mask, - .rops = gf100_gr_rops, + .rops = gm200_gr_rops, .ppc_nr = 1, .grctx = &gm20b_grctx, .sclass = { |