These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / drivers / gpu / drm / nouveau / nvkm / engine / gr / ctxgf117.c

diff --git a/kernel/drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgf117.c b/kernel/drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgf117.c
index 9bbe2c9..74de7a9 100644 (file)
--- a/kernel/drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgf117.c
+++ b/kernel/drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgf117.c
@@ -182,18 +182,18 @@ gf117_grctx_pack_ppc[] = {
 void
 gf117_grctx_generate_attrib(struct gf100_grctx *info)
 {
-       struct gf100_gr_priv *priv = info->priv;
-       const struct gf100_grctx_oclass *impl = gf100_grctx_impl(priv);
-       const u32  alpha = impl->alpha_nr;
-       const u32   beta = impl->attrib_nr;
-       const u32   size = 0x20 * (impl->attrib_nr_max + impl->alpha_nr_max);
+       struct gf100_gr *gr = info->gr;
+       const struct gf100_grctx_func *grctx = gr->func->grctx;
+       const u32  alpha = grctx->alpha_nr;
+       const u32   beta = grctx->attrib_nr;
+       const u32   size = 0x20 * (grctx->attrib_nr_max + grctx->alpha_nr_max);
        const u32 access = NV_MEM_ACCESS_RW;
        const int s = 12;
-       const int b = mmio_vram(info, size * priv->tpc_total, (1 << s), access);
+       const int b = mmio_vram(info, size * gr->tpc_total, (1 << s), access);
        const int timeslice_mode = 1;
        const int max_batches = 0xffff;
        u32 bo = 0;
-       u32 ao = bo + impl->attrib_nr_max * priv->tpc_total;
+       u32 ao = bo + grctx->attrib_nr_max * gr->tpc_total;
        int gpc, ppc;
 
        mmio_refn(info, 0x418810, 0x80000000, s, b);
@@ -201,68 +201,62 @@ gf117_grctx_generate_attrib(struct gf100_grctx *info)
        mmio_wr32(info, 0x405830, (beta << 16) | alpha);
        mmio_wr32(info, 0x4064c4, ((alpha / 4) << 16) | max_batches);
 
-       for (gpc = 0; gpc < priv->gpc_nr; gpc++) {
-               for (ppc = 0; ppc < priv->ppc_nr[gpc]; ppc++) {
-                       const u32 a = alpha * priv->ppc_tpc_nr[gpc][ppc];
-                       const u32 b =  beta * priv->ppc_tpc_nr[gpc][ppc];
+       for (gpc = 0; gpc < gr->gpc_nr; gpc++) {
+               for (ppc = 0; ppc < gr->ppc_nr[gpc]; ppc++) {
+                       const u32 a = alpha * gr->ppc_tpc_nr[gpc][ppc];
+                       const u32 b =  beta * gr->ppc_tpc_nr[gpc][ppc];
                        const u32 t = timeslice_mode;
                        const u32 o = PPC_UNIT(gpc, ppc, 0);
+                       if (!(gr->ppc_mask[gpc] & (1 << ppc)))
+                               continue;
                        mmio_skip(info, o + 0xc0, (t << 28) | (b << 16) | ++bo);
                        mmio_wr32(info, o + 0xc0, (t << 28) | (b << 16) | --bo);
-                       bo += impl->attrib_nr_max * priv->ppc_tpc_nr[gpc][ppc];
+                       bo += grctx->attrib_nr_max * gr->ppc_tpc_nr[gpc][ppc];
                        mmio_wr32(info, o + 0xe4, (a << 16) | ao);
-                       ao += impl->alpha_nr_max * priv->ppc_tpc_nr[gpc][ppc];
+                       ao += grctx->alpha_nr_max * gr->ppc_tpc_nr[gpc][ppc];
                }
        }
 }
 
 void
-gf117_grctx_generate_main(struct gf100_gr_priv *priv, struct gf100_grctx *info)
+gf117_grctx_generate_main(struct gf100_gr *gr, struct gf100_grctx *info)
 {
-       struct gf100_grctx_oclass *oclass = (void *)nv_engine(priv)->cclass;
+       struct nvkm_device *device = gr->base.engine.subdev.device;
+       const struct gf100_grctx_func *grctx = gr->func->grctx;
        int i;
 
-       nvkm_mc(priv)->unk260(nvkm_mc(priv), 0);
+       nvkm_mc_unk260(device->mc, 0);
 
-       gf100_gr_mmio(priv, oclass->hub);
-       gf100_gr_mmio(priv, oclass->gpc);
-       gf100_gr_mmio(priv, oclass->zcull);
-       gf100_gr_mmio(priv, oclass->tpc);
-       gf100_gr_mmio(priv, oclass->ppc);
+       gf100_gr_mmio(gr, grctx->hub);
+       gf100_gr_mmio(gr, grctx->gpc);
+       gf100_gr_mmio(gr, grctx->zcull);
+       gf100_gr_mmio(gr, grctx->tpc);
+       gf100_gr_mmio(gr, grctx->ppc);
 
-       nv_wr32(priv, 0x404154, 0x00000000);
+       nvkm_wr32(device, 0x404154, 0x00000000);
 
-       oclass->bundle(info);
-       oclass->pagepool(info);
-       oclass->attrib(info);
-       oclass->unkn(priv);
+       grctx->bundle(info);
+       grctx->pagepool(info);
+       grctx->attrib(info);
+       grctx->unkn(gr);
 
-       gf100_grctx_generate_tpcid(priv);
-       gf100_grctx_generate_r406028(priv);
-       gf100_grctx_generate_r4060a8(priv);
-       gk104_grctx_generate_r418bb8(priv);
-       gf100_grctx_generate_r406800(priv);
+       gf100_grctx_generate_tpcid(gr);
+       gf100_grctx_generate_r406028(gr);
+       gf100_grctx_generate_r4060a8(gr);
+       gk104_grctx_generate_r418bb8(gr);
+       gf100_grctx_generate_r406800(gr);
 
        for (i = 0; i < 8; i++)
-               nv_wr32(priv, 0x4064d0 + (i * 0x04), 0x00000000);
+               nvkm_wr32(device, 0x4064d0 + (i * 0x04), 0x00000000);
 
-       gf100_gr_icmd(priv, oclass->icmd);
-       nv_wr32(priv, 0x404154, 0x00000400);
-       gf100_gr_mthd(priv, oclass->mthd);
-       nvkm_mc(priv)->unk260(nvkm_mc(priv), 1);
+       gf100_gr_icmd(gr, grctx->icmd);
+       nvkm_wr32(device, 0x404154, 0x00000400);
+       gf100_gr_mthd(gr, grctx->mthd);
+       nvkm_mc_unk260(device->mc, 1);
 }
 
-struct nvkm_oclass *
-gf117_grctx_oclass = &(struct gf100_grctx_oclass) {
-       .base.handle = NV_ENGCTX(GR, 0xd7),
-       .base.ofuncs = &(struct nvkm_ofuncs) {
-               .ctor = gf100_gr_context_ctor,
-               .dtor = gf100_gr_context_dtor,
-               .init = _nvkm_gr_context_init,
-               .fini = _nvkm_gr_context_fini,
-               .rd32 = _nvkm_gr_context_rd32,
-               .wr32 = _nvkm_gr_context_wr32,
-       },
+const struct gf100_grctx_func
+gf117_grctx = {
        .main  = gf117_grctx_generate_main,
        .unkn  = gk104_grctx_generate_unkn,
        .hub   = gf117_grctx_pack_hub,
@@ -281,4 +275,4 @@ gf117_grctx_oclass = &(struct gf100_grctx_oclass) {
        .attrib_nr = 0x218,
        .alpha_nr_max = 0x7ff,
        .alpha_nr = 0x324,
-}.base;
+};