mirrors/linux
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2026-05-03 13:32:07 -04:00
Code Issues Packages Projects Releases Wiki Activity

drm/nouveau/gr/gm200-: rop count == ltc count

Browse Source 
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
This commit is contained in:
Ben Skeggs
2016-04-14 14:28:03 +10:00
parent c83e7d6836
commit 734a0aa669
3 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/gpu/drm/nouveau/nvkm/engine/gr/gf100.h
View File

@@ -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)

8
drivers/gpu/drm/nouveau/nvkm/engine/gr/gm200.c
View File

@@ -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 = {

2
drivers/gpu/drm/nouveau/nvkm/engine/gr/gm20b.c
View File

@@ -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 = {