drm/nouveau/gr/gf100-: rename magic_not_rop_nr to screen_tile_row_offset

[cascardo/linux.git] / drivers / gpu / drm / nouveau / nvkm / engine / gr / ctxgk104.c

diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgk104.c b/drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgk104.c
index a843e36..0c99f3c 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgk104.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgk104.c
@@ -924,20 +924,20 @@ gk104_grctx_generate_r418bb8(struct gf100_gr *gr)
 
        /* GPC_BROADCAST */
        nvkm_wr32(device, 0x418bb8, (gr->tpc_total << 8) |
-                                gr->magic_not_rop_nr);
+                                    gr->screen_tile_row_offset);
        for (i = 0; i < 6; i++)
                nvkm_wr32(device, 0x418b08 + (i * 4), data[i]);
 
        /* GPC_BROADCAST.TP_BROADCAST */
        nvkm_wr32(device, 0x41bfd0, (gr->tpc_total << 8) |
-                                gr->magic_not_rop_nr | data2[0]);
+                                    gr->screen_tile_row_offset | data2[0]);
        nvkm_wr32(device, 0x41bfe4, data2[1]);
        for (i = 0; i < 6; i++)
                nvkm_wr32(device, 0x41bf00 + (i * 4), data[i]);
 
        /* UNK78xx */
        nvkm_wr32(device, 0x4078bc, (gr->tpc_total << 8) |
-                                gr->magic_not_rop_nr);
+                                    gr->screen_tile_row_offset);
        for (i = 0; i < 6; i++)
                nvkm_wr32(device, 0x40780c + (i * 4), data[i]);
 }
@@ -956,6 +956,7 @@ gk104_grctx_generate_main(struct gf100_gr *gr, struct gf100_grctx *info)
 {
        struct nvkm_device *device = gr->base.engine.subdev.device;
        const struct gf100_grctx_func *grctx = gr->func->grctx;
+       u32 idle_timeout;
        int i;
 
        nvkm_mc_unk260(device->mc, 0);
@@ -966,7 +967,7 @@ gk104_grctx_generate_main(struct gf100_gr *gr, struct gf100_grctx *info)
        gf100_gr_mmio(gr, grctx->tpc);
        gf100_gr_mmio(gr, grctx->ppc);
 
-       nvkm_wr32(device, 0x404154, 0x00000000);
+       idle_timeout = nvkm_mask(device, 0x404154, 0xffffffff, 0x00000000);
 
        grctx->bundle(info);
        grctx->pagepool(info);
@@ -986,7 +987,7 @@ gk104_grctx_generate_main(struct gf100_gr *gr, struct gf100_grctx *info)
        nvkm_mask(device, 0x419f78, 0x00000001, 0x00000000);
 
        gf100_gr_icmd(gr, grctx->icmd);
-       nvkm_wr32(device, 0x404154, 0x00000400);
+       nvkm_wr32(device, 0x404154, idle_timeout);
        gf100_gr_mthd(gr, grctx->mthd);
        nvkm_mc_unk260(device->mc, 1);