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

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

diff --git a/kernel/drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgk20a.c b/kernel/drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgk20a.c
index 2f241f6..ddaa16a 100644 (file)
--- a/kernel/drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgk20a.c
+++ b/kernel/drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgk20a.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, NVIDIA CORPORATION. All rights reserved.
+ * Copyright (c) 2014-2015, NVIDIA CORPORATION. All rights reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -20,34 +20,60 @@
  * DEALINGS IN THE SOFTWARE.
  */
 #include "ctxgf100.h"
+#include "gf100.h"
 
-static const struct gf100_gr_pack
-gk20a_grctx_pack_mthd[] = {
-       { gk104_grctx_init_a097_0, 0xa297 },
-       { gf100_grctx_init_902d_0, 0x902d },
-       {}
-};
+#include <subdev/mc.h>
+
+static void
+gk20a_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;
+       int idle_timeout_save;
+       int i;
+
+       gf100_gr_mmio(gr, gr->fuc_sw_ctx);
+
+       gf100_gr_wait_idle(gr);
+
+       idle_timeout_save = nvkm_rd32(device, 0x404154);
+       nvkm_wr32(device, 0x404154, 0x00000000);
+
+       grctx->attrib(info);
+
+       grctx->unkn(gr);
+
+       gf100_grctx_generate_tpcid(gr);
+       gf100_grctx_generate_r406028(gr);
+       gk104_grctx_generate_r418bb8(gr);
+       gf100_grctx_generate_r406800(gr);
+
+       for (i = 0; i < 8; i++)
+               nvkm_wr32(device, 0x4064d0 + (i * 0x04), 0x00000000);
 
-struct nvkm_oclass *
-gk20a_grctx_oclass = &(struct gf100_grctx_oclass) {
-       .base.handle = NV_ENGCTX(GR, 0xea),
-       .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,
-       },
-       .main  = gk104_grctx_generate_main,
+       nvkm_wr32(device, 0x405b00, (gr->tpc_total << 8) | gr->gpc_nr);
+
+       gk104_grctx_generate_rop_active_fbps(gr);
+
+       nvkm_mask(device, 0x5044b0, 0x8000000, 0x8000000);
+
+       gf100_gr_wait_idle(gr);
+
+       nvkm_wr32(device, 0x404154, idle_timeout_save);
+       gf100_gr_wait_idle(gr);
+
+       gf100_gr_mthd(gr, gr->fuc_method);
+       gf100_gr_wait_idle(gr);
+
+       gf100_gr_icmd(gr, gr->fuc_bundle);
+       grctx->pagepool(info);
+       grctx->bundle(info);
+}
+
+const struct gf100_grctx_func
+gk20a_grctx = {
+       .main  = gk20a_grctx_generate_main,
        .unkn  = gk104_grctx_generate_unkn,
-       .hub   = gk104_grctx_pack_hub,
-       .gpc   = gk104_grctx_pack_gpc,
-       .zcull = gf100_grctx_pack_zcull,
-       .tpc   = gk104_grctx_pack_tpc,
-       .ppc   = gk104_grctx_pack_ppc,
-       .icmd  = gk104_grctx_pack_icmd,
-       .mthd  = gk20a_grctx_pack_mthd,
        .bundle = gk104_grctx_generate_bundle,
        .bundle_size = 0x1800,
        .bundle_min_gpm_fifo_depth = 0x62,
@@ -59,4 +85,4 @@ gk20a_grctx_oclass = &(struct gf100_grctx_oclass) {
        .attrib_nr = 0x240,
        .alpha_nr_max = 0x648 + (0x648 / 2),
        .alpha_nr = 0x648,
-}.base;
+};